Merge pull request #736 from johannessteu/namespace/neos/controller

TASK: Refactor absolute namespaces in Neos / Controller
neos · Sep 22, 2016 · 2a7cbbe · 2a7cbbe
2 parents 226945a + d306f7f
commit 2a7cbbe
Show file tree

Hide file tree

Showing 29 changed files with 150 additions and 91 deletions.
diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/BackendController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/BackendController.php
@@ -12,45 +12,51 @@
  */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\Cache\Frontend\StringFrontend;
 use TYPO3\Flow\I18n\Locale;
+use TYPO3\Flow\Mvc\Controller\ActionController;
+use TYPO3\Flow\Session\SessionInterface;
 use TYPO3\Flow\Utility\Algorithms;
 use TYPO3\Neos\Domain\Model\Site;
+use TYPO3\Neos\Service\BackendRedirectionService;
+use TYPO3\Neos\Service\LinkingService;
+use TYPO3\Neos\Service\XliffService;
 
 /**
  * The Neos Backend controller
  *
  * @Flow\Scope("singleton")
  */
-class BackendController extends \TYPO3\Flow\Mvc\Controller\ActionController
+class BackendController extends ActionController
 {
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Service\BackendRedirectionService
+     * @var BackendRedirectionService
      */
     protected $backendRedirectionService;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Service\XliffService
+     * @var XliffService
      */
     protected $xliffService;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Service\LinkingService
+     * @var LinkingService
      */
     protected $linkingService;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Cache\Frontend\StringFrontend
+     * @var StringFrontend
      */
     protected $loginTokenCache;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Session\SessionInterface
+     * @var SessionInterface
      */
     protected $currentSession;
 

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/ContentController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/ContentController.php
@@ -13,20 +13,27 @@
 
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\I18n\EelHelper\TranslationHelper;
+use TYPO3\Flow\Persistence\PersistenceManagerInterface;
 use TYPO3\Flow\Property\PropertyMappingConfiguration;
 use TYPO3\Flow\Property\TypeConverter\PersistentObjectConverter;
+use TYPO3\Flow\Resource\ResourceManager;
 use TYPO3\Media\Domain\Model\Asset;
 use TYPO3\Flow\Mvc\Controller\ActionController;
 use TYPO3\Media\Domain\Model\Image;
 use TYPO3\Media\Domain\Model\ImageInterface;
 use TYPO3\Media\Domain\Model\ImageVariant;
+use TYPO3\Media\Domain\Repository\AssetRepository;
+use TYPO3\Media\Domain\Repository\ImageRepository;
 use TYPO3\Media\Domain\Service\ThumbnailService;
 use TYPO3\Media\TypeConverter\AssetInterfaceConverter;
 use TYPO3\Media\Domain\Repository\AssetCollectionRepository;
+use TYPO3\Media\TypeConverter\ImageInterfaceArrayPresenter;
 use TYPO3\Neos\Controller\BackendUserTranslationTrait;
+use TYPO3\Neos\Domain\Model\PluginViewDefinition;
 use TYPO3\Neos\Domain\Model\Site;
 use TYPO3\Neos\Domain\Repository\SiteRepository;
 use TYPO3\Neos\Controller\CreateContentContextTrait;
+use TYPO3\Neos\Service\PluginService;
 use TYPO3\Neos\TypeConverter\EntityToIdentityConverter;
 use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 use TYPO3\Eel\FlowQuery\FlowQuery;
@@ -43,13 +50,13 @@ class ContentController extends ActionController
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Media\Domain\Repository\AssetRepository
+     * @var AssetRepository
      */
     protected $assetRepository;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Media\Domain\Repository\ImageRepository
+     * @var ImageRepository
      */
     protected $imageRepository;
 
@@ -67,27 +74,27 @@ class ContentController extends ActionController
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Persistence\PersistenceManagerInterface
+     * @var PersistenceManagerInterface
      */
     protected $persistenceManager;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Resource\ResourceManager
+     * @var ResourceManager
      */
     protected $resourceManager;
 
     /**
      * The pluginService
      *
-     * @var \TYPO3\Neos\Service\PluginService
+     * @var PluginService
      * @Flow\Inject
      */
     protected $pluginService;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Media\TypeConverter\ImageInterfaceArrayPresenter
+     * @var ImageInterfaceArrayPresenter
      */
     protected $imageInterfaceArrayPresenter;
 
@@ -330,7 +337,7 @@ public function pluginViewsAction($identifier = null, $workspaceName = 'live', a
 
         $views = array();
         if ($node !== null) {
-            /** @var $pluginViewDefinition \TYPO3\Neos\Domain\Model\PluginViewDefinition */
+            /** @var $pluginViewDefinition PluginViewDefinition */
             $pluginViewDefinitions = $this->pluginService->getPluginViewDefinitionsByPluginNodeType($node->getNodeType());
             foreach ($pluginViewDefinitions as $pluginViewDefinition) {
                 $label = $pluginViewDefinition->getLabel();

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MediaBrowserController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MediaBrowserController.php
@@ -14,11 +14,12 @@
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Configuration\ConfigurationManager;
 use TYPO3\Media\Domain\Repository\AssetRepository;
+use TYPO3\Neos\Controller\Module\Management\AssetController;
 
 /**
  * Controller for asset handling
  */
-class MediaBrowserController extends \TYPO3\Neos\Controller\Module\Management\AssetController
+class MediaBrowserController extends AssetController
 {
     /**
      * @var array

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MenuController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MenuController.php
@@ -12,17 +12,19 @@
  */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\Mvc\Controller\ActionController;
+use TYPO3\Neos\Controller\Backend\MenuHelper;
 use TYPO3\Neos\Controller\BackendUserTranslationTrait;
 
 /**
  * @Flow\Scope("singleton")
  */
-class MenuController extends \TYPO3\Flow\Mvc\Controller\ActionController
+class MenuController extends ActionController
 {
     use BackendUserTranslationTrait;
 
     /**
-     * @var \TYPO3\Neos\Controller\Backend\MenuHelper
+     * @var MenuHelper
      * @Flow\Inject
      */
     protected $menuHelper;

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MenuHelper.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/MenuHelper.php
@@ -13,7 +13,10 @@
 
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Mvc\Controller\ControllerContext;
+use TYPO3\Flow\Security\Authorization\PrivilegeManagerInterface;
 use TYPO3\Flow\Utility\Arrays;
+use TYPO3\Neos\Domain\Model\Site;
+use TYPO3\Neos\Domain\Repository\SiteRepository;
 
 /**
  * A helper class for menu generation in backend controllers / view helpers
@@ -23,13 +26,13 @@
 class MenuHelper
 {
     /**
-     * @var \TYPO3\Neos\Domain\Repository\SiteRepository
+     * @var SiteRepository
      * @Flow\Inject
      */
     protected $siteRepository;
 
     /**
-     * @var \TYPO3\Flow\Security\Authorization\PrivilegeManagerInterface
+     * @var PrivilegeManagerInterface
      * @Flow\Inject
      */
     protected $privilegeManager;
@@ -50,7 +53,7 @@ public function injectSettings(array $settings)
     /**
      * Build a list of sites
      *
-     * @param \TYPO3\Flow\Mvc\Controller\ControllerContext $controllerContext
+     * @param ControllerContext $controllerContext
      * @return array
      */
     public function buildSiteList(ControllerContext $controllerContext)
@@ -62,7 +65,7 @@ public function buildSiteList(ControllerContext $controllerContext)
         foreach ($this->siteRepository->findOnline() as $site) {
             $uri = null;
             $active = false;
-            /** @var $site \TYPO3\Neos\Domain\Model\Site */
+            /** @var $site Site */
             if ($site->hasActiveDomains()) {
                 $activeHostPatterns = $site->getActiveDomains()->map(function ($domain) {
                     return $domain->getHostPattern();
@@ -101,7 +104,7 @@ public function buildSiteList(ControllerContext $controllerContext)
     }
 
     /**
-     * @param \TYPO3\Flow\Mvc\Controller\ControllerContext $controllerContext
+     * @param ControllerContext $controllerContext
      * @return array
      */
     public function buildModuleList(ControllerContext $controllerContext)
@@ -155,7 +158,7 @@ public function isModuleEnabled($modulePath)
     }
 
     /**
-     * @param \TYPO3\Flow\Mvc\Controller\ControllerContext $controllerContext
+     * @param ControllerContext $controllerContext
      * @param string $module
      * @param array $moduleConfiguration
      * @param string $modulePath

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/ModuleController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/ModuleController.php
@@ -14,8 +14,12 @@
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Mvc\ActionRequest;
 use TYPO3\Flow\Http\Response;
+use TYPO3\Flow\Mvc\Controller\ActionController;
+use TYPO3\Flow\Mvc\Dispatcher;
+use TYPO3\Flow\Security\Context;
 use TYPO3\Flow\Utility\Arrays;
 use TYPO3\Flow\Utility\MediaTypes;
+use TYPO3\Neos\Controller\Backend\MenuHelper;
 use TYPO3\Neos\Controller\BackendUserTranslationTrait;
 use TYPO3\Neos\Controller\Exception\DisabledModuleException;
 
@@ -24,24 +28,24 @@
  *
  * @Flow\Scope("singleton")
  */
-class ModuleController extends \TYPO3\Flow\Mvc\Controller\ActionController
+class ModuleController extends ActionController
 {
     use BackendUserTranslationTrait;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Mvc\Dispatcher
+     * @var Dispatcher
      */
     protected $dispatcher;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\Security\Context
+     * @var Context
      */
     protected $securityContext;
 
     /**
-     * @var \TYPO3\Neos\Controller\Backend\MenuHelper
+     * @var MenuHelper
      * @Flow\Inject
      */
     protected $menuHelper;

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/SettingsController.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Backend/SettingsController.php
@@ -12,13 +12,14 @@
  */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\Mvc\Controller\ActionController;
 use TYPO3\Flow\Utility\Arrays;
 use TYPO3\Flow\Utility\PositionalArraySorter;
 
 /**
  * @Flow\Scope("singleton")
  */
-class SettingsController extends \TYPO3\Flow\Mvc\Controller\ActionController
+class SettingsController extends ActionController
 {
     /**
      * @return string

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/BackendUserTranslationTrait.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/BackendUserTranslationTrait.php
@@ -12,6 +12,9 @@
  */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\I18n\Locale;
+use TYPO3\Flow\I18n\Service;
+use TYPO3\Neos\Service\UserService;
 
 /**
  * A trait to add backend translation based on the backend users settings
@@ -20,13 +23,13 @@ trait BackendUserTranslationTrait
 {
     /**
      * @Flow\Inject
-     * @var \TYPO3\Flow\I18n\Service
+     * @var Service
      */
     protected $_localizationService;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Service\UserService
+     * @var UserService
      */
     protected $_userService;
 
@@ -37,6 +40,6 @@ trait BackendUserTranslationTrait
      */
     protected function initializeObject()
     {
-        $this->_localizationService->getConfiguration()->setCurrentLocale(new \TYPO3\Flow\I18n\Locale($this->_userService->getInterfaceLanguage()));
+        $this->_localizationService->getConfiguration()->setCurrentLocale(new Locale($this->_userService->getInterfaceLanguage()));
     }
 }
diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/CreateContentContextTrait.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/CreateContentContextTrait.php
@@ -12,6 +12,10 @@
  */
 
 use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Neos\Domain\Repository\DomainRepository;
+use TYPO3\Neos\Domain\Repository\SiteRepository;
+use TYPO3\Neos\Domain\Service\ContentContext;
+use TYPO3\Neos\Domain\Service\ContentContextFactory;
 use TYPO3\Neos\Domain\Service\SiteService;
 use TYPO3\TYPO3CR\Domain\Model\NodeData;
 use TYPO3\TYPO3CR\Domain\Utility\NodePaths;
@@ -23,19 +27,19 @@ trait CreateContentContextTrait
 {
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Domain\Service\ContentContextFactory
+     * @var ContentContextFactory
      */
     protected $_contextFactory;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Domain\Repository\DomainRepository
+     * @var DomainRepository
      */
     protected $_domainRepository;
 
     /**
      * @Flow\Inject
-     * @var \TYPO3\Neos\Domain\Repository\SiteRepository
+     * @var SiteRepository
      */
     protected $_siteRepository;
 
@@ -44,7 +48,7 @@ trait CreateContentContextTrait
      *
      * @param string $workspaceName Name of the workspace to set for the context
      * @param array $dimensions Optional list of dimensions and their values which should be set
-     * @return \TYPO3\Neos\Domain\Service\ContentContext
+     * @return ContentContext
      */
     protected function createContentContext($workspaceName, array $dimensions = array())
     {
@@ -76,7 +80,7 @@ protected function createContentContext($workspaceName, array $dimensions = arra
      * Generates a Context that exactly fits the given NodeData Workspace, Dimensions & Site.
      *
      * @param NodeData $nodeData
-     * @return \TYPO3\Neos\Domain\Service\ContentContext
+     * @return ContentContext
      */
     protected function createContextMatchingNodeData(NodeData $nodeData)
     {

diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Exception/NoTypoScriptConfigurationException.php b/TYPO3.Neos/Classes/TYPO3/Neos/Controller/Exception/NoTypoScriptConfigurationException.php
@@ -10,11 +10,12 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
+use TYPO3\Neos\Controller\Exception;
 
 /**
  * A "No TypoScript" exception
  *
  */
-class NoTypoScriptConfigurationException extends \TYPO3\Neos\Controller\Exception
+class NoTypoScriptConfigurationException extends Exception
 {
 }