[TASK] Use double back slashes for class name in makeInstance 08/31808/2
authorWouter Wolters <typo3@wouterwolters.nl>
Fri, 25 Jul 2014 12:53:23 +0000 (14:53 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Fri, 25 Jul 2014 13:17:34 +0000 (15:17 +0200)
Resolves: #60562
Releases: 6.3
Change-Id: I321f32f85df90e11443837c2704eba5c097e7ea1
Reviewed-on: http://review.typo3.org/31808
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
16 files changed:
typo3/alt_doc_nodoc.php
typo3/sysext/backend/Classes/Form/FormDataTraverser.php
typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
typo3/sysext/backend/Classes/Module/ModuleLoader.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/core/Classes/Log/LogManager.php
typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
typo3/sysext/core/Classes/Resource/Processing/LocalImageProcessor.php
typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
typo3/sysext/core/Classes/Resource/Service/IndexerService.php
typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
typo3/sysext/indexed_search/Classes/Indexer.php
typo3/sysext/lang/Classes/LanguageService.php
typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php

index 560edcc..3014bc2 100644 (file)
@@ -21,6 +21,6 @@
  */
 require __DIR__ . '/init.php';
 
-$noDocumentsOpenController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Backend\Controller\NoDocumentsOpenController');
+$noDocumentsOpenController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\NoDocumentsOpenController');
 $noDocumentsOpenController->main();
 $noDocumentsOpenController->printContent();
index acfed19..6506636 100644 (file)
@@ -349,7 +349,7 @@ class FormDataTraverser {
         */
        protected function getRecordRow($uid) {
                /** @var \TYPO3\CMS\Backend\Form\DataPreprocessor $dataPreprocessor */
-               $dataPreprocessor = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Form\DataPreprocessor');
+               $dataPreprocessor = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Form\\DataPreprocessor');
                $dataPreprocessor->fetchRecord($this->currentTable, $uid, '');
                return reset($dataPreprocessor->regTableItems_data);
        }
index 74a6f69..44e6fe3 100644 (file)
@@ -73,7 +73,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * times inclusion sections in their index.php scripts. For example (from web_func):
  *
  * Make instance:
- * $SOBE = GeneralUtility::makeInstance("SC_mod_web_func_index");
+ * $SOBE = GeneralUtility::makeInstance('TYPO3\\CMS\\Func\\Controller\\PageFunctionsController');
  * $SOBE->init();
  *
  * Include files?
index 92a5677..3a5a437 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * Load Backend Interface modules
  *
  * Typically instantiated like this:
- * $this->loadModules = GeneralUtility::makeInstance('TYPO3\CMS\Backend\Module\ModuleLoader');
+ * $this->loadModules = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Module\\ModuleLoader');
  * $this->loadModules->load($TBE_MODULES);
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
index d243eb4..3674e7e 100644 (file)
@@ -1014,7 +1014,7 @@ class Bootstrap {
         */
        public function initializeLanguageObject() {
                /** @var $GLOBALS['LANG'] \TYPO3\CMS\Lang\LanguageService */
-               $GLOBALS['LANG'] = Utility\GeneralUtility::makeInstance('TYPO3\CMS\Lang\LanguageService');
+               $GLOBALS['LANG'] = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Lang\\LanguageService');
                $GLOBALS['LANG']->init($GLOBALS['BE_USER']->uc['lang']);
                return $this;
        }
index 236c08f..c99f3af 100644 (file)
@@ -66,7 +66,7 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
        /**
         * Gets a logger instance for the given name.
         *
-        * \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('\TYPO3\CMS\Core\Log\LogManager')->getLogger('main.sub.subsub');
+        * \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger('main.sub.subsub');
         *
         * $name can also be submitted as a underscore-separated string, which will
         * be converted to dots. This is useful to call this method with __CLASS__
index 41d56c4..fd0da08 100644 (file)
@@ -208,7 +208,7 @@ class FlashMessageQueue extends \SplQueue {
        static public function __callStatic($name, array $arguments) {
                \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
                /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */
-               $flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Messaging\FlashMessageService');
+               $flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
                $identifier = 'core.template.flashMessages';
                switch ($name) {
                        case 'renderFlashMessages':
index 99214da..7426ced 100644 (file)
@@ -31,7 +31,7 @@ class LocalImageProcessor implements ProcessorInterface {
         */
        public function __construct() {
                /** @var $logManager \TYPO3\CMS\Core\Log\LogManager */
-               $logManager = Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager');
+               $logManager = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager');
                $this->logger = $logManager->getLogger(__CLASS__);
        }
 
@@ -88,10 +88,10 @@ class LocalImageProcessor implements ProcessorInterface {
        protected function getHelperByTaskName($taskName) {
                switch ($taskName) {
                        case 'Preview':
-                               $helper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\Processing\LocalPreviewHelper', $this);
+                               $helper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\Processing\\LocalPreviewHelper', $this);
                        break;
                        case 'CropScaleMask':
-                               $helper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\Processing\LocalCropScaleMaskHelper', $this);
+                               $helper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\Processing\\LocalCropScaleMaskHelper', $this);
                        break;
                        default:
                                throw new \InvalidArgumentException('Cannot find helper for task name: "' . $taskName . '"', 1353401352);
index dc9f41a..9157dc5 100644 (file)
@@ -58,7 +58,7 @@ class FileProcessingService {
                $this->driver = $driver;
 
                /** @var $logManager \TYPO3\CMS\Core\Log\LogManager */
-               $logManager = Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager');
+               $logManager = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager');
                $this->logger = $logManager->getLogger(__CLASS__);
        }
 
@@ -118,7 +118,7 @@ class FileProcessingService {
 
                        $task = $processedFile->getTask();
                        /** @var $processor Resource\Processing\LocalImageProcessor */
-                       $processor = Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\Processing\LocalImageProcessor');
+                       $processor = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\Processing\\LocalImageProcessor');
                        $processor->processTask($task);
 
                        if ($processedFile->isProcessed()) {
index e8cb1da..1d2fee4 100644 (file)
@@ -55,7 +55,7 @@ class IndexerService implements \TYPO3\CMS\Core\SingletonInterface {
         * @return FileIndexRepository
         */
        protected function getFileIndexRepository() {
-               return GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\Index\FileIndexRepository');
+               return GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\Index\\FileIndexRepository');
        }
 
 
index ba6e0b5..66792eb 100644 (file)
@@ -1970,7 +1970,7 @@ tt_content.' . $key . $prefix . ' {
                if ($result === FALSE) {
                        $message = '\TYPO3\CMS\Core\Category\CategoryRegistry: no category registered for table "%s". Key was already registered.';
                        /** @var $logger \TYPO3\CMS\Core\Log\Logger */
-                       $logger = GeneralUtility::makeInstance('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
+                       $logger = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager')->getLogger(__CLASS__);
                        $logger->warning(
                                sprintf($message, $tableName)
                        );
index 6e5f808..7aa82fe 100644 (file)
@@ -683,7 +683,7 @@ class HelpModuleController {
         * @todo Define visibility
         */
        public function substituteGlossaryWords($code) {
-               $htmlParser = GeneralUtility::makeInstance('TYPO3\CMS\Core\Html\HtmlParser');
+               $htmlParser = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Html\\HtmlParser');
                $htmlParser->pObj = $this;
                $code = $htmlParser->HTMLcleaner($code, array(), 1);
                return $code;
index 0623160..36cbfe0 100644 (file)
@@ -822,7 +822,7 @@ class Indexer {
         * @todo Define visibility
         */
        public function extractHyperLinks($html) {
-               $htmlParser = GeneralUtility::makeInstance('TYPO3\CMS\Core\Html\HtmlParser');
+               $htmlParser = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Html\\HtmlParser');
                $htmlParts = $htmlParser->splitTags('a', $html);
                $hyperLinksData = array();
                foreach ($htmlParts as $index => $tagData) {
@@ -851,7 +851,7 @@ class Indexer {
         */
        public function extractBaseHref($html) {
                $href = '';
-               $htmlParser = GeneralUtility::makeInstance('TYPO3\CMS\Core\Html\HtmlParser');
+               $htmlParser = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Html\\HtmlParser');
                $htmlParts = $htmlParser->splitTags('base', $html);
                foreach ($htmlParts as $index => $tagData) {
                        if ($index % 2 !== 0) {
index b2ac566..b831fd5 100644 (file)
@@ -121,14 +121,14 @@ class LanguageService {
         */
        public function init($lang) {
                // Initialize the conversion object:
-               $this->csConvObj = GeneralUtility::makeInstance('TYPO3\CMS\Core\Charset\CharsetConverter');
+               $this->csConvObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Charset\\CharsetConverter');
                $this->charSetArray = $this->csConvObj->charSetArray;
                // Initialize the parser factory object
-               $this->parserFactory = GeneralUtility::makeInstance('TYPO3\CMS\Core\Localization\LocalizationFactory');
+               $this->parserFactory = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Localization\\LocalizationFactory');
                // Find the requested language in this list based
                // on the $lang key being inputted to this function.
                /** @var $locales \TYPO3\CMS\Core\Localization\Locales */
-               $locales = GeneralUtility::makeInstance('TYPO3\CMS\Core\Localization\Locales');
+               $locales = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Localization\\Locales');
                // Language is found. Configure it:
                if (in_array($lang, $locales->getLocales())) {
                        // The current language key
index f00f200..eeb9d54 100644 (file)
@@ -48,7 +48,7 @@ class FileStorageExtractionAdditionalFieldProvider implements \TYPO3\CMS\Schedul
         */
        protected function getAllStoragesField(FileStorageExtractionTask $task = NULL) {
                /** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
-               $storages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\StorageRepository')->findAll();
+               $storages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\StorageRepository')->findAll();
                $options = array();
                foreach ($storages as $storage) {
                        if ($task !== NULL && $task->storageUid === $storage->getUid()) {
index e5ff924..777e16e 100644 (file)
@@ -45,7 +45,7 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
         */
        protected function getAllStoragesField(FileStorageIndexingTask $task = NULL) {
                /** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
-               $storages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Resource\StorageRepository')->findAll();
+               $storages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\StorageRepository')->findAll();
                $options = array();
                foreach ($storages as $storage) {
                        if ($task != NULL && $task->storageUid === $storage->getUid()) {