[TASK] Import/simplify FQN, organise imports

FluidTYPO3 · Feb 3, 2015 · 08734b1 · 08734b1
1 parent 0185e1e
commit 08734b1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Classes/Controller/AbstractContentController.php b/Classes/Controller/AbstractContentController.php
@@ -20,20 +20,20 @@
 abstract class AbstractContentController extends AbstractFluxController implements ContentControllerInterface {
 
 	/**
-	 * @var \FluidTYPO3\Fluidcontent\Service\ConfigurationService
+	 * @var ConfigurationService
 	 */
 	protected $configurationService;
 
 	/**
-	 * @param \FluidTYPO3\Fluidcontent\Service\ConfigurationService $configurationService
+	 * @param ConfigurationService $configurationService
 	 * @return void
 	 */
 	public function injectConfigurationService(ConfigurationService $configurationService) {
 		$this->configurationService = $configurationService;
 	}
 
 	/**
-	 * @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
+	 * @param ViewInterface $view
 	 * @return void
 	 */
 	public function initializeView(ViewInterface $view) {

diff --git a/Classes/Hooks/WizardItemsHookSubscriber.php b/Classes/Hooks/WizardItemsHookSubscriber.php
@@ -11,6 +11,7 @@
 use FluidTYPO3\Fluidcontent\Service\ConfigurationService;
 use FluidTYPO3\Flux\Form\FormInterface;
 use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
+use TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController;
 use TYPO3\CMS\Backend\Wizard\NewContentElementWizardHookInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
@@ -83,7 +84,7 @@ public function manipulateWizardItems(&$items, &$parentObject) {
 
 	/**
 	 * @param array $items
-	 * @param \TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController $parentObject
+	 * @param NewContentElementController $parentObject
 	 * @return array
 	 */
 	protected function filterPermittedFluidContentTypesByInsertionPosition(array $items, $parentObject) {

diff --git a/Classes/Provider/ContentProvider.php b/Classes/Provider/ContentProvider.php
@@ -9,10 +9,10 @@
  */
 
 use FluidTYPO3\Fluidcontent\Service\ConfigurationService;
-use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Provider\ContentProvider as FluxContentProvider;
-use FluidTYPO3\Flux\Utility\PathUtility;
+use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;
+use FluidTYPO3\Flux\Utility\PathUtility;
 use FluidTYPO3\Flux\Utility\ResolveUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
@@ -53,25 +53,25 @@ class ContentProvider extends FluxContentProvider implements ProviderInterface {
 	protected $configurationSectionName = 'Configuration';
 
 	/**
-	 * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
+	 * @var ConfigurationManagerInterface
 	 */
 	protected $configurationManager;
 
 	/**
-	 * @var \FluidTYPO3\Fluidcontent\Service\ConfigurationService
+	 * @var ConfigurationService
 	 */
 	protected $configurationService;
 
 	/**
-	 * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
+	 * @param ConfigurationManagerInterface $configurationManager
 	 * @return void
 	 */
 	public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager) {
 		$this->configurationManager = $configurationManager;
 	}
 
 	/**
-	 * @param \FluidTYPO3\Fluidcontent\Service\ConfigurationService $configurationService
+	 * @param ConfigurationService $configurationService
 	 * @return void
 	 */
 	public function injectConfigurationService(ConfigurationService $configurationService) {

diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php
@@ -8,14 +8,14 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
 use FluidTYPO3\Flux\Configuration\ConfigurationManager;
 use FluidTYPO3\Flux\Core;
 use FluidTYPO3\Flux\Form;
 use FluidTYPO3\Flux\Service\FluxService;
+use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
+use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;
 use FluidTYPO3\Flux\Utility\MiscellaneousUtility;
 use FluidTYPO3\Flux\Utility\PathUtility;
-use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;
 use FluidTYPO3\Flux\Utility\RecursiveArrayUtility;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\StringFrontend;
@@ -355,7 +355,7 @@ protected function buildAllWizardTabsPageTsConfig($wizardTabs) {
 	 *
 	 * @param string $tabId
 	 * @param string $id
-	 * @param \FluidTYPO3\Flux\Form $form
+	 * @param Form $form
 	 * @param string $templateFileIdentity
 	 * @return string
 	 */

diff --git a/Tests/Unit/Service/ConfigurationServiceTest.php b/Tests/Unit/Service/ConfigurationServiceTest.php
@@ -10,7 +10,6 @@
 
 use FluidTYPO3\Flux\Core;
 use FluidTYPO3\Flux\Form;
-use TYPO3\CMS\Core\Database\PreparedStatement;
 use TYPO3\CMS\Core\Tests\UnitTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;