[TASK] Use fully qualified name resolution in PHP 5.5 14/34414/6
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 20 Nov 2014 21:29:35 +0000 (22:29 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 21 Nov 2014 11:40:18 +0000 (12:40 +0100)
Since PHP 5.5 is a requirement, calls with the objectManager
should use the ::class construct instead of a string argument.

Resolves: #63112
Releases: master
Change-Id: Iedbb896607adddce2b23ab67f990fa2296c0d1bb
Reviewed-on: http://review.typo3.org/34414
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
126 files changed:
typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php
typo3/sysext/backend/Classes/Controller/LoginController.php
typo3/sysext/belog/Classes/Controller/AbstractController.php
typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
typo3/sysext/core/Documentation/Changelog/master/Feature-61361-FallbackTemplatePathsForFluidStandaloneView.rst
typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/PackageManager.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/AbstractController.php
typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
typo3/sysext/documentation/Classes/Domain/Repository/DocumentRepository.php
typo3/sysext/documentation/Classes/Slots/ExtensionManager.php
typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
typo3/sysext/extbase/Classes/Core/Bootstrap.php
typo3/sysext/extbase/Classes/Core/ModuleRunner.php
typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
typo3/sysext/extbase/Classes/Domain/Repository/FileMountRepository.php
typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
typo3/sysext/extbase/Classes/Mvc/Cli/RequestBuilder.php
typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
typo3/sysext/extbase/Classes/Mvc/Web/RequestBuilder.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
typo3/sysext/extbase/Classes/Persistence/Generic/Qom/QueryObjectModelFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php
typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
typo3/sysext/extbase/Classes/Persistence/Generic/Typo3QuerySettings.php
typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php
typo3/sysext/extbase/Classes/Scheduler/Task.php
typo3/sysext/extbase/Classes/Scheduler/TaskExecutor.php
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
typo3/sysext/extensionmanager/Classes/Command/ExtensionCommandController.php
typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
typo3/sysext/extensionmanager/Classes/Controller/ListController.php
typo3/sysext/extensionmanager/Classes/Controller/UpdateScriptController.php
typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
typo3/sysext/extensionmanager/Classes/Utility/ExtensionModelUtility.php
typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/ImageViewHelper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
typo3/sysext/fluid/Classes/Compatibility/DocbookGeneratorService.php
typo3/sysext/fluid/Classes/Compatibility/TemplateParserBuilder.php
typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
typo3/sysext/fluid/Classes/View/StandaloneView.php
typo3/sysext/fluid/Classes/View/TemplateView.php
typo3/sysext/install/Classes/Controller/AbstractController.php
typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
typo3/sysext/install/Classes/Controller/Action/Ajax/ClearCache.php
typo3/sysext/install/Classes/Controller/Action/Ajax/CoreUpdateIsUpdateAvailable.php
typo3/sysext/install/Classes/Controller/Action/Ajax/EnvironmentStatus.php
typo3/sysext/install/Classes/Controller/Action/Ajax/FolderStatus.php
typo3/sysext/install/Classes/Controller/Action/Common/InstallToolDisabledAction.php
typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
typo3/sysext/install/Classes/Controller/Action/Step/DatabaseData.php
typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php
typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php
typo3/sysext/install/Classes/Controller/Action/Tool/AllConfiguration.php
typo3/sysext/install/Classes/Controller/Action/Tool/CleanUp.php
typo3/sysext/install/Classes/Controller/Action/Tool/Configuration.php
typo3/sysext/install/Classes/Controller/Action/Tool/FolderStructure.php
typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
typo3/sysext/install/Classes/Controller/Action/Tool/SystemEnvironment.php
typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php
typo3/sysext/install/Classes/Controller/StepController.php
typo3/sysext/install/Classes/Service/ClearCacheService.php
typo3/sysext/install/Classes/Service/CoreUpdateService.php
typo3/sysext/install/Classes/Service/SqlExpectedSchemaService.php
typo3/sysext/install/Classes/Updates/AbstractDatabaseSchemaUpdate.php
typo3/sysext/install/Classes/View/FailsafeView.php
typo3/sysext/install/Classes/View/StandaloneView.php
typo3/sysext/lang/Classes/Command/LanguageCommandController.php
typo3/sysext/lang/Classes/Controller/LanguageController.php
typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php
typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
typo3/sysext/workspaces/Classes/Controller/AbstractController.php
typo3/sysext/workspaces/Classes/Service/AdditionalColumnService.php
typo3/sysext/workspaces/Classes/Service/AdditionalResourceService.php
typo3/sysext/workspaces/Classes/Service/GridDataService.php
typo3/sysext/workspaces/Classes/Service/WorkspaceService.php

index e7a5351..35cd8f4 100644 (file)
@@ -36,14 +36,14 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\About\Domain\Model\Extension>
         */
        public function findAllLoaded() {
-               $loadedExtensions = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $loadedExtensions = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class);
                $loadedExtensionsArray = $GLOBALS['TYPO3_LOADED_EXT'];
                foreach ($loadedExtensionsArray as $extensionKey => $extension) {
                        if ((is_array($extension) || $extension instanceof \ArrayAccess) && $extension['type'] != 'S') {
                                $emconfPath = PATH_site . $extension['siteRelPath'] . 'ext_emconf.php';
                                if (file_exists($emconfPath)) {
                                        include $emconfPath;
-                                       $extension = $this->objectManager->get('TYPO3\\CMS\\About\\Domain\\Model\\Extension');
+                                       $extension = $this->objectManager->get(\TYPO3\CMS\About\Domain\Model\Extension::class);
                                        $extension->setKey($extensionKey);
                                        $extension->setTitle($EM_CONF['']['title']);
                                        $extension->setAuthor($EM_CONF['']['author']);
index f1b8a0f..83a003f 100644 (file)
@@ -628,7 +628,7 @@ class LoginController {
         */
        protected function getSignalSlotDispatcher() {
                if (!isset($this->signalSlotDispatcher)) {
-                       $this->signalSlotDispatcher = $this->getObjectManager()->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+                       $this->signalSlotDispatcher = $this->getObjectManager()->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
                }
                return $this->signalSlotDispatcher;
        }
index d445135..7f630a3 100644 (file)
@@ -123,7 +123,7 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
                if ($constraint === NULL) {
                        $constraint = $this->getConstraintFromBeUserData();
                        if ($constraint === NULL) {
-                               $constraint = $this->objectManager->get('TYPO3\\CMS\\Belog\\Domain\\Model\\Constraint');
+                               $constraint = $this->objectManager->get(\TYPO3\CMS\Belog\Domain\Model\Constraint::class);
                        }
                } else {
                        $this->persistConstraintInBeUserData($constraint);
@@ -248,7 +248,7 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
                // Two meta entries: 'all' and 'live'
                $workspaceArray[-99] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('any', 'Belog');
                $workspaceArray[0] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('live', 'Belog');
-               $workspaces = $this->objectManager->get('TYPO3\\CMS\\Belog\\Domain\\Repository\\WorkspaceRepository')->findAll();
+               $workspaces = $this->objectManager->get(\TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository::class)->findAll();
                /** @var $workspace \TYPO3\CMS\Belog\Domain\Model\Workspace */
                foreach ($workspaces as $workspace) {
                        $workspaceArray[$workspace->getUid()] = $workspace->getUid() . ': ' . $workspace->getTitle();
index 1bbaf56..192dcf0 100644 (file)
@@ -29,7 +29,7 @@ class HistoryEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index a1ab931..e7e5d30 100644 (file)
@@ -36,7 +36,7 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
        public function initializeObject() {
                $this->beUserList = \TYPO3\CMS\Backend\Utility\BackendUtility::getUserNames();
                /** @var $defaultQuerySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
-               $defaultQuerySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $defaultQuerySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
                $defaultQuerySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($defaultQuerySettings);
        }
index 63f2427..38591bf 100644 (file)
@@ -30,7 +30,7 @@ class WorkspaceRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index 7febb50..863836d 100644 (file)
@@ -40,7 +40,7 @@ class SwitchBackUserHook {
        public function switchBack($params, AbstractUserAuthentication $authentication) {
                if ($this->isAHandledBackendSession($authentication)) {
                        $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-                       $backendUserSessionRepository = $objectManager->get('TYPO3\\CMS\\Beuser\\Domain\\Repository\\BackendUserSessionRepository');
+                       $backendUserSessionRepository = $objectManager->get(\TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository::class);
                        $backendUserSessionRepository->switchBackToOriginalUser($authentication);
                        HttpUtility::redirect($GLOBALS['BACK_PATH'] . 'backend.php');
                }
index 5d103d5..5b36676 100644 (file)
@@ -42,7 +42,7 @@ class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface {
        public function loadModuleData() {
                $moduleData = $GLOBALS['BE_USER']->getModuleData(self::KEY);
                if (empty($moduleData) || !$moduleData) {
-                       $moduleData = $this->objectManager->get('TYPO3\\CMS\\Beuser\\Domain\\Model\\ModuleData');
+                       $moduleData = $this->objectManager->get(\TYPO3\CMS\Beuser\Domain\Model\ModuleData::class);
                } else {
                        $moduleData = @unserialize($moduleData);
                }
index 67c6bd7..37e7608 100644 (file)
@@ -347,7 +347,7 @@ class FileIndexRepository implements SingletonInterface {
         * @return \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
         */
        protected function getSignalSlotDispatcher() {
-               return $this->getObjectManager()->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+               return $this->getObjectManager()->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
        }
 
        /**
index fb5aaeb..8a7d899 100644 (file)
@@ -156,7 +156,7 @@ class MetaDataRepository implements SingletonInterface {
         * @return \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
         */
        protected function getSignalSlotDispatcher() {
-               return $this->getObjectManager()->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+               return $this->getObjectManager()->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
        }
 
        /**
index 4487a6b..fcce3df 100644 (file)
@@ -2357,7 +2357,7 @@ class ResourceStorage implements ResourceStorageInterface {
         */
        protected function getSignalSlotDispatcher() {
                if (!isset($this->signalSlotDispatcher)) {
-                       $this->signalSlotDispatcher = $this->getObjectManager()->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+                       $this->signalSlotDispatcher = $this->getObjectManager()->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
                }
                return $this->signalSlotDispatcher;
        }
index c182eaf..7992422 100644 (file)
@@ -137,7 +137,7 @@ class FileProcessingService {
        protected function getSignalSlotDispatcher() {
                if (!isset($this->signalSlotDispatcher)) {
                        $this->signalSlotDispatcher = Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class)
-                               ->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+                               ->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
                }
                return $this->signalSlotDispatcher;
        }
index 93b6d25..9f1b228 100644 (file)
@@ -450,7 +450,7 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
         */
        protected function getSignalSlotDispatcher() {
                if (!isset($this->signalSlotDispatcher)) {
-                       $this->signalSlotDispatcher = $this->getObjectManager()->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+                       $this->signalSlotDispatcher = $this->getObjectManager()->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
                }
                return $this->signalSlotDispatcher;
        }
index dc46d0c..b155aa6 100644 (file)
@@ -21,7 +21,7 @@ for Templates there is no lookup requirement.
 As a developer or integrator, you can configure your View as follows:
 
 ::
-$view = $this->objectManager->get('TYPO3\\CMS\\Fluid\\View\\StandaloneView');
+$view = $this->objectManager->get(\TYPO3\CMS\Fluid\View\StandaloneView::class);
 $view->setFormat('html');
 $view->setTemplatePathAndFileName(ExtensionManagementUtility::extPath('myExt') . 'Resources/Private/Templates/Email.html');
 $view->setLayoutRootPaths(array(
index 3ce66f0..5b3bd0f 100644 (file)
@@ -214,7 +214,7 @@ class PackageManager implements \TYPO3\Flow\Package\PackageManagerInterface {
                        return strlen($packageTwo->getPackagePath()) - strlen($packageOne->getPackagePath());
                });
 
-               $className = $this->bootstrap->getObjectManager()->get('TYPO3\Flow\Reflection\ReflectionService')->getClassNameByObject($object);
+               $className = $this->bootstrap->getObjectManager()->get(\TYPO3\Flow\Reflection\ReflectionService::class)->getClassNameByObject($object);
                $reflectedClass = new \ReflectionClass($className);
                $fileName = Files::getUnixStylePath($reflectedClass->getFileName());
 
@@ -559,7 +559,7 @@ class PackageManager implements \TYPO3\Flow\Package\PackageManagerInterface {
                        return;
                }
 
-               $this->bootstrap->getObjectManager()->get('TYPO3\Flow\Reflection\ReflectionService')->freezePackageReflection($packageKey);
+               $this->bootstrap->getObjectManager()->get(\TYPO3\Flow\Reflection\ReflectionService::class)->freezePackageReflection($packageKey);
 
                $this->packageStatesConfiguration['packages'][$packageKey]['frozen'] = TRUE;
                $this->sortAndSavePackageStates();
@@ -590,7 +590,7 @@ class PackageManager implements \TYPO3\Flow\Package\PackageManagerInterface {
                        return;
                }
 
-               $this->bootstrap->getObjectManager()->get('TYPO3\Flow\Reflection\ReflectionService')->unfreezePackageReflection($packageKey);
+               $this->bootstrap->getObjectManager()->get(\TYPO3\Flow\Reflection\ReflectionService::class)->unfreezePackageReflection($packageKey);
 
                unset($this->packageStatesConfiguration['packages'][$packageKey]['frozen']);
                $this->sortAndSavePackageStates();
@@ -607,7 +607,7 @@ class PackageManager implements \TYPO3\Flow\Package\PackageManagerInterface {
                        return;
                }
 
-               $this->bootstrap->getObjectManager()->get('TYPO3\Flow\Reflection\ReflectionService')->unfreezePackageReflection($packageKey);
+               $this->bootstrap->getObjectManager()->get(\TYPO3\Flow\Reflection\ReflectionService::class)->unfreezePackageReflection($packageKey);
        }
 
        /**
@@ -1025,4 +1025,4 @@ class PackageManager implements \TYPO3\Flow\Package\PackageManagerInterface {
        }
 }
 
-?>
\ No newline at end of file
+?>
index 4892a9a..e1b0dfe 100644 (file)
@@ -101,14 +101,14 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
         * @return \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface
         */
        protected function getPersistenceManager() {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\PersistenceManagerInterface');
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
        }
 
        /**
         * @return \OliverHader\IrreTutorial\Service\QueueService
         */
        protected function getQueueService() {
-               return $this->objectManager->get('OliverHader\\IrreTutorial\\Service\\QueueService');
+               return $this->objectManager->get(\OliverHader\IrreTutorial\Service\QueueService::class);
        }
 
 }
index 7d40284..d051fc4 100644 (file)
@@ -508,7 +508,7 @@ class FunctionalTestCaseBootstrapUtility {
                /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
                /** @var \TYPO3\CMS\Install\Service\SqlExpectedSchemaService $expectedSchemaService */
-               $expectedSchemaService = $objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService');
+               $expectedSchemaService = $objectManager->get(\TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class);
 
                // Raw concatenated ext_tables.sql and friends string
                $expectedSchemaString = $expectedSchemaService->getTablesDefinitionString(TRUE);
index 485acca..8926a9d 100644 (file)
@@ -136,7 +136,7 @@ class DocumentRepository {
                        $icon = \TYPO3\CMS\Documentation\Utility\MiscUtility::getIcon($documentKey);
 
                        /** @var \TYPO3\CMS\Documentation\Domain\Model\Document $document */
-                       $document = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\Document')
+                       $document = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\Document::class)
                                ->setPackageKey($documentKey)
                                ->setIcon($icon);
 
@@ -149,7 +149,7 @@ class DocumentRepository {
                                }
 
                                /** @var \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation $documentTranslation */
-                               $documentTranslation = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\DocumentTranslation')
+                               $documentTranslation = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation::class)
                                        ->setLanguage($language)
                                        ->setTitle($metadata['title'])
                                        ->setDescription($metadata['description']);
@@ -179,7 +179,7 @@ class DocumentRepository {
                                        }
                                        if (!empty($documentFile)) {
                                                /** @var \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat $documentFormat */
-                                               $documentFormat = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\DocumentFormat')
+                                               $documentFormat = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\DocumentFormat::class)
                                                        ->setFormat($format)
                                                        ->setPath($formatPath . $format . '/' . $documentFile);
 
@@ -213,20 +213,20 @@ class DocumentRepository {
                                $icon = \TYPO3\CMS\Documentation\Utility\MiscUtility::getIcon($documentKey);
 
                                /** @var \TYPO3\CMS\Documentation\Domain\Model\Document $document */
-                               $document = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\Document')
+                               $document = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\Document::class)
                                        ->setPackageKey($documentKey)
                                        ->setExtensionKey($extensionKey)
                                        ->setIcon($icon);
 
                                $metadata = $this->getMetadata($documentKey, $language);
                                /** @var \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation $documentTranslation */
-                               $documentTranslation = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\DocumentTranslation')
+                               $documentTranslation = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation::class)
                                        ->setLanguage($language)
                                        ->setTitle($metadata['title'])
                                        ->setDescription($metadata['description']);
 
                                /** @var \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat $documentFormat */
-                               $documentFormat = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Domain\\Model\\DocumentFormat')
+                               $documentFormat = $this->objectManager->get(\TYPO3\CMS\Documentation\Domain\Model\DocumentFormat::class)
                                        ->setFormat('sxw')
                                        ->setPath($path . 'manual.sxw');
 
index 5db6283..5794480 100644 (file)
@@ -42,7 +42,7 @@ class ExtensionManager {
        public function processActions(array $extension, array &$actions) {
                if (static::$documents === NULL) {
                        /** @var \TYPO3\CMS\Documentation\Controller\DocumentController $documentController */
-                       $documentController = $this->objectManager->get('TYPO3\\CMS\\Documentation\\Controller\\DocumentController');
+                       $documentController = $this->objectManager->get(\TYPO3\CMS\Documentation\Controller\DocumentController::class);
                        static::$documents = $documentController->getDocuments();
                }
 
@@ -53,7 +53,7 @@ class ExtensionManager {
                        $document = static::$documents[$documentKey];
 
                        /** @var \TYPO3\CMS\Documentation\ViewHelpers\FormatsViewHelper $formatsViewHelper */
-                       $formatsViewHelper = $this->objectManager->get('TYPO3\\CMS\\Documentation\\ViewHelpers\\FormatsViewHelper');
+                       $formatsViewHelper = $this->objectManager->get(\TYPO3\CMS\Documentation\ViewHelpers\FormatsViewHelper::class);
 
                        foreach ($document->getTranslations() as $documentTranslation) {
                                $actions[] = $formatsViewHelper->render($documentTranslation);
index eb5e0f8..b241f54 100644 (file)
@@ -52,9 +52,9 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
         */
        protected function initializeConcreteConfigurationManager() {
                if ($this->environmentService->isEnvironmentInFrontendMode()) {
-                       $this->concreteConfigurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\FrontendConfigurationManager');
+                       $this->concreteConfigurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class);
                } else {
-                       $this->concreteConfigurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\BackendConfigurationManager');
+                       $this->concreteConfigurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class);
                }
        }
 
index 883b80b..1153379 100644 (file)
@@ -108,7 +108,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
         * @see initialize()
         */
        public function initializeConfiguration($configuration) {
-               $this->configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $this->configurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
                /** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject */
                $contentObject = isset($this->cObj) ? $this->cObj : \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
                $this->configurationManager->setContentObject($contentObject);
@@ -153,7 +153,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
         * @see initialize()
         */
        protected function initializeReflection() {
-               $this->reflectionService = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService');
+               $this->reflectionService = $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
                $this->reflectionService->setDataCache($this->cacheManager->getCache('extbase_reflection'));
                if (!$this->reflectionService->isInitialized()) {
                        $this->reflectionService->initialize();
@@ -167,7 +167,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
         * @see initialize()
         */
        public function initializePersistence() {
-               $this->persistenceManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
+               $this->persistenceManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
        }
 
        /**
@@ -189,7 +189,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
         */
        protected function handleRequest() {
                /** @var $requestHandlerResolver \TYPO3\CMS\Extbase\Mvc\RequestHandlerResolver */
-               $requestHandlerResolver = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\RequestHandlerResolver');
+               $requestHandlerResolver = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\RequestHandlerResolver::class);
                $requestHandler = $requestHandlerResolver->resolveRequestHandler();
 
                $response = $requestHandler->handleRequest();
@@ -202,7 +202,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
                } else {
                        $content = $response->shutdown();
                        $this->resetSingletons();
-                       $this->objectManager->get('TYPO3\CMS\Extbase\Service\CacheService')->clearCachesOfRegisteredPageIds();
+                       $this->objectManager->get(\TYPO3\CMS\Extbase\Service\CacheService::class)->clearCachesOfRegisteredPageIds();
                }
 
                return $content;
index 69aeb8b..06a278d 100644 (file)
@@ -63,7 +63,7 @@ class ModuleRunner implements ModuleRunnerInterface {
                        $configuration['vendorName'] = $moduleConfiguration['vendorName'];
                }
 
-               $bootstrap = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Core\\BootstrapInterface');
+               $bootstrap = $this->objectManager->get(\TYPO3\CMS\Extbase\Core\BootstrapInterface::class);
                $content = $bootstrap->run('', $configuration);
                print $content;
 
index 1421322..dbfed83 100644 (file)
@@ -27,7 +27,7 @@ class BackendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Reposito
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index 671ce95..0efe7f8 100644 (file)
@@ -27,7 +27,7 @@ class BackendUserRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index 71f17fa..238e2ca 100644 (file)
@@ -27,7 +27,7 @@ class CategoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index d465aef..9120c6c 100644 (file)
@@ -27,7 +27,7 @@ class FileMountRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index 6398d7f..cc5ca8c 100644 (file)
@@ -177,7 +177,7 @@ class Command {
                        $explodedAnnotation = preg_split('/\s+/', $annotations['param'][$i], 3);
                        $description = !empty($explodedAnnotation[2]) ? $explodedAnnotation[2] : '';
                        $required = $commandParameterDefinition['optional'] !== TRUE;
-                       $commandArgumentDefinitions[] = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\CommandArgumentDefinition', $commandParameterName, $required, $description);
+                       $commandArgumentDefinitions[] = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class, $commandParameterName, $required, $description);
                        $i++;
                }
                return $commandArgumentDefinitions;
@@ -230,7 +230,7 @@ class Command {
         */
        protected function getCommandMethodReflection() {
                if ($this->commandMethodReflection === NULL) {
-                       $this->commandMethodReflection = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\MethodReflection', $this->controllerClassName, $this->controllerCommandName . 'Command');
+                       $this->commandMethodReflection = $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\MethodReflection::class, $this->controllerClassName, $this->controllerCommandName . 'Command');
                }
                return $this->commandMethodReflection;
        }
index 9b720d7..761af21 100644 (file)
@@ -52,7 +52,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
                                }
                                foreach (get_class_methods($className) as $methodName) {
                                        if (substr($methodName, -7, 7) === 'Command') {
-                                               $this->availableCommands[] = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Command', $className, substr($methodName, 0, -7));
+                                               $this->availableCommands[] = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, $className, substr($methodName, 0, -7));
                                        }
                                }
                        }
index 4b54c1b..7a9afa2 100644 (file)
@@ -174,7 +174,7 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
         */
        public function getCommand() {
                if ($this->command === NULL) {
-                       $this->command = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Command', $this->controllerObjectName, $this->controllerCommandName);
+                       $this->command = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, $this->controllerObjectName, $this->controllerCommandName);
                }
                return $this->command;
        }
index 51774f6..129c3a1 100644 (file)
@@ -56,7 +56,7 @@ class RequestBuilder implements \TYPO3\CMS\Core\SingletonInterface {
         * @return \TYPO3\CMS\Extbase\Mvc\Cli\Request The CLI request as an object
         */
        public function build($commandLine = '', $callingScript = './typo3/cli_dispatch.phpsh extbase') {
-               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Request');
+               $request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Request::class);
                $request->setCallingScript($callingScript);
                $request->setControllerObjectName('TYPO3\\CMS\\Extbase\\Command\\HelpCommandController');
                $rawCommandLineArguments = is_array($commandLine) ? $commandLine : explode(' ', $commandLine);
index 71336ad..d26dd7c 100644 (file)
@@ -57,7 +57,7 @@ class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
                }
                $request = $this->requestBuilder->build($commandLine, $callingScript . ' extbase');
                /** @var $response \TYPO3\CMS\Extbase\Mvc\Cli\Response */
-               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Response');
+               $response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
                $this->dispatcher->dispatch($request, $response);
                $response->send();
                return $response;
index c1eee0b..9d8f5c0 100644 (file)
@@ -144,7 +144,7 @@ abstract class AbstractController implements ControllerInterface {
         */
        public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
-               $this->arguments = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Arguments');
+               $this->arguments = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class);
        }
 
        /**
@@ -209,7 +209,7 @@ abstract class AbstractController implements ControllerInterface {
                $this->request = $request;
                $this->request->setDispatched(TRUE);
                $this->response = $response;
-               $this->uriBuilder = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
+               $this->uriBuilder = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
                $this->uriBuilder->setRequest($request);
                $this->initializeControllerArgumentsBaseValidators();
                $this->mapRequestArgumentsToControllerArguments();
@@ -224,7 +224,7 @@ abstract class AbstractController implements ControllerInterface {
         */
        protected function buildControllerContext() {
                /** @var $controllerContext \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext */
-               $controllerContext = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext');
+               $controllerContext = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
                $controllerContext->setRequest($this->request);
                $controllerContext->setResponse($this->response);
                if ($this->arguments !== NULL) {
@@ -320,7 +320,7 @@ abstract class AbstractController implements ControllerInterface {
                        throw new UnsupportedRequestTypeException('redirect() only supports web requests.', 1220539735);
                }
 
-               $this->objectManager->get('TYPO3\CMS\Extbase\Service\CacheService')->clearCachesOfRegisteredPageIds();
+               $this->objectManager->get(\TYPO3\CMS\Extbase\Service\CacheService::class)->clearCachesOfRegisteredPageIds();
 
                $uri = $this->addBaseUriIfNecessary($uri);
                $escapedUri = htmlentities($uri, ENT_QUOTES, 'utf-8');
index 722959f..16d01a1 100644 (file)
@@ -132,7 +132,7 @@ class ActionController extends AbstractController {
                $this->request = $request;
                $this->request->setDispatched(TRUE);
                $this->response = $response;
-               $this->uriBuilder = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
+               $this->uriBuilder = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
                $this->uriBuilder->setRequest($request);
                $this->actionMethodName = $this->resolveActionMethodName();
                $this->initializeActionMethodArguments();
@@ -325,7 +325,7 @@ class ActionController extends AbstractController {
                        }
                }
                if (!isset($view)) {
-                       $view = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\View\\NotFoundView');
+                       $view = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\View\NotFoundView::class);
                        $view->assign('errorMessage', 'No template was found. View could not be resolved for action "'
                                . $this->request->getControllerActionName() . '" in class "' . $this->request->getControllerObjectName() . '"');
                }
@@ -543,7 +543,7 @@ class ActionController extends AbstractController {
         * @return array Array of method parameters by action name
         */
        static public function getActionMethodParameters($objectManager) {
-               $reflectionService = $objectManager->get('TYPO3\CMS\Extbase\Reflection\ReflectionService');
+               $reflectionService = $objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
 
                $result = array();
 
index 11e6c7d..74e5ea3 100644 (file)
@@ -127,7 +127,7 @@ class Arguments extends \ArrayObject {
         */
        public function addNewArgument($name, $dataType = 'Text', $isRequired = FALSE, $defaultValue = NULL) {
                /** @var $argument Argument */
-               $argument = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument', $name, $dataType);
+               $argument = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, $name, $dataType);
                $argument->setRequired($isRequired);
                $argument->setDefaultValue($defaultValue);
                $this->addArgument($argument);
index 3975d48..ff05983 100644 (file)
@@ -76,7 +76,7 @@ class CommandController implements CommandControllerInterface {
         */
        public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
-               $this->arguments = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Arguments');
+               $this->arguments = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class);
                $this->userAuthentication = isset($GLOBALS['BE_USER']) ? $GLOBALS['BE_USER'] : NULL;
        }
 
index 9469b3c..1d44633 100644 (file)
@@ -26,7 +26,7 @@ class BackendRequestHandler extends AbstractRequestHandler {
        public function handleRequest() {
                $request = $this->requestBuilder->build();
                /** @var $response \TYPO3\CMS\Extbase\Mvc\ResponseInterface */
-               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
+               $response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
                $this->dispatcher->dispatch($request, $response);
                return $response;
        }
index c6c859a..e46349f 100644 (file)
@@ -49,7 +49,7 @@ class FrontendRequestHandler extends AbstractRequestHandler {
                        $request->setIsCached(FALSE);
                }
                /** @var $response \TYPO3\CMS\Extbase\Mvc\ResponseInterface */
-               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
+               $response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
                $this->dispatcher->dispatch($request, $response);
                return $response;
        }
index ad426c8..3b6beb3 100644 (file)
@@ -132,7 +132,7 @@ class RequestBuilder implements \TYPO3\CMS\Core\SingletonInterface {
                $controllerName = $this->resolveControllerName($parameters);
                $actionName = $this->resolveActionName($controllerName, $parameters);
                /** @var $request \TYPO3\CMS\Extbase\Mvc\Web\Request */
-               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
+               $request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
                if ($this->vendorName !== NULL) {
                        $request->setControllerVendorName($this->vendorName);
                }
index 86e7cde..76d7d6c 100644 (file)
@@ -117,7 +117,7 @@ class DataMapFactory implements \TYPO3\CMS\Core\SingletonInterface {
                        }
                }
                /** @var $dataMap \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap */
-               $dataMap = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMap', $className, $tableName, $recordType, $subclasses);
+               $dataMap = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, $className, $tableName, $recordType, $subclasses);
                $dataMap = $this->addMetaDataColumnNames($dataMap, $tableName);
                // $classPropertyNames = $this->reflectionService->getClassPropertyNames($className);
                $tcaColumnsDefinition = $this->getColumnsDefinition($tableName);
@@ -410,6 +410,6 @@ class DataMapFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @return ColumnMap
         */
        protected function createColumnMap($columnName, $propertyName) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\ColumnMap', $columnName, $propertyName);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, $columnName, $propertyName);
        }
 }
index a20e6ee..7acd61a 100644 (file)
@@ -289,12 +289,12 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
                $propertyMetaData = $this->reflectionService->getClassSchema(get_class($parentObject))->getProperty($propertyName);
                if ($enableLazyLoading === TRUE && $propertyMetaData['lazy']) {
                        if ($propertyMetaData['type'] === 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage') {
-                               $result = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\LazyObjectStorage', $parentObject, $propertyName, $fieldValue);
+                               $result = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\LazyObjectStorage::class, $parentObject, $propertyName, $fieldValue);
                        } else {
                                if (empty($fieldValue)) {
                                        $result = NULL;
                                } else {
-                                       $result = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\LazyLoadingProxy', $parentObject, $propertyName, $fieldValue);
+                                       $result = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy::class, $parentObject, $propertyName, $fieldValue);
                                }
                        }
                } else {
index a24a30f..07dc46b 100644 (file)
@@ -36,7 +36,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
                if ($selectorName === '') {
                        $selectorName = $nodeTypeName;
                }
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Selector', $selectorName, $nodeTypeName);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class, $selectorName, $nodeTypeName);
        }
 
        /**
@@ -47,7 +47,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement
         */
        public function statement($statement, array $boundVariables = array()) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Statement', $statement, $boundVariables);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Statement::class, $statement, $boundVariables);
        }
 
        /**
@@ -60,7 +60,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\JoinInterface the join; non-null
         */
        public function join(SourceInterface $left, SourceInterface $right, $joinType, JoinConditionInterface $joinCondition) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Join', $left, $right, $joinType, $joinCondition);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Join::class, $left, $right, $joinType, $joinCondition);
        }
 
        /**
@@ -74,7 +74,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function equiJoinCondition($selector1Name, $property1Name, $selector2Name, $property2Name) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\EquiJoinCondition', $selector1Name, $property1Name, $selector2Name, $property2Name);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\EquiJoinCondition::class, $selector1Name, $property1Name, $selector2Name, $property2Name);
        }
 
        /**
@@ -86,7 +86,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function _and(ConstraintInterface $constraint1, ConstraintInterface $constraint2) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\LogicalAnd', $constraint1, $constraint2);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\LogicalAnd::class, $constraint1, $constraint2);
        }
 
        /**
@@ -98,7 +98,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function _or(ConstraintInterface $constraint1, ConstraintInterface $constraint2) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\LogicalOr', $constraint1, $constraint2);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\LogicalOr::class, $constraint1, $constraint2);
        }
 
        /**
@@ -109,7 +109,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function not(ConstraintInterface $constraint) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\LogicalNot', $constraint);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\LogicalNot::class, $constraint);
        }
 
        /**
@@ -122,7 +122,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function comparison(PropertyValueInterface $operand1, $operator, $operand2) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Comparison', $operand1, $operator, $operand2);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Comparison::class, $operand1, $operator, $operand2);
        }
 
        /**
@@ -134,7 +134,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function propertyValue($propertyName, $selectorName = '') {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\PropertyValue', $propertyName, $selectorName);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\PropertyValue::class, $propertyName, $selectorName);
        }
 
        /**
@@ -145,7 +145,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function lowerCase(PropertyValueInterface $operand) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\LowerCase', $operand);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\LowerCase::class, $operand);
        }
 
        /**
@@ -156,7 +156,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function upperCase(PropertyValueInterface $operand) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\UpperCase', $operand);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\UpperCase::class, $operand);
        }
 
        /**
@@ -169,7 +169,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function ascending(DynamicOperandInterface $operand) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Ordering', $operand, \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Ordering::class, $operand, \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING);
        }
 
        /**
@@ -182,7 +182,7 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function descending(DynamicOperandInterface $operand) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\Ordering', $operand, \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Ordering::class, $operand, \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING);
        }
 
        /**
@@ -193,6 +193,6 @@ class QueryObjectModelFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\RepositoryException if the operation otherwise fails
         */
        public function bindVariable($bindVariableName) {
-               return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\BindVariableValue', $bindVariableName);
+               return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\BindVariableValue::class, $bindVariableName);
        }
 }
index 64547de..9fd60ed 100644 (file)
@@ -200,7 +200,7 @@ class Query implements QueryInterface {
                if ($returnRawQueryResult) {
                        return $this->persistenceManager->getObjectDataByQuery($this);
                } else {
-                       return $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\QueryResultInterface', $this);
+                       return $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class, $this);
                }
        }
 
@@ -531,9 +531,9 @@ class Query implements QueryInterface {
         */
        public function __wakeup() {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->persistenceManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\PersistenceManagerInterface');
-               $this->dataMapper = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapper');
-               $this->qomFactory = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Qom\\QueryObjectModelFactory');
+               $this->persistenceManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+               $this->dataMapper = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+               $this->qomFactory = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactory::class);
        }
 
        /**
index 44f3d4b..f7b52ec 100644 (file)
@@ -44,8 +44,8 @@ class QueryFactory implements QueryFactoryInterface, \TYPO3\CMS\Core\SingletonIn
         * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception
         */
        public function create($className) {
-               $query = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\QueryInterface', $className);
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $query = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class, $className);
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
 
                $dataMap = $this->dataMapper->getDataMap($className);
                if ($dataMap->getIsStatic() || $dataMap->getRootLevel()) {
index 37fe300..153a576 100644 (file)
@@ -220,8 +220,8 @@ class QueryResult implements QueryResultInterface {
         */
        public function __wakeup() {
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->persistenceManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\PersistenceManagerInterface');
-               $this->dataMapper = $objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Mapper\\DataMapper');
+               $this->persistenceManager = $objectManager->get(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+               $this->dataMapper = $objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
        }
 
        /**
index 3f4f70d..1a81f81 100644 (file)
@@ -111,7 +111,7 @@ class Typo3QuerySettings implements QuerySettingsInterface {
                /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManager */
                $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
                /** @var $configurationManager \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface */
-               $configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $configurationManager = $objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
                if (TYPO3_MODE === 'BE' && $configurationManager->isFeatureEnabled('ignoreAllEnableFieldsInBe')) {
                        $this->setIgnoreEnableFields(TRUE);
                }
index 926556b..8737f39 100644 (file)
@@ -449,7 +449,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
                if (!class_exists($className)) {
                        throw new Exception\UnknownClassException('The classname "' . $className . '" was not found and thus can not be reflected.', 1278450972);
                }
-               $classSchema = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ClassSchema', $className);
+               $classSchema = $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ClassSchema::class, $className);
                if (is_subclass_of($className, 'TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity')) {
                        $classSchema->setModelType(ClassSchema::MODELTYPE_ENTITY);
                        $possibleRepositoryClassName = ClassNamingUtility::translateModelNameToRepositoryName($className);
index 0e7c7bb..8302164 100644 (file)
@@ -47,8 +47,8 @@ class FieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInter
         */
        public function __construct(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager = NULL, \TYPO3\CMS\Extbase\Mvc\Cli\CommandManager $commandManager = NULL, \TYPO3\CMS\Extbase\Reflection\ReflectionService $reflectionService = NULL) {
                $this->objectManager = $objectManager !== NULL ? $objectManager : \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->commandManager = $commandManager !== NULL ? $commandManager : $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\CommandManager');
-               $this->reflectionService = $reflectionService !== NULL ? $reflectionService : $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService');
+               $this->commandManager = $commandManager !== NULL ? $commandManager : $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
+               $this->reflectionService = $reflectionService !== NULL ? $reflectionService : $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
        }
 
        /**
index 5e68ee4..a8e93f0 100644 (file)
@@ -54,8 +54,8 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
        public function __construct() {
                parent::__construct();
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->commandManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\CommandManager');
-               $this->taskExecutor = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Scheduler\\TaskExecutor');
+               $this->commandManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
+               $this->taskExecutor = $this->objectManager->get(\TYPO3\CMS\Extbase\Scheduler\TaskExecutor::class);
        }
 
        /**
@@ -78,8 +78,8 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
         */
        public function __wakeup() {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->commandManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\CommandManager');
-               $this->taskExecutor = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Scheduler\\TaskExecutor');
+               $this->commandManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
+               $this->taskExecutor = $this->objectManager->get(\TYPO3\CMS\Extbase\Scheduler\TaskExecutor::class);
        }
 
        /**
index 71a57dd..6aeb6b7 100644 (file)
@@ -58,7 +58,7 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface {
         * Initialize Dispatcher
         */
        public function initializeObject() {
-               $this->dispatcher = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Dispatcher');
+               $this->dispatcher = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Dispatcher::class);
        }
 
        /**
@@ -69,8 +69,8 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface {
         */
        protected function initialize(array $configuration) {
                // initialize unconsumed Request and Response
-               $this->request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Request');
-               $this->response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Cli\\Response');
+               $this->request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Request::class);
+               $this->response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
                // initialize configuration
                $this->configurationManager->setContentObject(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class));
                $this->configurationManager->setConfiguration($configuration);
@@ -86,7 +86,7 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface {
                        }
                }
                // initialize reflection
-               $reflectionService = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService');
+               $reflectionService = $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
                $reflectionService->setDataCache(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('extbase_reflection'));
                if (!$reflectionService->isInitialized()) {
                        $reflectionService->initialize();
@@ -123,9 +123,9 @@ class TaskExecutor implements \TYPO3\CMS\Core\SingletonInterface {
         */
        protected function shutdown() {
                // shutdown
-               $persistenceManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
+               $persistenceManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
                $persistenceManager->persistAll();
-               $reflectionService = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService');
+               $reflectionService = $this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
                $reflectionService->shutdown();
        }
 }
index f9f46e7..4686f68 100644 (file)
@@ -293,7 +293,7 @@ class LocalizationUtility {
                        return static::$configurationManager;
                }
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $configurationManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $configurationManager = $objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
                static::$configurationManager = $configurationManager;
                return $configurationManager;
        }
index 8d7601f..c3de967 100644 (file)
@@ -209,11 +209,11 @@ class ValidatorResolver implements \TYPO3\CMS\Core\SingletonInterface {
         * @return \TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator
         */
        protected function buildSubObjectValidator(array $objectPath, \TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface $propertyValidator) {
-               $rootObjectValidator = $this->objectManager->get('TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator', array());
+               $rootObjectValidator = $this->objectManager->get(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class, array());
                $parentObjectValidator = $rootObjectValidator;
 
                while (count($objectPath) > 1) {
-                       $subObjectValidator = $this->objectManager->get('TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator', array());
+                       $subObjectValidator = $this->objectManager->get(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class, array());
                        $subPropertyName = array_shift($objectPath);
                        $parentObjectValidator->addPropertyValidator($subPropertyName, $subObjectValidator);
                        $parentObjectValidator = $subObjectValidator;
@@ -253,7 +253,7 @@ class ValidatorResolver implements \TYPO3\CMS\Core\SingletonInterface {
                if (class_exists($targetClassName)) {
                                // Model based validator
                        /** @var \TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator $objectValidator */
-                       $objectValidator = $this->objectManager->get('TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator', array());
+                       $objectValidator = $this->objectManager->get(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class, array());
                        foreach ($this->reflectionService->getClassPropertyNames($targetClassName) as $classPropertyName) {
                                $classPropertyTagsValues = $this->reflectionService->getPropertyTagsValues($targetClassName, $classPropertyName);
 
index d42186b..1dc1801 100644 (file)
@@ -50,8 +50,8 @@ class AddTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                parent::setUp();
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->persistentManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
-               $this->blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
+               $this->persistentManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+               $this->blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
        }
 
        /**
@@ -59,7 +59,7 @@ class AddTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        public function addSimpleObjectTest() {
                $newBlogTitle = 'aDi1oogh';
-               $newBlog = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Blog');
+               $newBlog = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Model\Blog::class);
                $newBlog->setTitle($newBlogTitle);
 
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository $blogRepository */
index 911e869..9acb2c5 100644 (file)
@@ -61,8 +61,8 @@ class CountTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml');
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->persistentManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
-               $this->postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $this->persistentManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+               $this->postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
        }
 
        /**
index a60434f..6c7b719 100644 (file)
@@ -56,8 +56,8 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml');
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
-               $this->postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $this->blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
+               $this->postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
 
        }
 
@@ -108,7 +108,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $blog1 = $this->blogRepository->findByUid(1);
                $blog2 = $this->blogRepository->findByUid(2);
 
-               $objectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $objectStorage = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class);
                $objectStorage->attach($blog1);
                $objectStorage->attach($blog2);
 
@@ -128,7 +128,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $blog1 = $this->blogRepository->findByUid(1);
                $blog2 = $this->blogRepository->findByUid(2);
 
-               $objectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $objectStorage = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class);
                $objectStorage->attach($blog1);
                $objectStorage->attach($blog2);
 
@@ -140,7 +140,7 @@ class InTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 
                $this->assertSame(11, $inQuery->count());
 
-               $newObjectStorage = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage');
+               $newObjectStorage = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class);
                $newObjectStorage->attach($blog1);
 
                $newInQuery = $this->postRepository->createQuery();
index 929f7e6..c53cfe4 100644 (file)
@@ -56,8 +56,8 @@ class OperatorTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml');
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
-               $this->postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $this->blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
+               $this->postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
 
        }
 
index eda8001..f98cd1e 100644 (file)
@@ -45,8 +45,8 @@ class QueryParserTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                parent::setUp();
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->queryParser = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Storage\\Typo3DbQueryParser');
-               $this->blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
+               $this->queryParser = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class);
+               $this->blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
        }
 
        /**
index 7f6e75d..ea84ac7 100644 (file)
@@ -58,9 +58,9 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/category-mm.xml');
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->persistentManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
+               $this->persistentManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
                /* @var $blogRepository \TYPO3\CMS\Extbase\Persistence\Repository */
-               $blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
+               $blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
                $this->blog = $blogRepository->findByUid(1);
        }
 
@@ -74,7 +74,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->assertSame($this->numberOfRecordsInFixture, $countPosts);
 
                $newPostTitle = 'sdufhisdhuf';
-               $newPost = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Post');
+               $newPost = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Model\Post::class);
                $newPost->setBlog($this->blog);
                $newPost->setTitle($newPostTitle);
                $newPost->setContent('Bla Bla Bla');
@@ -138,7 +138,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                foreach ($posts as $post) {
                        $this->blog->addPost($post);
                        if ($counter == 5) {
-                               $newPost = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Post');
+                               $newPost = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Model\Post::class);
                                $newPost->setBlog($this->blog);
                                $newPost->setTitle($newPostTitle);
                                $newPost->setContent('Bla Bla Bla');
@@ -239,9 +239,9 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->assertSame(10, $count);
 
                $newTagTitle = 'sdufhisdhuf';
-               $newTag = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Tag', $newTagTitle);
+               $newTag = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Model\Tag::class, $newTagTitle);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $post->addTag($newTag);
 
@@ -265,7 +265,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $count = $this->getDatabaseConnection()->exec_SELECTcountRows('*', 'tx_blogexample_domain_model_tag');
                $this->assertSame(10, $count);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $tags = $post->getTags();
                $tagsArray = $tags->toArray();
@@ -297,7 +297,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $countTags = $this->getDatabaseConnection()->exec_SELECTcountRows('*', 'tx_blogexample_post_tag_mm', 'uid_local=1');
                $this->assertSame(10, $countTags);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $tags = clone $post->getTags();
                $post->setTags(new ObjectStorage());
@@ -306,7 +306,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                foreach ($tags as $tag) {
                        $post->addTag($tag);
                        if ($counter == 5) {
-                               $newTag = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Model\\Tag', 'INSERTED TAG at position 6 : ' . strftime(''));
+                               $newTag = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Model\Tag::class, 'INSERTED TAG at position 6 : ' . strftime(''));
                                $post->addTag($newTag);
                        }
                        $counter++;
@@ -335,7 +335,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $countTags = $this->getDatabaseConnection()->exec_SELECTcountRows('*', 'tx_blogexample_post_tag_mm', 'uid_local=1');
                $this->assertSame(10, $countTags);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $tags = clone $post->getTags();
                $counter = 1;
@@ -369,7 +369,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $countTags = $this->getDatabaseConnection()->exec_SELECTcountRows('*', 'tx_blogexample_post_tag_mm', 'uid_local=1');
                $this->assertSame(10, $countTags);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $tags = clone $post->getTags();
                $tagsArray = $tags->toArray();
@@ -413,7 +413,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function timestampFieldIsUpdatedOnPostSave() {
                $rawPost = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'tx_blogexample_domain_model_post', 'uid=1');
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $post->setTitle("newTitle");
 
@@ -431,7 +431,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        public function mmRelationWithoutMatchFieldIsResolved() {
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\PostRepository $postRepository */
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $posts = $postRepository->findByTagAndBlog('Tag2', $this->blog);
                $this->assertSame(1, count($posts));
        }
@@ -444,7 +444,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->assertSame(3, $countCategories);
 
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\PostRepository $postRepository */
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
                $this->assertSame(3, count($post->getCategories()));
        }
@@ -456,7 +456,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        public function mmRelationWithMatchFieldIsResolvedFromForeignSide() {
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\PostRepository $postRepository */
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $posts = $postRepository->findByCategory(1);
                $this->assertSame(2, count($posts));
 
@@ -471,10 +471,10 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $countCategories = $this->getDatabaseConnection()->exec_SELECTcountRows('*', 'sys_category_record_mm', 'uid_foreign=1 AND tablenames="tx_blogexample_domain_model_post" AND fieldname="categories"');
                $this->assertSame(3, $countCategories);
 
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                $post = $postRepository->findByUid(1);
 
-               $newCategory = $this->objectManager->get('\\TYPO3\\CMS\\Extbase\\Domain\\Model\\Category');
+               $newCategory = $this->objectManager->get(\TYPO3\CMS\Extbase\Domain\Model\Category::class);
                $newCategory->setTitle('New Category');
 
                $post->addCategory($newCategory);
@@ -497,7 +497,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        public function adjustingMmRelationWithTablesnameAndFieldnameFieldDoNotTouchOtherRelations() {
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\PostRepository $postRepository */
-               $postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
                /** @var \ExtbaseTeam\BlogExample\Domain\Model\Post $post */
                $post = $postRepository->findByUid(1);
                // Move category down
@@ -526,7 +526,7 @@ class RelationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         */
        protected function updateAndPersistBlog() {
                /** @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository $blogRepository */
-               $blogRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\BlogRepository');
+               $blogRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository::class);
                $blogRepository->update($this->blog);
                $this->persistentManager->persistAll();
        }
index 85f978b..ab9aee2 100644 (file)
@@ -61,7 +61,7 @@ class TranslationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
                $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/translated-posts.xml');
 
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->postRepository = $this->objectManager->get('ExtbaseTeam\\BlogExample\\Domain\\Repository\\PostRepository');
+               $this->postRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\PostRepository::class);
 
                $this->setUpBasicFrontendEnvironment();
        }
index 8017947..5e52571 100644 (file)
@@ -47,7 +47,7 @@ class ExtensionCommandController extends CommandController {
                $this->emitPackagesMayHaveChangedSignal();
 
                /** @var $service \TYPO3\CMS\Extensionmanager\Utility\InstallUtility */
-               $service = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\InstallUtility');
+               $service = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class);
                $service->install($extensionKey);
        }
 
@@ -62,7 +62,7 @@ class ExtensionCommandController extends CommandController {
         */
        public function uninstallCommand($extensionKey) {
                /** @var $service \TYPO3\CMS\Extensionmanager\Utility\InstallUtility */
-               $service = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\InstallUtility');
+               $service = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class);
                $service->uninstall($extensionKey);
        }
 
index cf28456..d0cd15d 100644 (file)
@@ -120,7 +120,7 @@ class ConfigurationController extends AbstractController {
         */
        protected function saveConfiguration(array $config, $extensionKey) {
                /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility */
-               $configurationUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ConfigurationUtility');
+               $configurationUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class);
                $newConfiguration = $configurationUtility->getCurrentConfiguration($extensionKey);
                \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($newConfiguration, $config);
                $configurationUtility->writeConfiguration(
index fb74ef9..a69be17 100644 (file)
@@ -79,7 +79,7 @@ class ListController extends AbstractController {
                                )
                        );
                        /** @var \TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility $extensionModelUtility */
-                       $extensionModelUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ExtensionModelUtility');
+                       $extensionModelUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class);
                        $extension = $extensionModelUtility->mapExtensionArrayToModel($extensionArray[$extensionKey]);
                } else {
                        throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Extension ' . $extensionKey . ' is not available', 1402421007);
@@ -118,7 +118,7 @@ class ListController extends AbstractController {
                if ($importExportInstalled) {
                        // check if a TER update has been done at all, if not, fetch it directly
                        /** @var $repositoryHelper \TYPO3\CMS\Extensionmanager\Utility\Repository\Helper */
-                       $repositoryHelper = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\Repository\\Helper');
+                       $repositoryHelper = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class);
                        // repository needs an update, but not because of the extension hash has changed
                        if ($repositoryHelper->isExtListUpdateNecessary() > 0 && ($repositoryHelper->isExtListUpdateNecessary() & $repositoryHelper::PROBLEM_EXTENSION_HASH_CHANGED) === 0) {
                                $repositoryHelper->fetchExtListFile();
index 34820d0..96ee3d6 100644 (file)
@@ -32,7 +32,7 @@ class UpdateScriptController extends AbstractController {
                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('Request for update script', 'extensionmanager', 0, $extensionKey);
 
                /** @var $updateScriptUtility \TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility */
-               $updateScriptUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\UpdateScriptUtility');
+               $updateScriptUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility::class);
                $updateScriptResult = $updateScriptUtility->executeUpdateIfNeeded($extensionKey);
                $this->view
                        ->assign('updateScriptResult', $updateScriptResult)
index 65eddca..2a82858 100644 (file)
@@ -494,7 +494,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
        public function getDependencies() {
                if (!is_object($this->dependencies)) {
                        /** @var $extensionModelUtility \TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility */
-                       $extensionModelUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ExtensionModelUtility');
+                       $extensionModelUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class);
                        $this->setDependencies($extensionModelUtility->convertDependenciesToObjects($this->getSerializedDependencies()));
                }
                return $this->dependencies;
index 97dca64..572e7a1 100644 (file)
@@ -45,7 +45,7 @@ class ConfigurationItemRepository {
         */
        protected function getConfigurationArrayFromExtensionKey($extensionKey) {
                /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility */
-               $configurationUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ConfigurationUtility');
+               $configurationUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class);
                $defaultConfiguration = $configurationUtility->getDefaultConfigurationFromExtConfTemplateAsValuedArray($extensionKey);
 
                $resultArray = array();
@@ -165,7 +165,7 @@ class ConfigurationItemRepository {
        protected function mergeWithExistingConfiguration(array $defaultConfiguration, $extensionKey) {
                try {
                        $currentExtensionConfig = unserialize(
-                               $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager')
+                               $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class)
                                        ->getConfigurationValueByPath('EXT/extConf/' . $extensionKey)
                        );
                } catch (\RuntimeException $e) {
@@ -191,7 +191,7 @@ class ConfigurationItemRepository {
                $configurationObjectStorage = new \SplObjectStorage();
                foreach ($configuration as $category => $subcategory) {
                        /** @var $configurationCategoryObject \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory */
-                       $configurationCategoryObject = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\ConfigurationCategory');
+                       $configurationCategoryObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationCategory::class);
                        $configurationCategoryObject->setName($category);
                        if ($subcategory['highlightText']) {
                                $configurationCategoryObject->setHighlightText($subcategory['highlightText']);
@@ -199,7 +199,7 @@ class ConfigurationItemRepository {
                        }
                        foreach ($subcategory as $subcatName => $configurationItems) {
                                /** @var $configurationSubcategoryObject \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory */
-                               $configurationSubcategoryObject = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\ConfigurationSubcategory');
+                               $configurationSubcategoryObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationSubcategory::class);
                                $configurationSubcategoryObject->setName($subcatName);
                                foreach ($configurationItems as $configurationItem) {
                                        // Set sub category label if configuration item contains a subcat label.
@@ -211,7 +211,7 @@ class ConfigurationItemRepository {
                                        }
 
                                        /** @var $configurationObject \TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem */
-                                       $configurationObject = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\ConfigurationItem');
+                                       $configurationObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem::class);
                                        if (isset($configurationItem['generic'])) {
                                                $configurationObject->setGeneric($configurationItem['generic']);
                                        }
index d140d6d..6f37bef 100644 (file)
@@ -52,7 +52,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $defaultQuerySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
-               $defaultQuerySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $defaultQuerySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
                $defaultQuerySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($defaultQuerySettings);
                $this->databaseConnection = $GLOBALS['TYPO3_DB'];
index a290ed6..7ab90b6 100644 (file)
@@ -27,7 +27,7 @@ class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         */
        public function initializeObject() {
                /** @var $defaultQuerySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
-               $defaultQuerySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+               $defaultQuerySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
                $defaultQuerySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($defaultQuerySettings);
        }
index b0befc8..7dbcf39 100644 (file)
@@ -59,9 +59,9 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
         */
        public function __construct() {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->repositoryRepository = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Repository\\RepositoryRepository');
-               $this->listUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ListUtility');
-               $this->languageService = $this->objectManager->get('TYPO3\\CMS\\Lang\\LanguageService');
+               $this->repositoryRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class);
+               $this->listUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+               $this->languageService = $this->objectManager->get(\TYPO3\CMS\Lang\LanguageService::class);
                $this->languageService->includeLLFile('EXT:extensionmanager/Resources/Private/Language/locallang.xlf');
        }
 
@@ -108,7 +108,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
                /** @var $status \TYPO3\CMS\Reports\Status */
                $status = $this->objectManager->get(
-                       'TYPO3\\CMS\\Reports\\Status',
+                       \TYPO3\CMS\Reports\Status::class,
                        $this->languageService->getLL('report.status.mainRepository.title'),
                        $value,
                        $message,
@@ -197,7 +197,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
                        $severity = \TYPO3\CMS\Reports\Status::ERROR;
                }
                $result->loaded = $this->objectManager->get(
-                       'TYPO3\\CMS\\Reports\\Status',
+                       \TYPO3\CMS\Reports\Status::class,
                        $this->languageService->getLL('report.status.loadedExtensions.title'),
                        $value,
                        $message,
@@ -228,7 +228,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
                        $severity = \TYPO3\CMS\Reports\Status::WARNING;
                }
                $result->existing = $this->objectManager->get(
-                       'TYPO3\\CMS\\Reports\\Status',
+                       \TYPO3\CMS\Reports\Status::class,
                        $this->languageService->getLL('report.status.existingExtensions.title'),
                        $value,
                        $message,
@@ -259,7 +259,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
                        $severity = \TYPO3\CMS\Reports\Status::WARNING;
                }
                $result->loadedoutdated = $this->objectManager->get(
-                       'TYPO3\\CMS\\Reports\\Status',
+                       \TYPO3\CMS\Reports\Status::class,
                        $this->languageService->getLL('report.status.loadedOutdatedExtensions.title'),
                        $value,
                        $message,
@@ -290,7 +290,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
                        $severity = \TYPO3\CMS\Reports\Status::WARNING;
                }
                $result->existingoutdated = $this->objectManager->get(
-                       'TYPO3\\CMS\\Reports\\Status',
+                       \TYPO3\CMS\Reports\Status::class,
                        $this->languageService->getLL('report.status.existingOutdatedExtensions.title'),
                        $value,
                        $message,
index de03ec8..842f682 100644 (file)
@@ -333,7 +333,7 @@ class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface {
        protected function getSignalSlotDispatcher() {
                if (!isset($this->signalSlotDispatcher)) {
                        $this->signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class)
-                               ->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+                               ->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
                }
                return $this->signalSlotDispatcher;
        }
index 6e1b7f5..134ddbf 100644 (file)
@@ -44,11 +44,11 @@ class UpdateExtensionListTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
 
                /** @var $repositoryHelper \TYPO3\CMS\Extensionmanager\Utility\Repository\Helper */
-               $repositoryHelper = $objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\Repository\\Helper');
+               $repositoryHelper = $objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class);
                $repositoryHelper->updateExtList();
 
                /** @var $persistenceManager \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager */
-               $persistenceManager = $objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
+               $persistenceManager = $objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
                $persistenceManager->persistAll();
        }
 }
index 003407c..2b015f7 100644 (file)
@@ -57,7 +57,7 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface {
         */
        public function writeConfiguration(array $configuration = array(), $extensionKey) {
                /** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $configurationManager->setLocalConfigurationValueByPath('EXT/extConf/' . $extensionKey, serialize($configuration));
        }
 
@@ -114,7 +114,7 @@ class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface {
                if (strlen($rawConfigurationString) > 0) {
                        $extensionPathInformation = $this->getExtensionPathInformation($extensionKey);
 
-                       $tsStyleConfig = $this->objectManager->get('TYPO3\\CMS\\Core\\TypoScript\\ConfigurationForm');
+                       $tsStyleConfig = $this->objectManager->get(\TYPO3\CMS\Core\TypoScript\ConfigurationForm::class);
                        $tsStyleConfig->doNotSortCategoriesBeforeMakingForm = TRUE;
 
                        $theConstants = $tsStyleConfig->ext_initTSstyleConfig(
index 56cf509..beeba92 100644 (file)
@@ -35,7 +35,7 @@ class ExtensionModelUtility {
         */
        public function mapExtensionArrayToModel(array $extensionArray) {
                /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension */
-               $extension = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\Extension');
+               $extension = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
                $extension->setExtensionKey($extensionArray['key']);
                if (isset($extensionArray['version'])) {
                        $extension->setVersion($extensionArray['version']);
@@ -73,7 +73,7 @@ class ExtensionModelUtility {
                                                $highest = '';
                                        }
                                        /** @var $dependencyObject \TYPO3\CMS\Extensionmanager\Domain\Model\Dependency */
-                                       $dependencyObject = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\Dependency');
+                                       $dependencyObject = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class);
                                        $dependencyObject->setType($dependencyType);
                                        $dependencyObject->setIdentifier($dependency);
                                        $dependencyObject->setLowestVersion($lowest);
index 9211620..f11fcdc 100644 (file)
@@ -118,9 +118,9 @@ class ExtensionListUtility implements \SplObserver {
        public function __construct() {
                /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManager */
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->repositoryRepository = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Repository\\RepositoryRepository');
-               $this->extensionRepository = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Repository\\ExtensionRepository');
-               $this->extensionModel = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Model\\Extension');
+               $this->repositoryRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class);
+               $this->extensionRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class);
+               $this->extensionModel = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
                // TODO catch parser exception
                $this->parser = \TYPO3\CMS\Extensionmanager\Utility\Parser\XmlParserFactory::getParserInstance('extension');
                if (is_object($this->parser)) {
index e9d5a23..0436404 100644 (file)
@@ -291,7 +291,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
         */
        protected function saveDefaultConfiguration($extensionKey) {
                /** @var $configUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility */
-               $configUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\ConfigurationUtility');
+               $configUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class);
                $configUtility->saveDefaultConfiguration($extensionKey);
        }
 
@@ -451,14 +451,14 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
                }
                if ($importFileToUse !== NULL) {
                        /** @var ImportExportUtility $importExportUtility */
-                       $importExportUtility = $this->objectManager->get('TYPO3\\CMS\\Impexp\\Utility\\ImportExportUtility');
+                       $importExportUtility = $this->objectManager->get(\TYPO3\CMS\Impexp\Utility\ImportExportUtility::class);
                        try {
                                $importResult = $importExportUtility->importT3DFile(PATH_site . $importFileToUse, 0);
                                $this->registry->set('extensionDataImport', $extensionSiteRelPath . 'Initialisation/dataImported', 1);
                                $this->emitAfterExtensionT3DImportSignal($importFileToUse, $importResult);
                        } catch (\ErrorException $e) {
                                /** @var \TYPO3\CMS\Core\Log\Logger $logger */
-                               $logger = $this->objectManager->get('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
+                               $logger = $this->objectManager->get(\TYPO3\CMS\Core\Log\LogManager::class)->getLogger(__CLASS__);
                                $logger->log(\TYPO3\CMS\Core\Log\LogLevel::WARNING, $e->getMessage());
                        }
                }
index d5b24bd..1f23bf3 100644 (file)
@@ -70,8 +70,8 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface {
                /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManager */
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
                /** @var \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository $repositoryRepository */
-               $repositoryRepository = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Repository\\RepositoryRepository');
-               $this->extensionRepository = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Domain\\Repository\\ExtensionRepository');
+               $repositoryRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class);
+               $this->extensionRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class);
                /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Repository $repository */
                $repository = $repositoryRepository->findByUid(1);
                if (is_object($repository)) {
@@ -288,7 +288,7 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface {
                        if ($updateNecessity === 0) {
                                $uid = $this->repository->getUid();
                                /* @var $objExtListImporter \TYPO3\CMS\Extensionmanager\Utility\Importer\ExtensionListUtility */
-                               $objExtListImporter = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\Importer\\ExtensionListUtility');
+                               $objExtListImporter = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\Importer\ExtensionListUtility::class);
                                $objExtListImporter->import($this->getLocalExtListFile(), $uid);
                                $updated = TRUE;
                        }
index be85202..72553a2 100644 (file)
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Form;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
+
 /**
  * View Helper for rendering Extension Manager Configuration Form
  *
@@ -268,8 +270,8 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
         */
        protected function renderHiddenFieldForEmptyValue($configuration) {
                $hiddenFieldNames = array();
-               if ($this->viewHelperVariableContainer->exists('TYPO3\\CMS\\Fluid\\ViewHelpers\\FormViewHelper', 'renderedHiddenFields')) {
-                       $hiddenFieldNames = $this->viewHelperVariableContainer->get('TYPO3\\CMS\\Fluid\\ViewHelpers\\FormViewHelper', 'renderedHiddenFields');
+               if ($this->viewHelperVariableContainer->exists(FormViewHelper::class, 'renderedHiddenFields')) {
+                       $hiddenFieldNames = $this->viewHelperVariableContainer->get(FormViewHelper::class, 'renderedHiddenFields');
                }
                $fieldName = $this->getName($configuration);
                if (substr($fieldName, -2) === '[]') {
@@ -277,7 +279,7 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
                }
                if (!in_array($fieldName, $hiddenFieldNames)) {
                        $hiddenFieldNames[] = $fieldName;
-                       $this->viewHelperVariableContainer->addOrUpdate('TYPO3\\CMS\\Fluid\\ViewHelpers\\FormViewHelper', 'renderedHiddenFields', $hiddenFieldNames);
+                       $this->viewHelperVariableContainer->addOrUpdate(FormViewHelper::class, 'renderedHiddenFields', $hiddenFieldNames);
                        return '<input type="hidden" name="' . htmlspecialchars($fieldName) . '" value="0" />';
                }
                return '';
index 26f461e..c12a65a 100644 (file)
@@ -71,7 +71,7 @@ class ImageViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper {
                                $image = static::render($fallbackImage, $width, $height, $minWidth, $minHeight, $maxWidth, $maxHeight);
                        }
                        /** @var \TYPO3\CMS\Core\Log\Logger $logger */
-                       $logger = $this->objectManager->get('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
+                       $logger = $this->objectManager->get(\TYPO3\CMS\Core\Log\LogManager::class)->getLogger(__CLASS__);
                        $logger->log(\TYPO3\CMS\Core\Log\LogLevel::WARNING, $e->getMessage());
                }
                return $image;
index d8462ef..07d94aa 100644 (file)
@@ -35,7 +35,7 @@ class ToggleExtensionInstallationStateViewHelper extends \TYPO3\CMS\Fluid\ViewHe
        public function render($extension) {
                // Early return if package is protected and can not be unloaded
                /** @var $packageManager \TYPO3\CMS\Core\Package\PackageManager */
-               $packageManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Package\\PackageManager');
+               $packageManager = $this->objectManager->get(\TYPO3\CMS\Core\Package\PackageManager::class);
                $package = $packageManager->getPackage($extension['key']);
                if ($package->isProtected()) {
                        return '';
index 0a58cf4..c21e79e 100644 (file)
@@ -44,7 +44,7 @@ class UpdateScriptViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionVie
 
                // If the "class.ext_update.php" file exists, build link to the update script screen
                /** @var $updateScriptUtility \TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility */
-               $updateScriptUtility = $this->objectManager->get('TYPO3\\CMS\\Extensionmanager\\Utility\\UpdateScriptUtility');
+               $updateScriptUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility::class);
                if ($updateScriptUtility->checkUpdateScriptExists($extensionKey)) {
                        $uriBuilder = $this->controllerContext->getUriBuilder();
                        $action = 'show';
index b4cb426..da97bfc 100644 (file)
@@ -41,8 +41,8 @@ class DocbookGeneratorService extends \TYPO3\CMS\Fluid\Service\DocbookGenerator
         */
        public function userFunc() {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->injectDocCommentParser($this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\DocCommentParser'));
-               $this->injectReflectionService($this->objectManager->get('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService'));
+               $this->injectDocCommentParser($this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\DocCommentParser::class));
+               $this->injectReflectionService($this->objectManager->get(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class));
                return $this->generateDocbook('TYPO3\CMS\Fluid\ViewHelpers');
        }
 
index 7a46c5c..a9c577d 100644 (file)
@@ -28,7 +28,7 @@ class TemplateParserBuilder {
        static public function build() {
                /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $templateParser = $objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\TemplateParser');
+               $templateParser = $objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\TemplateParser::class);
                return $templateParser;
        }
 }
index 947dbe3..8e46bf7 100644 (file)
@@ -60,9 +60,9 @@ class Escape implements \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface {
                                }
                        }
                } elseif ($this->interceptorEnabled && $node instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode) {
-                       $escapeViewHelper = $this->objectManager->get('TYPO3\\CMS\\Fluid\\ViewHelpers\\Format\\HtmlspecialcharsViewHelper');
+                       $escapeViewHelper = $this->objectManager->get(\TYPO3\CMS\Fluid\ViewHelpers\Format\HtmlspecialcharsViewHelper::class);
                        $node = $this->objectManager->get(
-                               'TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode',
+                               \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode::class,
                                $escapeViewHelper,
                                array('value' => $node)
                        );
index b5e4482..285038e 100644 (file)
@@ -428,8 +428,8 @@ class TemplateParser {
                $regularExpression_openingViewHelperTag = $this->prepareTemplateRegularExpression(self::$SCAN_PATTERN_TEMPLATE_VIEWHELPERTAG);
                $regularExpression_closingViewHelperTag = $this->prepareTemplateRegularExpression(self::$SCAN_PATTERN_TEMPLATE_CLOSINGVIEWHELPERTAG);
 
-               $state = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\ParsingState');
-               $rootNode = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\RootNode');
+               $state = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\ParsingState::class);
+               $rootNode = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class);
                $state->setRootNode($rootNode);
                $state->pushNodeToStack($rootNode);
 
@@ -496,7 +496,7 @@ class TemplateParser {
                $this->abortIfRequiredArgumentsAreMissing($expectedViewHelperArguments, $argumentsObjectTree);
                $this->rewriteBooleanNodesInArgumentsObjectTree($expectedViewHelperArguments, $argumentsObjectTree);
 
-               $currentViewHelperNode = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode', $viewHelper, $argumentsObjectTree);
+               $currentViewHelperNode = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode::class, $viewHelper, $argumentsObjectTree);
 
                $state->getNodeFromStack()->addChildNode($currentViewHelperNode);
 
@@ -663,7 +663,7 @@ class TemplateParser {
                // Object Accessor
                if (strlen($objectAccessorString) > 0) {
 
-                       $node = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ObjectAccessorNode', $objectAccessorString);
+                       $node = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode::class, $objectAccessorString);
                        $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_OBJECTACCESSOR, $state);
 
                        $state->getNodeFromStack()->addChildNode($node);
@@ -710,7 +710,7 @@ class TemplateParser {
        protected function postProcessArgumentsForObjectAccessor(array $arguments) {
                foreach ($arguments as $argumentName => $argumentValue) {
                        if (!($argumentValue instanceof \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode)) {
-                               $arguments[$argumentName] = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', (string)$argumentValue);
+                               $arguments[$argumentName] = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode::class, (string)$argumentValue);
                        }
                }
                return $arguments;
@@ -753,7 +753,7 @@ class TemplateParser {
         */
        protected function buildArgumentObjectTree($argumentString) {
                if (strpos($argumentString, '{') === FALSE && strpos($argumentString, '<') === FALSE) {
-                       return $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', $argumentString);
+                       return $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode::class, $argumentString);
                }
                $splitArgument = $this->splitTemplateAtDynamicTags($argumentString);
                $rootNode = $this->buildObjectTree($splitArgument, self::CONTEXT_INSIDE_VIEWHELPER_ARGUMENTS)->getRootNode();
@@ -831,7 +831,7 @@ class TemplateParser {
         */
        protected function arrayHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $arrayText) {
                $state->getNodeFromStack()->addChildNode(
-                       $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ArrayNode', $this->recursiveArrayHandler($arrayText))
+                       $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ArrayNode::class, $this->recursiveArrayHandler($arrayText))
                );
        }
 
@@ -856,14 +856,14 @@ class TemplateParser {
                        foreach ($matches as $singleMatch) {
                                $arrayKey = $singleMatch['Key'];
                                if (!empty($singleMatch['VariableIdentifier'])) {
-                                       $arrayToBuild[$arrayKey] = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ObjectAccessorNode', $singleMatch['VariableIdentifier']);
+                                       $arrayToBuild[$arrayKey] = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ObjectAccessorNode::class, $singleMatch['VariableIdentifier']);
                                } elseif (array_key_exists('Number', $singleMatch) && (!empty($singleMatch['Number']) || $singleMatch['Number'] === '0')) {
                                        $arrayToBuild[$arrayKey] = floatval($singleMatch['Number']);
                                } elseif ((array_key_exists('QuotedString', $singleMatch) && !empty($singleMatch['QuotedString']))) {
                                        $argumentString = $this->unquoteString($singleMatch['QuotedString']);
                                        $arrayToBuild[$arrayKey] = $this->buildArgumentObjectTree($argumentString);
                                } elseif (array_key_exists('Subarray', $singleMatch) && !empty($singleMatch['Subarray'])) {
-                                       $arrayToBuild[$arrayKey] = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ArrayNode', $this->recursiveArrayHandler($singleMatch['Subarray']));
+                                       $arrayToBuild[$arrayKey] = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ArrayNode::class, $this->recursiveArrayHandler($singleMatch['Subarray']));
                                } else {
                                        throw new \TYPO3\CMS\Fluid\Core\Parser\Exception('This exception should never be thrown, as the array value has to be of some type (Value given: "' . var_export($singleMatch, TRUE) . '"). Please post your template to the bugtracker at forge.typo3.org.', 1225136013);
                                }
@@ -882,7 +882,7 @@ class TemplateParser {
         * @return void
         */
        protected function textHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $text) {
-               $node = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\TextNode', $text);
+               $node = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\TextNode::class, $text);
                $this->callInterceptor($node, \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_TEXT, $state);
 
                $state->getNodeFromStack()->addChildNode($node);
index 68751f4..d73a61f 100644 (file)
@@ -78,7 +78,7 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
         */
        public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager) {
                $this->objectManager = $objectManager;
-               $this->widgetContext = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetContext');
+               $this->widgetContext = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
        }
 
        /**
@@ -122,7 +122,7 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
         * @return void
         */
        public function setChildNodes(array $childNodes) {
-               $rootNode = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\RootNode');
+               $rootNode = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class);
                foreach ($childNodes as $childNode) {
                        $rootNode->addChildNode($childNode);
                }
@@ -153,10 +153,10 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
                        }
                        throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException('initiateSubRequest() can not be called if there is no controller inside $this->controller. Make sure to add a corresponding injectController method to your WidgetViewHelper class "' . get_class($this) . '".', 1284401632);
                }
-               $subRequest = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetRequest');
+               $subRequest = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
                $subRequest->setWidgetContext($this->widgetContext);
                $this->passArgumentsToSubRequest($subRequest);
-               $subResponse = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
+               $subResponse = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
                $this->controller->processRequest($subRequest, $subResponse);
                return $subResponse;
        }
index 0531726..fbb26ce 100644 (file)
@@ -52,12 +52,12 @@ class Bootstrap {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
                $this->initializeConfiguration($configuration);
                $this->configureObjectManager();
-               $ajaxWidgetContextHolder = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\AjaxWidgetContextHolder');
+               $ajaxWidgetContextHolder = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class);
                $widgetIdentifier = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('fluid-widget-id');
                $widgetContext = $ajaxWidgetContextHolder->get($widgetIdentifier);
                $configuration['extensionName'] = $widgetContext->getParentExtensionName();
                $configuration['pluginName'] = $widgetContext->getParentPluginName();
-               $extbaseBootstrap = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Core\\Bootstrap');
+               $extbaseBootstrap = $this->objectManager->get(\TYPO3\CMS\Extbase\Core\Bootstrap::class);
                $extbaseBootstrap->cObj = $this->cObj;
                return $extbaseBootstrap->run($content, $configuration);
        }
@@ -70,7 +70,7 @@ class Bootstrap {
         * @see initialize()
         */
        public function initializeConfiguration($configuration) {
-               $this->configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $this->configurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
                /** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject */
                $contentObject = isset($this->cObj) ? $this->cObj : \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
                $this->configurationManager->setContentObject($contentObject);
index faa28ed..66761f2 100644 (file)
@@ -44,7 +44,7 @@ class WidgetRequestBuilder extends \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder {
         * @return \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest The widget request as an object
         */
        public function build() {
-               $request = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Widget\\WidgetRequest');
+               $request = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
                $request->setRequestURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
                $request->setBaseURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
                $request->setMethod(isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : NULL);
index 9e81fb3..951cef7 100644 (file)
@@ -56,7 +56,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
                if (isset($this->cObj->data) && is_array($this->cObj->data)) {
                        $request->setContentObjectData($this->cObj->data);
                }
-               $response = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Response');
+               $response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
                $this->dispatcher->dispatch($request, $response);
                return $response;
        }
index 573fd22..60d884f 100644 (file)
@@ -205,7 +205,7 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
                        // in case we render a layout right now, we will render a section inside a TEMPLATE.
                        $renderingTypeOnNextLevel = self::RENDERING_TEMPLATE;
                } else {
-                       $variableContainer = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer', $variables);
+                       $variableContainer = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class, $variables);
                        $renderingContext = clone $renderingContext;
                        $renderingContext->injectTemplateVariableContainer($variableContainer);
                        $renderingTypeOnNextLevel = $this->getCurrentRenderingType();
@@ -267,7 +267,7 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
                        }
                }
 
-               $variableContainer = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer', $variables);
+               $variableContainer = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class, $variables);
                $renderingContext = clone $this->getCurrentRenderingContext();
                $renderingContext->injectTemplateVariableContainer($variableContainer);
 
@@ -348,9 +348,9 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
         * @return \TYPO3\CMS\Fluid\Core\Parser\Configuration
         */
        protected function buildParserConfiguration() {
-               $parserConfiguration = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\Configuration');
+               $parserConfiguration = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\Configuration::class);
                if ($this->controllerContext->getRequest()->getFormat() === 'html') {
-                       $parserConfiguration->addInterceptor($this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\Interceptor\\Escape'));
+                       $parserConfiguration->addInterceptor($this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\Interceptor\Escape::class));
                }
                return $parserConfiguration;
        }
index b9220ae..ffeb00f 100644 (file)
@@ -71,27 +71,27 @@ class StandaloneView extends AbstractTemplateView {
        public function __construct(ContentObjectRenderer $contentObject = NULL) {
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
                /** @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManagerInterface');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
                if ($contentObject === NULL) {
                        /** @var ContentObjectRenderer $contentObject */
                        $contentObject = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
                }
                $configurationManager->setContentObject($contentObject);
-               $this->templateParser = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\TemplateParser');
-               $this->setRenderingContext($this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContext'));
+               $this->templateParser = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\TemplateParser::class);
+               $this->setRenderingContext($this->objectManager->get(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContext::class));
                /** @var \TYPO3\CMS\Extbase\Mvc\Web\Request $request */
-               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
+               $request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
                $request->setRequestURI(GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
                $request->setBaseURI(GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
                /** @var \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder $uriBuilder */
-               $uriBuilder = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
+               $uriBuilder = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
                $uriBuilder->setRequest($request);
                /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext */
-               $controllerContext = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext');
+               $controllerContext = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
                $controllerContext->setRequest($request);
                $controllerContext->setUriBuilder($uriBuilder);
                $this->setControllerContext($controllerContext);
-               $this->templateCompiler = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Compiler\\TemplateCompiler');
+               $this->templateCompiler = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler::class);
                // singleton
                $this->templateCompiler->setTemplateCache(GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('fluid_template'));
        }
index 98db4da..d846f60 100644 (file)
@@ -134,7 +134,7 @@ class TemplateView extends AbstractTemplateView {
        public function __construct() {
                $this->templateParser = TemplateParserBuilder::build();
                $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->setRenderingContext($this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContextInterface'));
+               $this->setRenderingContext($this->objectManager->get(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface::class));
        }
 
        /**
index 4296366..2c381ae 100644 (file)
@@ -42,7 +42,7 @@ class AbstractController {
         */
        protected function isInstallToolAvailable() {
                /** @var \TYPO3\CMS\Install\Service\EnableFileService $installToolEnableService */
-               $installToolEnableService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\EnableFileService');
+               $installToolEnableService = $this->objectManager->get(\TYPO3\CMS\Install\Service\EnableFileService::class);
                if ($installToolEnableService->isFirstInstallAllowed()) {
                        return TRUE;
                }
@@ -62,11 +62,11 @@ class AbstractController {
                if (!$this->isInstallToolAvailable()) {
                        if (!EnableFileService::isFirstInstallAllowed() && !is_dir(PATH_typo3conf)) {
                                /** @var \TYPO3\CMS\Install\Controller\Action\ActionInterface $action */
-                               $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Common\\AccessNotAllowedAction');
+                               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\AccessNotAllowedAction::class);
                                $action->setAction('accessNotAllowed');
                        } else {
                                /** @var \TYPO3\CMS\Install\Controller\Action\ActionInterface $action */
-                               $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Common\\InstallToolDisabledAction');
+                               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\InstallToolDisabledAction::class);
                                $action->setAction('installToolDisabled');
                        }
                        $action->setController('common');
@@ -85,7 +85,7 @@ class AbstractController {
                        && (empty($GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']))
                ) {
                        /** @var \TYPO3\CMS\Install\Controller\Action\ActionInterface $action */
-                       $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Common\\InstallToolPasswordNotSetAction');
+                       $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\InstallToolPasswordNotSetAction::class);
                        $action->setController('common');
                        $action->setAction('installToolPasswordNotSet');
                        $this->output($action->handle());
@@ -141,7 +141,7 @@ class AbstractController {
                                $this->redirect();
                        } else {
                                /** @var $message \TYPO3\CMS\Install\Status\ErrorStatus */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Invalid form token');
                                $message->setMessage(
                                        'The form protection token was invalid. You have been logged out, please log in and try again.'
@@ -177,7 +177,7 @@ class AbstractController {
                        $this->redirect();
                } else {
                        /** @var $message \TYPO3\CMS\Install\Status\ErrorStatus */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Session expired');
                        $message->setMessage(
                                'Your Install Tool session has expired. You have been logged out, please log in and try again.'
@@ -194,7 +194,7 @@ class AbstractController {
         */
        protected function loginForm(\TYPO3\CMS\Install\Status\StatusInterface $message = NULL) {
                /** @var \TYPO3\CMS\Install\Controller\Action\Common\LoginForm $action */
-               $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Common\\LoginForm');
+               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\LoginForm::class);
                $action->setController('common');
                $action->setAction('login');
                $action->setToken($this->generateTokenForAction('login'));
@@ -226,7 +226,7 @@ class AbstractController {
                                } elseif (md5($password) === $installToolPassword) {
                                        // Update install tool password
                                        $saltFactory = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance(NULL, 'BE');
-                                       $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                                       $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                                        $configurationManager->setLocalConfigurationValueByPath(
                                                'BE/installToolPassword',
                                                $saltFactory->getHashedPassword($password)
@@ -242,7 +242,7 @@ class AbstractController {
                                $saltFactory = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance(NULL, 'BE');
                                $hashedPassword = $saltFactory->getHashedPassword($password);
                                /** @var $message \TYPO3\CMS\Install\Status\ErrorStatus */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Login failed');
                                $message->setMessage('Given password does not match the install tool login password. ' .
                                        'Calculated hash: ' . $hashedPassword);
@@ -277,7 +277,7 @@ class AbstractController {
                $warningEmailAddress = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
                if ($warningEmailAddress) {
                        /** @var \TYPO3\CMS\Core\Mail\MailMessage $mailMessage */
-                       $mailMessage = $this->objectManager->get('TYPO3\\CMS\\Core\\Mail\\MailMessage');
+                       $mailMessage = $this->objectManager->get(\TYPO3\CMS\Core\Mail\MailMessage::class);
                        $mailMessage
                                ->addTo($warningEmailAddress)
                                ->setSubject('Install Tool Login at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
@@ -301,7 +301,7 @@ class AbstractController {
                $warningEmailAddress = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
                if ($warningEmailAddress) {
                        /** @var \TYPO3\CMS\Core\Mail\MailMessage $mailMessage */
-                       $mailMessage = $this->objectManager->get('TYPO3\\CMS\\Core\\Mail\\MailMessage');
+                       $mailMessage = $this->objectManager->get(\TYPO3\CMS\Core\Mail\MailMessage::class);
                        $mailMessage
                                ->addTo($warningEmailAddress)
                                ->setSubject('Install Tool Login ATTEMPT at \'' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '\'')
@@ -348,7 +348,7 @@ class AbstractController {
         */
        protected function isInitialInstallationInProgress() {
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
 
                $localConfigurationFileLocation = $configurationManager->getLocalConfigurationFileLocation();
                $localConfigurationFileExists = @is_file($localConfigurationFileLocation);
@@ -370,7 +370,7 @@ class AbstractController {
         */
        protected function initializeSession() {
                /** @var \TYPO3\CMS\Install\Service\SessionService $session */
-               $this->session = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SessionService');
+               $this->session = $this->objectManager->get(\TYPO3\CMS\Install\Service\SessionService::class);
                if (!$this->session->hasSession()) {
                        $this->session->startSession();
                }
index 500f32f..a5d9524 100644 (file)
@@ -96,7 +96,7 @@ abstract class AbstractAction implements ActionInterface {
         */
        protected function initializeHandle() {
                // Context service distinguishes between standalone and backend context
-               $contextService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\ContextService');
+               $contextService = $this->objectManager->get(\TYPO3\CMS\Install\Service\ContextService::class);
 
                $viewRootPath = GeneralUtility::getFileAbsFileName('EXT:install/Resources/Private/');
                $controllerActionDirectoryName = ucfirst($this->controller);
@@ -222,7 +222,7 @@ abstract class AbstractAction implements ActionInterface {
                static $database;
                if (!is_object($database)) {
                        /** @var \TYPO3\CMS\Core\Database\DatabaseConnection $database */
-                       $database = $this->objectManager->get('TYPO3\\CMS\\Core\\Database\\DatabaseConnection');
+                       $database = $this->objectManager->get(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
                        $database->setDatabaseUsername($GLOBALS['TYPO3_CONF_VARS']['DB']['username']);
                        $database->setDatabasePassword($GLOBALS['TYPO3_CONF_VARS']['DB']['password']);
                        $database->setDatabaseHost($GLOBALS['TYPO3_CONF_VARS']['DB']['host']);
index 651c40d..c4400b2 100644 (file)
@@ -31,7 +31,7 @@ class ClearCache extends AbstractAjaxAction {
         */
        protected function executeAction() {
                /** @var \TYPO3\CMS\Install\Service\ClearCacheService $clearCacheService */
-               $clearCacheService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\ClearCacheService');
+               $clearCacheService = $this->objectManager->get(\TYPO3\CMS\Install\Service\ClearCacheService::class);
                $clearCacheService->clearAll();
                return 'OK';
        }
index b75f2fe..d6bf4e5 100644 (file)
@@ -68,7 +68,7 @@ class CoreUpdateIsUpdateAvailable extends AbstractCoreUpdate {
         */
        protected function getMessage($severity, $title, $message = '') {
                /** @var $statusMessage \TYPO3\CMS\Install\Status\StatusInterface */
-               $statusMessage = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\' . ucfirst($severity) . 'Status');
+               $statusMessage = $this->objectManager->get(\TYPO3\CMS\Install\Status\::class . ucfirst($severity) . 'Status');
                $statusMessage->setTitle($title);
                $statusMessage->setMessage($message);
 
index 0f2ba11..e22853f 100644 (file)
@@ -26,10 +26,10 @@ class EnvironmentStatus extends AbstractAjaxAction {
         */
        protected function executeAction() {
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
 
                // Count of failed environment checks are displayed in the left navigation menu
-               $environmentStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\SystemEnvironment\\Check')->getStatus();
+               $environmentStatus = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class)->getStatus();
                $environmentErrors = $statusUtility->filterBySeverity($environmentStatus, 'error');
                return count($environmentErrors);
        }
index 8866baf..aa38f0b 100644 (file)
@@ -27,16 +27,16 @@ class FolderStatus extends AbstractAjaxAction {
        protected function executeAction() {
                // Count of folder structure errors are displayed in left navigation menu
                /** @var $folderStructureFacade \TYPO3\CMS\Install\FolderStructure\StructureFacade */
-               $folderStructureFacade = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultFactory')->getStructure();
+               $folderStructureFacade = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultFactory::class)->getStructure();
                $folderStatus = $folderStructureFacade->getStatus();
 
                /** @var $permissionCheck \TYPO3\CMS\Install\FolderStructure\DefaultPermissionsCheck */
-               $permissionCheck = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultPermissionsCheck');
+               $permissionCheck = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultPermissionsCheck::class);
                $folderStatus[] = $permissionCheck->getMaskStatus('fileCreateMask');
                $folderStatus[] = $permissionCheck->getMaskStatus('folderCreateMask');
 
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
 
                $folderStructureErrors = array_merge(
                        $statusUtility->filterBySeverity($folderStatus, 'error'),
index 7937dcc..9b60533 100644 (file)
@@ -28,10 +28,10 @@ class InstallToolDisabledAction extends Action\AbstractAction {
         */
        protected function executeAction() {
                /** @var \TYPO3\CMS\Install\SystemEnvironment\Check $statusCheck */
-               $statusCheck = $this->objectManager->get('TYPO3\\CMS\\Install\\SystemEnvironment\\Check');
+               $statusCheck = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class);
                $statusObjects = $statusCheck->getStatus();
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
                $alerts = $statusUtility->filterBySeverity($statusObjects, 'alert');
                $this->view->assign('alerts', $alerts);
                return $this->view->render(!empty($alerts));
index b4e1e0d..9037eae 100644 (file)
@@ -36,7 +36,7 @@ class DatabaseConnect extends AbstractStepAction {
                $result = array();
 
                /** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
 
                $postValues = $this->postValues['values'];
                if (isset($postValues['loadDbal'])) {
@@ -91,7 +91,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/username'] = $value;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database username not valid');
                                        $errorStatus->setMessage('Given username must be shorter than fifty characters.');
                                        $result[] = $errorStatus;
@@ -104,7 +104,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/password'] = $value;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database password not valid');
                                        $errorStatus->setMessage('Given password must be shorter than fifty characters.');
                                        $result[] = $errorStatus;
@@ -117,7 +117,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/host'] = $value;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database host not valid');
                                        $errorStatus->setMessage('Given host is not alphanumeric (a-z, A-Z, 0-9 or _-.:) or longer than fifty characters.');
                                        $result[] = $errorStatus;
@@ -130,7 +130,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/port'] = (int)$value;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database port not valid');
                                        $errorStatus->setMessage('Given port is not numeric or within range 1 to 65535.');
                                        $result[] = $errorStatus;
@@ -142,7 +142,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/socket'] = $postValues['socket'];
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Socket does not exist');
                                        $errorStatus->setMessage('Given socket location does not exist on server.');
                                        $result[] = $errorStatus;
@@ -155,7 +155,7 @@ class DatabaseConnect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/database'] = $value;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database name not valid');
                                        $errorStatus->setMessage('Given database name must be shorter than fifty characters.');
                                        $result[] = $errorStatus;
@@ -177,7 +177,7 @@ class DatabaseConnect extends AbstractStepAction {
                                }
                                if (!$this->isConnectSuccessful()) {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Database connect not successful');
                                        $errorStatus->setMessage('Connecting to the database with given settings failed. Please check.');
                                        $result[] = $errorStatus;
@@ -281,7 +281,7 @@ class DatabaseConnect extends AbstractStepAction {
         */
        protected function isConnectSuccessful() {
                /** @var $databaseConnection \TYPO3\CMS\Core\Database\DatabaseConnection */
-               $databaseConnection = $this->objectManager->get('TYPO3\\CMS\\Core\\Database\\DatabaseConnection');
+               $databaseConnection = $this->objectManager->get(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
                $databaseConnection->initialize();
 
                if ($this->isDbalEnabled()) {
@@ -394,7 +394,7 @@ class DatabaseConnect extends AbstractStepAction {
                }
 
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $configurationManager->setLocalConfigurationValuesByPathValuePairs($localConfigurationPathValuePairs);
        }
 
@@ -561,7 +561,7 @@ class DatabaseConnect extends AbstractStepAction {
                        ExtensionManagementUtility::loadExtension('dbal');
                }
                /** @var $errorStatus \TYPO3\CMS\Install\Status\WarningStatus */
-               $warningStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\WarningStatus');
+               $warningStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\WarningStatus::class);
                $warningStatus->setTitle('Loaded database abstraction layer');
                return $warningStatus;
        }
@@ -580,7 +580,7 @@ class DatabaseConnect extends AbstractStepAction {
                }
                // @TODO: Remove configuration from TYPO3_CONF_VARS['EXTCONF']['dbal']
                /** @var $errorStatus \TYPO3\CMS\Install\Status\WarningStatus */
-               $warningStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\WarningStatus');
+               $warningStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\WarningStatus::class);
                $warningStatus->setTitle('Removed database abstraction layer');
                return $warningStatus;
        }
index 792f2ad..88f4341 100644 (file)
@@ -28,7 +28,7 @@ class DatabaseData extends AbstractStepAction {
                $result = array();
 
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
 
                $postValues = $this->postValues['values'];
 
@@ -37,7 +37,7 @@ class DatabaseData extends AbstractStepAction {
                // Check password and return early if not good enough
                $password = $postValues['password'];
                if (strlen($password) < 8) {
-                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $errorStatus->setTitle('Administrator password not secure enough!');
                        $errorStatus->setMessage(
                                'You are setting an important password here! It gives an attacker full control over your instance if cracked.' .
@@ -109,9 +109,9 @@ class DatabaseData extends AbstractStepAction {
                // Import database data
                $database = $this->getDatabaseConnection();
                /** @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService $schemaMigrationService */
-               $schemaMigrationService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
+               $schemaMigrationService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
                /** @var \TYPO3\CMS\Install\Service\SqlExpectedSchemaService $expectedSchemaService */
-               $expectedSchemaService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService');
+               $expectedSchemaService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class);
 
                // Raw concatenated ext_tables.sql and friends string
                $expectedSchemaString = $expectedSchemaService->getTablesDefinitionString(TRUE);
index a7ecbb2..b442274 100644 (file)
@@ -38,7 +38,7 @@ class DatabaseSelect extends AbstractStepAction {
                $postValues = $this->postValues['values'];
                $localConfigurationPathValuePairs = array();
                /** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                if ($postValues['type'] === 'new') {
                        $newDatabaseName = $postValues['new'];
                        if (strlen($newDatabaseName) <= 50) {
@@ -47,7 +47,7 @@ class DatabaseSelect extends AbstractStepAction {
                                        $localConfigurationPathValuePairs['DB/database'] = $newDatabaseName;
                                } else {
                                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $errorStatus->setTitle('Unable to create database');
                                        $errorStatus->setMessage(
                                                'Database with name ' . $newDatabaseName . ' could not be created.' .
@@ -59,7 +59,7 @@ class DatabaseSelect extends AbstractStepAction {
                                }
                        } else {
                                /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                               $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $errorStatus->setTitle('Database name not valid');
                                $errorStatus->setMessage('Given database name must be shorter than fifty characters.');
                                $result[] = $errorStatus;
@@ -75,7 +75,7 @@ class DatabaseSelect extends AbstractStepAction {
                        }
                } else {
                        /** @var $errorStatus \TYPO3\CMS\Install\Status\ErrorStatus */
-                       $errorStatus = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $errorStatus = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $errorStatus->setTitle('No Database selected');
                        $errorStatus->setMessage('You must select a database.');
                        $result[] = $errorStatus;
@@ -117,7 +117,7 @@ class DatabaseSelect extends AbstractStepAction {
         */
        protected function executeAction() {
                /** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $isInitialInstallationInProgress = $configurationManager->getConfigurationValueByPath('SYS/isInitialInstallationInProgress');
                $this->view->assign('databaseList', $this->getDatabaseList($isInitialInstallationInProgress));
                $this->view->assign('isInitialInstallationInProgress', $isInitialInstallationInProgress);
@@ -163,7 +163,7 @@ class DatabaseSelect extends AbstractStepAction {
         * @return void
         */
        protected function initializeDatabaseConnection() {
-               $this->databaseConnection = $this->objectManager->get('TYPO3\\CMS\\Core\\Database\\DatabaseConnection');
+               $this->databaseConnection = $this->objectManager->get(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
                $this->databaseConnection->setDatabaseUsername($GLOBALS['TYPO3_CONF_VARS']['DB']['username']);
                $this->databaseConnection->setDatabasePassword($GLOBALS['TYPO3_CONF_VARS']['DB']['password']);
                $this->databaseConnection->setDatabaseHost($GLOBALS['TYPO3_CONF_VARS']['DB']['host']);
index 8315673..26345b3 100644 (file)
@@ -28,7 +28,7 @@ class DefaultConfiguration extends AbstractStepAction {
         */
        public function execute() {
                /** @var \TYPO3\CMS\Install\Configuration\FeatureManager $featureManager */
-               $featureManager = $this->objectManager->get('TYPO3\\CMS\\Install\\Configuration\\FeatureManager');
+               $featureManager = $this->objectManager->get(\TYPO3\CMS\Install\Configuration\FeatureManager::class);
                // Get best matching configuration presets
                $configurationValues = $featureManager->getBestMatchingConfigurationForAllFeatures();
 
@@ -48,11 +48,11 @@ class DefaultConfiguration extends AbstractStepAction {
                $configurationValues['SYS/isInitialInstallationInProgress'] = FALSE;
 
                /** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $configurationManager->setLocalConfigurationValuesByPathValuePairs($configurationValues);
 
                /** @var \TYPO3\CMS\Install\Service\SessionService $session */
-               $session = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SessionService');
+               $session = $this->objectManager->get(\TYPO3\CMS\Install\Service\SessionService::class);
                $session->destroySession();
 
                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
index 91a2beb..2fb9761 100644 (file)
@@ -32,17 +32,17 @@ class EnvironmentAndFolders extends AbstractStepAction {
         */
        public function execute() {
                /** @var $folderStructureFactory \TYPO3\CMS\Install\FolderStructure\DefaultFactory */
-               $folderStructureFactory = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultFactory');
+               $folderStructureFactory = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultFactory::class);
                /** @var $structureFacade \TYPO3\CMS\Install\FolderStructure\StructureFacade */
                $structureFacade = $folderStructureFactory->getStructure();
                $structureFixMessages = $structureFacade->fix();
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
                $errorsFromStructure = $statusUtility->filterBySeverity($structureFixMessages, 'error');
 
                if (@is_dir(PATH_typo3conf)) {
                        /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-                       $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                       $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                        $configurationManager->createLocalConfigurationFromFactoryConfiguration();
 
                        // Create a PackageStates.php with all packages activated marked as "part of factory default"
@@ -63,7 +63,7 @@ class EnvironmentAndFolders extends AbstractStepAction {
 
                        // Create enable install tool file after typo3conf & LocalConfiguration were created
                        /** @var \TYPO3\CMS\Install\Service\EnableFileService $installToolService */
-                       $installToolService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\EnableFileService');
+                       $installToolService = $this->objectManager->get(\TYPO3\CMS\Install\Service\EnableFileService::class);
                        $installToolService->removeFirstInstallFile();
                        $installToolService->createInstallToolEnableFile();
                }
@@ -91,17 +91,17 @@ class EnvironmentAndFolders extends AbstractStepAction {
         */
        protected function executeAction() {
                /** @var \TYPO3\CMS\Install\SystemEnvironment\Check $statusCheck */
-               $statusCheck = $this->objectManager->get('TYPO3\\CMS\\Install\\SystemEnvironment\\Check');
+               $statusCheck = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class);
                $statusObjects = $statusCheck->getStatus();
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
                $environmentStatus = $statusUtility->sortBySeverity($statusObjects);
                $alerts = $statusUtility->filterBySeverity($statusObjects, 'alert');
                $this->view->assign('alerts', $alerts);
                $this->view->assign('environmentStatus', $environmentStatus);
 
                /** @var $folderStructureFactory \TYPO3\CMS\Install\FolderStructure\DefaultFactory */
-               $folderStructureFactory = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultFactory');
+               $folderStructureFactory = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultFactory::class);
                /** @var $structureFacade \TYPO3\CMS\Install\FolderStructure\StructureFacade */
                $structureFacade = $folderStructureFactory->getStructure();
                $structureMessages = $structureFacade->getStatus();
index ee3a3ab..4663485 100644 (file)
@@ -144,7 +144,7 @@ class AllConfiguration extends Action\AbstractAction {
                                                        if ((string)$GLOBALS['TYPO3_CONF_VARS'][$section][$valueKey] !== (string)$value) {
                                                                $configurationPathValuePairs[$section . '/' . $valueKey] = $value;
                                                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                                                               $status = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                                                               $status = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                                                                $status->setTitle('$TYPO3_CONF_VARS[\'' . $section . '\'][\'' . $valueKey . '\']');
                                                                $status->setMessage('New value = ' . $value);
                                                                $statusObjects[] = $status;
@@ -155,7 +155,7 @@ class AllConfiguration extends Action\AbstractAction {
                        }
                        if (count($statusObjects)) {
                                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-                               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                                $configurationManager->setLocalConfigurationValuesByPathValuePairs($configurationPathValuePairs);
                        }
                }
@@ -169,7 +169,7 @@ class AllConfiguration extends Action\AbstractAction {
         */
        protected function getDefaultConfigArrayComments() {
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $string = GeneralUtility::getUrl($configurationManager->getDefaultConfigurationFileLocation());
 
                $commentArray = array();
index 104b6dc..ab3b9b6 100644 (file)
@@ -135,12 +135,12 @@ class CleanUp extends Action\AbstractAction {
                }
                if (count($clearedTables)) {
                        /** @var \TYPO3\CMS\Install\Status\OkStatus $message */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Cleared tables');
                        $message->setMessage('List of cleared tables: ' . implode(', ', $clearedTables));
                } else {
                        /** @var \TYPO3\CMS\Install\Status\OkStatus $message */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                        $message->setTitle('No tables selected to clear');
                }
                return $message;
@@ -155,7 +155,7 @@ class CleanUp extends Action\AbstractAction {
                $database = $this->getDatabaseConnection();
                $database->exec_UPDATEquery('be_users', '', array('uc' => ''));
                /** @var \TYPO3\CMS\Install\Status\OkStatus $message */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Reset all backend users preferences');
                return $message;
        }
@@ -236,7 +236,7 @@ class CleanUp extends Action\AbstractAction {
                $data['numberOfDeletedFiles'] = $deleteCounter;
 
                if ($deleteCounter > 0) {
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Deleted ' . $deleteCounter . ' files from typo3temp/' . $subDirectory . '/');
                        $this->actionMessages[] = $message;
                }
index 072f4cd..d012966 100644 (file)
@@ -63,7 +63,7 @@ class Configuration extends Action\AbstractAction {
                if (count($configurationValues) > 0) {
                        $this->configurationManager->setLocalConfigurationValuesByPathValuePairs($configurationValues);
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Configuration written');
                        $messageBody = array();
                        foreach ($configurationValues as $configurationKey => $configurationValue) {
@@ -72,7 +72,7 @@ class Configuration extends Action\AbstractAction {
                        $message->setMessage(implode(LF, $messageBody));
                } else {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                        $message->setTitle('No configuration change selected');
                }
                return $message;
index 048bd36..80aa70c 100644 (file)
@@ -28,7 +28,7 @@ class FolderStructure extends Action\AbstractAction {
         */
        protected function executeAction() {
                /** @var $folderStructureFactory \TYPO3\CMS\Install\FolderStructure\DefaultFactory */
-               $folderStructureFactory = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultFactory');
+               $folderStructureFactory = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultFactory::class);
                /** @var $structureFacade \TYPO3\CMS\Install\FolderStructure\StructureFacade */
                $structureFacade = $folderStructureFactory->getStructure();
 
@@ -39,7 +39,7 @@ class FolderStructure extends Action\AbstractAction {
 
                $statusObjects = $structureFacade->getStatus();
                /** @var $statusUtility \TYPO3\CMS\Install\Status\StatusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
 
                $errorStatus = array_merge(
                        $statusUtility->filterBySeverity($statusObjects, 'error'),
@@ -52,7 +52,7 @@ class FolderStructure extends Action\AbstractAction {
                );
 
                /** @var \TYPO3\CMS\Install\FolderStructure\DefaultPermissionsCheck $permissionCheck */
-               $permissionCheck = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultPermissionsCheck');
+               $permissionCheck = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultPermissionsCheck::class);
                $filePermissionStatus = $permissionCheck->getMaskStatus('fileCreateMask');
                $directoryPermissionStatus = $permissionCheck->getMaskStatus('folderCreateMask');
 
index 3c0d78b..a277d9f 100644 (file)
@@ -68,7 +68,7 @@ class ImportantActions extends Action\AbstractAction {
                $operatingSystem = TYPO3_OS === 'WIN' ? 'Windows' : 'Unix';
 
                /** @var \TYPO3\CMS\Install\Service\CoreUpdateService $coreUpdateService */
-               $coreUpdateService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\CoreUpdateService');
+               $coreUpdateService = $this->objectManager->get(\TYPO3\CMS\Install\Service\CoreUpdateService::class);
                $this->view
                        ->assign('enableCoreUpdate', $coreUpdateService->isCoreUpdateEnabled())
                        ->assign('operatingSystem', $operatingSystem)
@@ -95,23 +95,23 @@ class ImportantActions extends Action\AbstractAction {
                $values = $this->postValues['values'];
                if ($values['newInstallToolPassword'] !== $values['newInstallToolPasswordCheck']) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Install tool password not changed');
                        $message->setMessage('Given passwords do not match.');
                } elseif (strlen($values['newInstallToolPassword']) < 8) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Install tool password not changed');
                        $message->setMessage('Given password must be at least eight characters long.');
                } else {
                        /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-                       $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                       $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                        $configurationManager->setLocalConfigurationValueByPath(
                                'BE/installToolPassword',
                                $this->getHashedPassword($values['newInstallToolPassword'])
                        );
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Install tool password changed');
                }
                return $message;
@@ -126,15 +126,15 @@ class ImportantActions extends Action\AbstractAction {
                $values = $this->postValues['values'];
                if (isset($values['newSiteName']) && strlen($values['newSiteName']) > 0) {
                        /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-                       $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                       $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                        $configurationManager->setLocalConfigurationValueByPath('SYS/sitename', $values['newSiteName']);
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Site name changed');
                        $this->view->assign('siteName', $values['newSiteName']);
                } else {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Site name not changed');
                        $message->setMessage('Site name must be at least one character long.');
                }
@@ -148,9 +148,9 @@ class ImportantActions extends Action\AbstractAction {
         */
        protected function clearAllCache() {
                /** @var \TYPO3\CMS\Install\Service\ClearCacheService $clearCacheService */
-               $clearCacheService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\ClearCacheService');
+               $clearCacheService = $this->objectManager->get(\TYPO3\CMS\Install\Service\ClearCacheService::class);
                $clearCacheService->clearAll();
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Successfully cleared all caches');
                return $message;
        }
@@ -163,7 +163,7 @@ class ImportantActions extends Action\AbstractAction {
        protected function clearOpcodeCache() {
                /** @var \TYPO3\CMS\Install\Service\ClearCacheService $clearCacheService */
                OpcodeCacheUtility::clearAllActive();
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Successfully cleared all available opcode caches');
                return $message;
        }
@@ -176,7 +176,7 @@ class ImportantActions extends Action\AbstractAction {
        protected function setNewEncryptionKeyAndLogOut() {
                $newKey = \TYPO3\CMS\Core\Utility\GeneralUtility::getRandomHexString(96);
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $configurationManager->setLocalConfigurationValueByPath('SYS/encryptionKey', $newKey);
                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
@@ -184,7 +184,7 @@ class ImportantActions extends Action\AbstractAction {
                );
                $formProtection->clean();
                /** @var \TYPO3\CMS\Install\Service\SessionService $session */
-               $session = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SessionService');
+               $session = $this->objectManager->get(\TYPO3\CMS\Install\Service\SessionService::class);
                $session->destroySession();
                \TYPO3\CMS\Core\Utility\HttpUtility::redirect('Install.php?install[context]=' . $this->getContext());
        }
@@ -202,17 +202,17 @@ class ImportantActions extends Action\AbstractAction {
 
                if (strlen($username) < 1) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Administrator user not created');
                        $message->setMessage('No valid username given.');
                } elseif ($password !== $passwordCheck) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Administrator user not created');
                        $message->setMessage('Passwords do not match.');
                } elseif (strlen($password) < 8) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Administrator user not created');
                        $message->setMessage('Password must be at least eight characters long.');
                } else {
@@ -224,7 +224,7 @@ class ImportantActions extends Action\AbstractAction {
                        );
                        if ($userExists) {
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Administrator user not created');
                                $message->setMessage('A user with username ' . $username . ' exists already.');
                        } else {
@@ -238,7 +238,7 @@ class ImportantActions extends Action\AbstractAction {
                                );
                                $database->exec_INSERTquery('be_users', $adminUserFields);
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                                $message->setTitle('Administrator created');
                        }
                }
@@ -257,16 +257,16 @@ class ImportantActions extends Action\AbstractAction {
                // Early return in case no update was selected
                if (empty($this->postValues['values'])) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\WarningStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\WarningStatus::class);
                        $message->setTitle('No database changes selected');
                        $messages[] = $message;
                        return $messages;
                }
 
                /** @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService $schemaMigrationService */
-               $schemaMigrationService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
+               $schemaMigrationService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
                /** @var \TYPO3\CMS\Install\Service\SqlExpectedSchemaService $expectedSchemaService */
-               $expectedSchemaService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService');
+               $expectedSchemaService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class);
                $expectedSchema = $expectedSchemaService->getExpectedDatabaseSchema();
                $currentSchema = $schemaMigrationService->getFieldDefinitions_database();
 
@@ -294,7 +294,7 @@ class ImportantActions extends Action\AbstractAction {
                        if (is_array($resultSet)) {
                                foreach ($resultSet as $errorMessage) {
                                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $message->setTitle('Database update failed');
                                        $message->setMessage('Error: ' . $errorMessage);
                                        $messages[] = $message;
@@ -303,7 +303,7 @@ class ImportantActions extends Action\AbstractAction {
                }
 
                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Executed database updates');
                $messages[] = $message;
 
@@ -319,9 +319,9 @@ class ImportantActions extends Action\AbstractAction {
         */
        protected function databaseAnalyzerAnalyze() {
                /** @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService $schemaMigrationService */
-               $schemaMigrationService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
+               $schemaMigrationService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
                /** @var \TYPO3\CMS\Install\Service\SqlExpectedSchemaService $expectedSchemaService */
-               $expectedSchemaService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService');
+               $expectedSchemaService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class);
                $expectedSchema = $expectedSchemaService->getExpectedDatabaseSchema();
 
                $currentSchema = $schemaMigrationService->getFieldDefinitions_database();
@@ -411,7 +411,7 @@ class ImportantActions extends Action\AbstractAction {
                $this->view->assign('databaseAnalyzerSuggestion', $databaseAnalyzerSuggestion);
 
                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Analyzed current database');
                return $message;
        }
index 30ca4fa..10696a4 100644 (file)
@@ -28,11 +28,11 @@ class SystemEnvironment extends Action\AbstractAction {
         */
        protected function executeAction() {
                /** @var $statusCheck \TYPO3\CMS\Install\SystemEnvironment\Check */
-               $statusCheck = $this->objectManager->get('TYPO3\\CMS\\Install\\SystemEnvironment\\Check');
+               $statusCheck = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class);
                $statusObjects = $statusCheck->getStatus();
 
                /** @var $statusUtility \TYPO3\CMS\Install\Status\StatusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
                $sortedStatusObjects = $statusUtility->sortBySeverity($statusObjects);
                $this->view->assign('statusObjectsBySeverity', $sortedStatusObjects);
 
index 6857ac2..6f0cb1f 100644 (file)
@@ -104,13 +104,13 @@ class TestSetup extends Action\AbstractAction {
                        || !GeneralUtility::validEmail($this->postValues['values']['testEmailRecipient'])
                ) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Mail not sent');
                        $message->setMessage('Given address is not a valid email address.');
                } else {
                        $recipient = $this->postValues['values']['testEmailRecipient'];
                        /** @var $mailMessage \TYPO3\CMS\Core\Mail\MailMessage */
-                       $mailMessage = $this->objectManager->get('TYPO3\\CMS\\Core\\Mail\\MailMessage');
+                       $mailMessage = $this->objectManager->get(\TYPO3\CMS\Core\Mail\MailMessage::class);
                        $mailMessage
                                ->addTo($recipient)
                                ->addFrom($this->getSenderEmailAddress(), $this->getSenderEmailName())
@@ -118,7 +118,7 @@ class TestSetup extends Action\AbstractAction {
                                ->setBody('<html><body>html test content</body></html>', 'text/html')
                                ->addPart('TEST CONTENT')
                                ->send();
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                        $message->setTitle('Test mail sent');
                        $message->setMessage('Recipient: ' . $recipient);
                }
@@ -176,7 +176,7 @@ class TestSetup extends Action\AbstractAction {
                imagegif($image, $outputFile);
 
                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                $message->setTitle('True type font DPI settings');
                $message->setMessage(
                        'If the two images below do not look the same, set $TYPO3_CONF_VARS[GFX][TTFdpi] to a value of 72.'
@@ -210,7 +210,7 @@ class TestSetup extends Action\AbstractAction {
                        $result = array();
                        if (!GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], $formatToTest)) {
                                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\WarningStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\WarningStatus::class);
                                $message->setTitle('Skipped test');
                                $message->setMessage('Handling format ' . $formatToTest . ' must be enabled in TYPO3_CONF_VARS[\'GFX\'][\'imagefile_ext\']');
                                $result['error'] = $message;
@@ -263,7 +263,7 @@ class TestSetup extends Action\AbstractAction {
                                clearstatcache();
                                $compressedSize = GeneralUtility::formatSize(filesize($imResult[3]));
                                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                                $message->setTitle('Compressed gif');
                                $message->setMessage(
                                        'Method used by compress: ' . $methodUsed . LF
@@ -271,7 +271,7 @@ class TestSetup extends Action\AbstractAction {
                                );
                        } else {
                                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                                $message->setTitle('Gif compression not enabled by [GFX][gif_compress]');
                        }
                        $testResults['gif']['message'] = $message;
@@ -502,7 +502,7 @@ class TestSetup extends Action\AbstractAction {
                        $testResults['niceText']['referenceFile'] = $this->imageBasePath . 'TestReference/Gdlib-niceText.' . $gifOrPng;
                        $testResults['niceText']['commands'] = $imageProcessor->IM_commands;
                        /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                        $message->setTitle('Note on \'niceText\'');
                        $message->setMessage(
                                '\'niceText\' is a concept that tries to improve the antialiasing of the rendered type by'
@@ -538,7 +538,7 @@ class TestSetup extends Action\AbstractAction {
                        $testResults['shadow']['referenceFile'] = $this->imageBasePath . 'TestReference/Gdlib-shadow.' . $gifOrPng;
                        $testResults['shadow']['commands'] = $imageProcessor->IM_commands;
                        /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\InfoStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\InfoStatus::class);
                        $message->setTitle('Note on \'shadow\'');
                        $message->setMessage(
                                'This test makes sense only if the above test had a correct output. But if so, you may not see'
@@ -562,7 +562,7 @@ class TestSetup extends Action\AbstractAction {
         */
        protected function imageTestDoneMessage($parseTime = 0) {
                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Executed image tests');
                $message->setMessage('Parse time: ' . $parseTime . ' ms');
                return $message;
@@ -575,7 +575,7 @@ class TestSetup extends Action\AbstractAction {
         */
        protected function imageMagickDisabledMessage() {
                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                $message->setTitle('Tests not executed');
                $message->setMessage('ImageMagick / GraphicsMagick handling is disabled or not configured correctly.');
                return $message;
@@ -588,7 +588,7 @@ class TestSetup extends Action\AbstractAction {
         */
        protected function imageGenerationFailedMessage() {
                /** @var \TYPO3\CMS\Install\Status\StatusInterface $message */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                $message->setTitle('Image generation failed');
                $message->setMessage(
                        'ImageMagick / GraphicsMagick handling is enabled, but the execute'
@@ -624,7 +624,7 @@ class TestSetup extends Action\AbstractAction {
         */
        protected function initializeImageProcessor() {
                /** @var \TYPO3\CMS\Core\Imaging\GraphicalFunctions $imageProcessor */
-               $imageProcessor = $this->objectManager->get('TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions');
+               $imageProcessor = $this->objectManager->get(\TYPO3\CMS\Core\Imaging\GraphicalFunctions::class);
                $imageProcessor->init();
                $imageProcessor->tempPath = PATH_site . 'typo3temp/';
                $imageProcessor->dontCheckForExistingTempFile = 1;
@@ -668,7 +668,7 @@ class TestSetup extends Action\AbstractAction {
         * @return void
         */
        protected function setUpDatabaseConnectionMock() {
-               $database = $this->objectManager->get('TYPO3\\CMS\\Install\\Database\\DatabaseConnectionMock');
+               $database = $this->objectManager->get(\TYPO3\CMS\Install\Database\DatabaseConnectionMock::class);
                $GLOBALS['TYPO3_DB'] = $database;
        }
 }
index 9e97f1b..4a5c934 100644 (file)
@@ -85,7 +85,7 @@ class UpgradeWizard extends Action\AbstractAction {
        protected function listUpdates() {
                if (empty($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'])) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\WarningStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\WarningStatus::class);
                        $message->setTitle('No update wizards registered');
                        return $message;
                }
@@ -118,7 +118,7 @@ class UpgradeWizard extends Action\AbstractAction {
                $this->view->assign('availableUpdates', $availableUpdates);
 
                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Show available update wizards');
                return $message;
        }
@@ -147,7 +147,7 @@ class UpgradeWizard extends Action\AbstractAction {
                $this->view->assign('updateData', $updateData);
 
                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                $message->setTitle('Show wizard options');
                return $message;
        }
@@ -174,7 +174,7 @@ class UpgradeWizard extends Action\AbstractAction {
                $wizardInputErrorMessage = '';
                if (method_exists($updateObject, 'checkUserInput') && !$updateObject->checkUserInput($wizardInputErrorMessage)) {
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Input parameter broken');
                        $message->setMessage($wizardInputErrorMessage ?: 'Something went wrong!');
                        $wizardData['wizardInputBroken'] = TRUE;
@@ -193,11 +193,11 @@ class UpgradeWizard extends Action\AbstractAction {
 
                        if ($performResult) {
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\OkStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\OkStatus::class);
                                $message->setTitle('Update successful');
                        } else {
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Update failed!');
                                if ($customOutput) {
                                        $message->setMessage($customOutput);
@@ -273,10 +273,10 @@ class UpgradeWizard extends Action\AbstractAction {
         */
        protected function silentCacheFrameworkTableSchemaMigration() {
                /** @var $sqlHandler \TYPO3\CMS\Install\Service\SqlSchemaMigrationService */
-               $sqlHandler = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
+               $sqlHandler = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
 
                /** @var \TYPO3\CMS\Install\Service\CachingFrameworkDatabaseSchemaService $cachingFrameworkDatabaseSchemaService */
-               $cachingFrameworkDatabaseSchemaService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\CachingFrameworkDatabaseSchemaService');
+               $cachingFrameworkDatabaseSchemaService = $this->objectManager->get(\TYPO3\CMS\Install\Service\CachingFrameworkDatabaseSchemaService::class);
                $expectedSchemaString = $cachingFrameworkDatabaseSchemaService->getCachingFrameworkRequiredDatabaseSchema();
                $cleanedExpectedSchemaString = implode(LF, $sqlHandler->getStatementArray($expectedSchemaString, TRUE, '^CREATE TABLE '));
                $neededTableDefinition = $sqlHandler->getFieldDefinitions_fileContent($cleanedExpectedSchemaString);
index c068622..f8deb9e 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Install\Controller;
  */
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Install\Service\SilentConfigurationUpgradeService;
 
 /**
  * Install step controller, dispatcher class of step actions.
@@ -173,7 +174,7 @@ class StepController extends AbstractController {
         */
        protected function migrateLocalconfToLocalConfigurationIfNeeded() {
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
 
                $localConfigurationFileLocation = $configurationManager->getLocalConfigurationFileLocation();
                $localConfigurationFileExists = is_file($localConfigurationFileLocation);
@@ -275,7 +276,7 @@ class StepController extends AbstractController {
         */
        protected function migrateExtensionListToPackageStatesFile() {
                /** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
-               $configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+               $configurationManager = $this->objectManager->get(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                $localConfigurationFileLocation = $configurationManager->getLocalConfigurationFileLocation();
                $localConfigurationFileExists = is_file($localConfigurationFileLocation);
                $packageStatesFilePath = PATH_typo3conf . 'PackageStates.php';
@@ -365,13 +366,13 @@ class StepController extends AbstractController {
                        && $postValues['action'] === 'environmentAndFolders'
                ) {
                        /** @var \TYPO3\CMS\Install\Controller\Action\Step\StepInterface $action */
-                       $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Step\\EnvironmentAndFolders');
+                       $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Step\EnvironmentAndFolders::class);
                        $errorMessagesFromExecute = $action->execute();
                        $wasExecuted = TRUE;
                }
 
                /** @var \TYPO3\CMS\Install\Controller\Action\Step\StepInterface $action */
-               $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Step\\EnvironmentAndFolders');
+               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Step\EnvironmentAndFolders::class);
 
                $needsExecution = TRUE;
                try {
@@ -388,7 +389,7 @@ class StepController extends AbstractController {
                        || $testReflection->getDocComment() === FALSE
                ) {
                        /** @var \TYPO3\CMS\Install\Controller\Action\Step\StepInterface $action */
-                       $action = $this->objectManager->get('TYPO3\\CMS\\Install\\Controller\\Action\\Step\\EnvironmentAndFolders');
+                       $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Step\EnvironmentAndFolders::class);
                        if ($this->isInitialInstallationInProgress()) {
                                $currentStep = (array_search('environmentAndFolders', $this->authenticationActions) + 1);
                                $totalSteps = count($this->authenticationActions);
@@ -413,10 +414,8 @@ class StepController extends AbstractController {
         * @return void
         */
        protected function executeSilentConfigurationUpgradesIfNeeded() {
-               /** @var \TYPO3\CMS\Install\Service\SilentConfigurationUpgradeService $upgradeService */
-               $upgradeService = $this->objectManager->get(
-                       'TYPO3\\CMS\\Install\\Service\\SilentConfigurationUpgradeService'
-               );
+               /** @var SilentConfigurationUpgradeService $upgradeService */
+               $upgradeService = $this->objectManager->get(SilentConfigurationUpgradeService::class);
                try {
                        $upgradeService->execute();
                } catch (Exception\RedirectException $e) {
index 04781cb..0b33998 100644 (file)
@@ -101,7 +101,7 @@ class ClearCacheService {
                static $database;
                if (!is_object($database)) {
                        /** @var \TYPO3\CMS\Core\Database\DatabaseConnection $database */
-                       $database = $this->objectManager->get('TYPO3\\CMS\\Core\\Database\\DatabaseConnection');
+                       $database = $this->objectManager->get(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
                        $database->setDatabaseUsername($GLOBALS['TYPO3_CONF_VARS']['DB']['username']);
                        $database->setDatabasePassword($GLOBALS['TYPO3_CONF_VARS']['DB']['password']);
                        $database->setDatabaseHost($GLOBALS['TYPO3_CONF_VARS']['DB']['host']);
index afca791..ca0fb24 100644 (file)
@@ -129,7 +129,7 @@ class CoreUpdateService {
                } catch (\TYPO3\CMS\Install\Service\Exception\RemoteFetchException $e) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Version matrix could not be fetched from get.typo3.org');
                        $message->setMessage(
                                'Current version specification could not be fetched from http://get.typo3.org/json.'
@@ -150,17 +150,17 @@ class CoreUpdateService {
                $messages = array();
 
                /** @var \TYPO3\CMS\Install\Status\StatusUtility $statusUtility */
-               $statusUtility = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\StatusUtility');
+               $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
 
                // Folder structure test: Update can be done only if folder structure returns no errors
                /** @var $folderStructureFacade \TYPO3\CMS\Install\FolderStructure\StructureFacade */
-               $folderStructureFacade = $this->objectManager->get('TYPO3\\CMS\\Install\\FolderStructure\\DefaultFactory')->getStructure();
+               $folderStructureFacade = $this->objectManager->get(\TYPO3\CMS\Install\FolderStructure\DefaultFactory::class)->getStructure();
                $folderStructureErrors = $statusUtility->filterBySeverity($folderStructureFacade->getStatus(), 'error');
                $folderStructureWarnings = $statusUtility->filterBySeverity($folderStructureFacade->getStatus(), 'warning');
                if (count($folderStructureErrors) > 0 || count($folderStructureWarnings) > 0) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Automatic core update not possible: Folder structure has errors or warnings');
                        $message->setMessage(
                                'To perform an update, the folder structure of this TYPO3 CMS instance must'
@@ -174,7 +174,7 @@ class CoreUpdateService {
                if (TYPO3_OS === 'WIN') {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Automatic core update not possible: Update not supported on Windows OS');
                        $messages[] = $message;
                }
@@ -186,7 +186,7 @@ class CoreUpdateService {
                        if (!$result) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Automatic core update not possible: No write access to document root');
                                $message->setMessage('Could not write a file in path "' . PATH_site . '"!');
                                $messages[] = $message;
@@ -201,7 +201,7 @@ class CoreUpdateService {
                        if (!$result) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Automatic core update not possible: No write access to core location');
                                $message->setMessage(
                                        'New core should be installed in "' . $coreLocation . '", but this directory is not writable!'
@@ -215,7 +215,7 @@ class CoreUpdateService {
                if ($success && !$this->coreVersionService->isInstalledVersionAReleasedVersion()) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Automatic core update not possible: You are running a development version of TYPO3');
                        $message->setMessage(
                                'Your current version is specified as ' . $this->coreVersionService->getInstalledVersion() . '.'
@@ -245,7 +245,7 @@ class CoreUpdateService {
                if (@file_exists($fileLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Core download exists in download location: ' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($this->downloadTargetPath));
                        $messages[] = $message;
                } else {
@@ -253,7 +253,7 @@ class CoreUpdateService {
                        if (!$fileContent) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Download not successful');
                                $messages[] = $message;
                        } else {
@@ -261,7 +261,7 @@ class CoreUpdateService {
                                if (!$fileStoreResult) {
                                        $success = FALSE;
                                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $message->setTitle('Unable to store download content');
                                        $messages[] = $message;
                                }
@@ -287,7 +287,7 @@ class CoreUpdateService {
                if (!file_exists($fileLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Downloaded core not found');
                        $messages[] = $message;
                } else {
@@ -295,7 +295,7 @@ class CoreUpdateService {
                        if ($actualChecksum !== $expectedChecksum) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('New core checksum mismatch');
                                $message->setMessage(
                                        'The official TYPO3 CMS version system on https://get.typo3.org expects a sha1 checksum of '
@@ -325,13 +325,13 @@ class CoreUpdateService {
                if (!@is_file($fileLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Downloaded core not found');
                        $messages[] = $message;
                } elseif (@file_exists($this->downloadTargetPath . 'typo3_src-' . $version)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Unpacked core exists in download location: ' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($this->downloadTargetPath));
                        $messages[] = $message;
                } else {
@@ -340,7 +340,7 @@ class CoreUpdateService {
                        if ($errorCode) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Unpacking core not successful');
                                $messages[] = $message;
                        } else {
@@ -348,7 +348,7 @@ class CoreUpdateService {
                                if (!$removePackedFileResult) {
                                        $success = FALSE;
                                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $message->setTitle('Removing packed core not successful');
                                        $messages[] = $message;
                                }
@@ -374,13 +374,13 @@ class CoreUpdateService {
                if (!@is_dir($downloadedCoreLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Unpacked core not found');
                        $messages[] = $message;
                } elseif (@is_dir($newCoreLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('Another core source directory already exists in path ' . $newCoreLocation);
                        $messages[] = $message;
                } else {
@@ -388,7 +388,7 @@ class CoreUpdateService {
                        if (!$moveResult) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Moving core to ' . $newCoreLocation . ' failed');
                                $messages[] = $message;
                        }
@@ -413,13 +413,13 @@ class CoreUpdateService {
                if (!is_dir($newCoreLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('New core not found');
                        $messages[] = $message;
                } elseif (!is_link($this->currentCoreLocation)) {
                        $success = FALSE;
                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                        $message->setTitle('TYPO3 source directory (typo3_src) is not a link');
                        $messages[] = $message;
                } else {
@@ -427,7 +427,7 @@ class CoreUpdateService {
                        if (!$unlinkResult) {
                                $success = FALSE;
                                /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                               $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                               $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                $message->setTitle('Removing old symlink failed');
                                $messages[] = $message;
                        } else {
@@ -437,7 +437,7 @@ class CoreUpdateService {
                                } else {
                                        $success = FALSE;
                                        /** @var $message \TYPO3\CMS\Install\Status\StatusInterface */
-                                       $message = $this->objectManager->get('TYPO3\\CMS\\Install\\Status\\ErrorStatus');
+                                       $message = $this->objectManager->get(\TYPO3\CMS\Install\Status\ErrorStatus::class);
                                        $message->setTitle('Linking new core failed');
                                        $messages[] = $message;
                                }
index e8fb5ad..bd6ecbe 100644 (file)
@@ -42,7 +42,7 @@ class SqlExpectedSchemaService {
         */
        public function getExpectedDatabaseSchema() {
                /** @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService $schemaMigrationService */
-               $schemaMigrationService = $this->objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
+               $schemaMigrationService = $this->objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
                // Raw concatenated ext_tables.sql and friends string
                $expectedSchemaString = $this->getTablesDefinitionString();
                // Remove comments
index f8e1f5f..df715eb 100644 (file)
@@ -41,8 +41,8 @@ abstract class AbstractDatabaseSchemaUpdate extends AbstractUpdate {
         */
        public function __construct() {
                $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->schemaMigrationService = $objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlSchemaMigrationService');
-               $this->expectedSchemaService = $objectManager->get('TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService');
+               $this->schemaMigrationService = $objectManager->get(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
+               $this->expectedSchemaService = $objectManager->get(\TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class);
        }
 
        /**
index 9e67912..ef54d93 100644 (file)
@@ -61,7 +61,7 @@ class FailsafeView extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView {
                        return $this->renderAlertStatus();
                }
                /** @var \TYPO3\CMS\Install\View\StandaloneView $realView */
-               $realView = $this->objectManager->get('TYPO3\\CMS\\Install\\View\\StandaloneView');
+               $realView = $this->objectManager->get(\TYPO3\CMS\Install\View\StandaloneView::class);
                $realView->assignMultiple($this->variables);
                $realView->setTemplatePathAndFilename($this->templatePathAndFileName);
                $realView->setLayoutRootPath($this->layoutRootPath);
index 9d01a62..8a303ab 100644 (file)
@@ -27,18 +27,18 @@ class StandaloneView extends \TYPO3\CMS\Fluid\View\StandaloneView {
         */
        public function __construct() {
                $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-               $this->templateParser = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Parser\\TemplateParser');
-               $this->setRenderingContext($this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContext'));
-               $request = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Request');
+               $this->templateParser = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Parser\TemplateParser::class);
+               $this->setRenderingContext($this->objectManager->get(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContext::class));
+               $request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
                $request->setRequestURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
                $request->setBaseURI(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
-               $uriBuilder = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Web\\Routing\\UriBuilder');
+               $uriBuilder = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
                $uriBuilder->setRequest($request);
-               $controllerContext = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ControllerContext');
+               $controllerContext = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
                $controllerContext->setRequest($request);
                $controllerContext->setUriBuilder($uriBuilder);
                $this->setControllerContext($controllerContext);
-               $this->templateCompiler = $this->objectManager->get('TYPO3\\CMS\\Fluid\\Core\\Compiler\\TemplateCompiler');
+               $this->templateCompiler = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler::class);
                $this->templateCompiler->setTemplateCache(\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('fluid_template'));
        }
 }
index ba92d70..dc2745c 100644 (file)
@@ -36,9 +36,9 @@ class LanguageCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\Comman
         */
        public function updateCommand($localesToUpdate = '') {
                /** @var $updateTranslationService \TYPO3\CMS\Lang\Service\UpdateTranslationService */
-               $updateTranslationService = $this->objectManager->get('TYPO3\\CMS\\Lang\Service\\UpdateTranslationService');
+               $updateTranslationService = $this->objectManager->get(\TYPO3\CMS\Lang\Service\UpdateTranslationService::class);
                /** @var $languageRepository \TYPO3\CMS\Lang\Domain\Repository\LanguageRepository */
-               $languageRepository = $this->objectManager->get('TYPO3\\CMS\\Lang\\Domain\\Repository\\LanguageRepository');
+               $languageRepository = $this->objectManager->get(\TYPO3\CMS\Lang\Domain\Repository\LanguageRepository::class);
 
                $locales = array();
                if (!empty($localesToUpdate)) {
@@ -51,7 +51,7 @@ class LanguageCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\Comman
                        }
                }
                /** @var PackageManager $packageManager */
-               $packageManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Package\\PackageManager');
+               $packageManager = $this->objectManager->get(\TYPO3\CMS\Core\Package\PackageManager::class);
                $this->emitPackagesMayHaveChangedSignal();
                /** @var PackageInterface $package */
                foreach ($packageManager->getAvailablePackages() as $package) {
index f0ce29b..b0a12dd 100644 (file)
@@ -73,7 +73,7 @@ class LanguageController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
         */
        public function indexAction(\TYPO3\CMS\Lang\Domain\Model\LanguageSelectionForm $languageSelectionForm = NULL, $extensions = NULL) {
                if ($languageSelectionForm === NULL) {
-                       $languageSelectionForm = $this->objectManager->get('TYPO3\\CMS\\Lang\\Domain\\Model\\LanguageSelectionForm');
+                       $languageSelectionForm = $this->objectManager->get(\TYPO3\CMS\Lang\Domain\Model\LanguageSelectionForm::class);
                        $languageSelectionForm->setLanguages($this->languageRepository->findAll());
                        $languageSelectionForm->setSelectedLanguages($this->languageRepository->findSelected());
                }
index bdd70af..25ccaef 100644 (file)
@@ -66,7 +66,7 @@ class ExtensionRepository {
                        foreach ($availableAndInstalledExtensions as $entry) {
                                /** @var $extension \TYPO3\CMS\Lang\Domain\Model\Extension */
                                $extension = $this->objectManager->get(
-                                       'TYPO3\CMS\Lang\Domain\Model\Extension',
+                                       \TYPO3\CMS\Lang\Domain\Model\Extension::class,
                                        $entry['key'],
                                        $entry['title'],
                                        $this->getExtensionIconWithPath($entry)
index 36e6e8e..f1b57e4 100644 (file)
@@ -97,7 +97,7 @@ class LanguageRepository {
                                }
 
                                $this->languages[$locale] = $this->objectManager->get(
-                                       'TYPO3\CMS\Lang\Domain\Model\Language',
+                                       \TYPO3\CMS\Lang\Domain\Model\Language::class,
                                        $locale,
                                        $label,
                                        in_array($locale, $this->selectedLanguages)
index c37fdfe..7c66ea9 100644 (file)
@@ -28,7 +28,7 @@ class SysNoteRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
         * @return void
         */
        public function initializeObject() {
-               $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
+               $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
                $querySettings->setRespectStoragePage(FALSE);
                $this->setDefaultQuerySettings($querySettings);
        }
index 7d4f1cd..41d198a 100644 (file)
@@ -128,14 +128,14 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
         * @return \TYPO3\CMS\Workspaces\Service\AdditionalColumnService
         */
        protected function getAdditionalColumnService() {
-               return $this->objectManager->get('TYPO3\\CMS\\Workspaces\\Service\\AdditionalColumnService');
+               return $this->objectManager->get(\TYPO3\CMS\Workspaces\Service\AdditionalColumnService::class);
        }
 
        /**
         * @return \TYPO3\CMS\Workspaces\Service\AdditionalResourceService
         */
        protected function getAdditionalResourceService() {
-               return $this->objectManager->get('TYPO3\\CMS\\Workspaces\\Service\\AdditionalResourceService');
+               return $this->objectManager->get(\TYPO3\CMS\Workspaces\Service\AdditionalResourceService::class);
        }