[CLEANUP] Cleanup ext:core 04/33804/3
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 4 Nov 2014 22:08:26 +0000 (23:08 +0100)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Sat, 8 Nov 2014 21:36:00 +0000 (22:36 +0100)
* Add phpDoc to properties
* Add phpDoc to functions
* Shorten class names where possible

Resolves: #62707
Releases: master
Change-Id: I763595103127d79af8abcb3ebcfb6b3767df9451
Reviewed-on: http://review.typo3.org/33804
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
109 files changed:
typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
typo3/sysext/core/Classes/DataHandling/TableColumnSubType.php
typo3/sysext/core/Classes/DataHandling/TableColumnType.php
typo3/sysext/core/Classes/ElementBrowser/ElementBrowserHookInterface.php
typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
typo3/sysext/core/Classes/Error/ErrorHandler.php
typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
typo3/sysext/core/Classes/Error/Exception.php
typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
typo3/sysext/core/Classes/Error/Http/AbstractClientErrorException.php
typo3/sysext/core/Classes/Error/Http/AbstractServerErrorException.php
typo3/sysext/core/Classes/Error/Http/BadRequestException.php
typo3/sysext/core/Classes/Error/Http/ForbiddenException.php
typo3/sysext/core/Classes/Error/Http/PageNotFoundException.php
typo3/sysext/core/Classes/Error/Http/ServiceUnavailableException.php
typo3/sysext/core/Classes/Error/Http/StatusException.php
typo3/sysext/core/Classes/Error/Http/UnauthorizedException.php
typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
typo3/sysext/core/Classes/ExtDirect/ExtDirectRouter.php
typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
typo3/sysext/core/Classes/FormProtection/Exception.php
typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
typo3/sysext/core/Classes/Html/HtmlParser.php
typo3/sysext/core/Classes/Html/RteHtmlParser.php
typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
typo3/sysext/core/Classes/Http/Observer/Download.php
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
typo3/sysext/core/Classes/Localization/Exception/FileNotFoundException.php
typo3/sysext/core/Classes/Localization/Exception/InvalidParserException.php
typo3/sysext/core/Classes/Localization/Exception/InvalidXmlFileException.php
typo3/sysext/core/Classes/Localization/LanguageStore.php
typo3/sysext/core/Classes/Localization/Locales.php
typo3/sysext/core/Classes/Localization/LocalizationFactory.php
typo3/sysext/core/Classes/Localization/Parser/AbstractXmlParser.php
typo3/sysext/core/Classes/Localization/Parser/LocalizationParserInterface.php
typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
typo3/sysext/core/Classes/Localization/Parser/LocallangXmlParser.php
typo3/sysext/core/Classes/Localization/Parser/XliffParser.php
typo3/sysext/core/Classes/Locking/Locker.php
typo3/sysext/core/Classes/Log/LogLevel.php
typo3/sysext/core/Classes/Log/LogManager.php
typo3/sysext/core/Classes/Log/LogRecord.php
typo3/sysext/core/Classes/Log/Logger.php
typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
typo3/sysext/core/Classes/Log/Processor/AbstractProcessor.php
typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
typo3/sysext/core/Classes/Log/Processor/MemoryPeakUsageProcessor.php
typo3/sysext/core/Classes/Log/Processor/MemoryUsageProcessor.php
typo3/sysext/core/Classes/Log/Processor/NullProcessor.php
typo3/sysext/core/Classes/Log/Processor/ProcessorInterface.php
typo3/sysext/core/Classes/Log/Processor/WebProcessor.php
typo3/sysext/core/Classes/Log/Writer/AbstractWriter.php
typo3/sysext/core/Classes/Log/Writer/DatabaseWriter.php
typo3/sysext/core/Classes/Log/Writer/FileWriter.php
typo3/sysext/core/Classes/Log/Writer/NullWriter.php
typo3/sysext/core/Classes/Log/Writer/PhpErrorLogWriter.php
typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
typo3/sysext/core/Classes/Log/Writer/WriterInterface.php
typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
typo3/sysext/core/Classes/Mail/MboxTransport.php
typo3/sysext/core/Classes/Messaging/AbstractMessage.php
typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
typo3/sysext/core/Classes/Messaging/FlashMessage.php
typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
typo3/sysext/core/Classes/Messaging/FlashMessageService.php
typo3/sysext/core/Classes/Page/PageRenderer.php
typo3/sysext/core/Classes/Registry.php
typo3/sysext/core/Classes/SingletonInterface.php
typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
typo3/sysext/core/Classes/Tree/TableConfiguration/ExtJsArrayTreeRenderer.php
typo3/sysext/core/Classes/Tree/TableConfiguration/TableConfigurationTree.php
typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
typo3/sysext/core/Classes/TypoScript/TemplateService.php
typo3/sysext/core/Classes/Utility/ArrayUtility.php
typo3/sysext/core/Classes/Utility/ClassNamingUtility.php
typo3/sysext/core/Classes/Utility/ClientUtility.php
typo3/sysext/core/Classes/Utility/CommandUtility.php
typo3/sysext/core/Classes/Utility/DebugUtility.php
typo3/sysext/core/Classes/Utility/DiffUtility.php
typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Classes/Utility/HttpUtility.php
typo3/sysext/core/Classes/Utility/MailUtility.php
typo3/sysext/core/Classes/Utility/MathUtility.php
typo3/sysext/core/Classes/Utility/MonitorUtility.php
typo3/sysext/core/Classes/Utility/PathUtility.php
typo3/sysext/core/Classes/Utility/ResourceUtility.php
typo3/sysext/core/Classes/Utility/RootlineUtility.php
typo3/sysext/core/Classes/Utility/StringUtility.php
typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
typo3/sysext/core/Classes/Versioning/VersionState.php

index 29bcb6e..bb28e9e 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\DataHandling;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Interface for classes which hook into TCEmain and do additional processing
  * after the upload of a file.
@@ -20,6 +21,7 @@ namespace TYPO3\CMS\Core\DataHandling;
  * @author Xavier Perseguers <typo3@perseguers.ch>
  */
 interface DataHandlerProcessUploadHookInterface {
+
        /**
         * Post-process a file upload.
         *
index 2f8b2bd..6acd133 100644 (file)
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Core\DataHandling;
  * @package TYPO3\CMS\Core
  */
 class TableColumnSubType extends \TYPO3\CMS\Core\Type\Enumeration {
+
        const __default = self::DEFAULT_TYPE;
 
        /**
index 28c4305..8b137cf 100644 (file)
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Core\DataHandling;
  * @package TYPO3\CMS\Core
  */
 class TableColumnType extends \TYPO3\CMS\Core\Type\Enumeration {
+
        const __default = self::INPUT;
 
        /**
index 8279916..b2c86ab 100644 (file)
@@ -13,12 +13,14 @@ namespace TYPO3\CMS\Core\ElementBrowser;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Interface for classes which hook into browse_links
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
 interface ElementBrowserHookInterface {
+
        /**
         * Initializes the hook object
         *
index e283113..eaf1b19 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Encoder;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Adopted from OWASP Enterprise Security API (ESAPI) reference implementation for the JavaScript Codec.
  * Original Author: Mike Boberski
index c01f941..fdb939b 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * An abstract exception handler
  *
- * This file is a backport from FLOW3
+ * This file is a backport from TYPO3 Flow
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
index 06f0f0a..661b96d 100644 (file)
@@ -13,16 +13,17 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A basic but solid exception handler which catches everything which
  * falls through the other exception handlers and provides useful debugging
  * information.
  *
- * This file is a backport from FLOW3
+ * This file is a backport from TYPO3 Flow
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-class DebugExceptionHandler extends \TYPO3\CMS\Core\Error\AbstractExceptionHandler {
+class DebugExceptionHandler extends AbstractExceptionHandler {
 
        /**
         * Constructs this exception handler - registers itself as the default exception handler.
index 5fe0e98..68291ff 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Global error handler for TYPO3
  *
- * This file is a backport from FLOW3
+ * This file is a backport from TYPO3 Flow
  *
  * @author Rupert Germann <rupi@gmx.li>
  */
@@ -102,12 +103,10 @@ class ErrorHandler implements ErrorHandlerInterface {
                } else {
                        switch ($errorLevel) {
                                case E_USER_ERROR:
-
                                case E_RECOVERABLE_ERROR:
                                        $severity = 2;
                                        break;
                                case E_USER_WARNING:
-
                                case E_WARNING:
                                        $severity = 1;
                                        break;
index edb3b17..60a0176 100644 (file)
@@ -13,14 +13,16 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Error handler interface for TYPO3
  *
- * This file is a backport from FLOW3
+ * This file is a backport from TYPO3 Flow
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
 interface ErrorHandlerInterface {
+
        /**
         * Registers this class as default error handler
         *
index 110808b..66a00c8 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * An exception which represents a PHP error.
  *
@@ -22,5 +23,4 @@ namespace TYPO3\CMS\Core\Error;
  */
 class Exception extends \TYPO3\CMS\Core\Exception {
 
-
 }
index 66fbf75..bbe1ff1 100644 (file)
@@ -13,15 +13,16 @@ namespace TYPO3\CMS\Core\Error;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Contract for an exception handler
  *
- * This file is a backport from FLOW3
+ * This file is a backport from TYPO3 Flow
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-interface ExceptionHandlerInterface
-{
+interface ExceptionHandlerInterface {
+
        /**
         * Constructs this exception handler - registers itself as the default exception handler.
         */
index aafd9b3..60551f3 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * HTTP Client Error Exception (Error 4xx)
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\Error\Http;
  */
 abstract class AbstractClientErrorException extends StatusException {
 
-
 }
index aa4b07c..a6df3da 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * HTTP Server Error Exception (Error 5xx)
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\Error\Http;
  */
 abstract class AbstractServerErrorException extends StatusException {
 
-
 }
index e305136..92a737c 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Exception for Error 400 - Bad Request
  *
index dd7ed49..6bc39e2 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Exception for Error 403 - Forbidden
  *
index 857185c..36cf347 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Exception for Error 404 - Page Not Found
  *
index 9c1c21b..848990f 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Exception for Error 503 - Service Unavailable
  *
index e173b0c..2dc9ebf 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * HTTP Status Exception
  *
index 4907d2f..acf7dbb 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Error\Http;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Exception for Error 401 - Unauthorized
  *
index 2a4e6e4..c9b4754 100644 (file)
@@ -13,6 +13,9 @@ namespace TYPO3\CMS\Core\ExtDirect;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * Ext Direct API Generator
  *
@@ -104,7 +107,7 @@ class ExtDirectApi {
                                }
                                if (is_array($configuration)) {
                                        $className = $configuration['callbackClass'];
-                                       $serverObject = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($className, FALSE);
+                                       $serverObject = GeneralUtility::getUserObj($className, FALSE);
                                        $javascriptNamespaces[$javascriptNamespace]['actions'][$javascriptObjectName] = array();
                                        foreach (get_class_methods($serverObject) as $methodName) {
                                                $reflectionMethod = new \ReflectionMethod($serverObject, $methodName);
@@ -132,9 +135,9 @@ class ExtDirectApi {
        public function getRoutingUrl($namespace) {
                $url = '';
                if (TYPO3_MODE === 'FE') {
-                       $url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl('?eID=ExtDirect&action=route&namespace=');
+                       $url = GeneralUtility::locationHeaderUrl('?eID=ExtDirect&action=route&namespace=');
                } else {
-                       $url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir . 'ajax.php?ajaxID=ExtDirect::route&namespace=');
+                       $url = GeneralUtility::locationHeaderUrl(GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir . 'ajax.php?ajaxID=ExtDirect::route&namespace=');
                }
                $url .= rawurlencode($namespace);
                return $url;
@@ -148,10 +151,10 @@ class ExtDirectApi {
         * @return string $javascriptNamespaces
         */
        protected function getExtDirectApi(array $filterNamespaces) {
-               $noCache = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('no_cache') ? TRUE : FALSE;
+               $noCache = GeneralUtility::_GET('no_cache') ? TRUE : FALSE;
                // Look up into the cache
                $cacheIdentifier = 'ExtDirectApi';
-               $cacheHash = md5($cacheIdentifier . implode(',', $filterNamespaces) . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SSL') . serialize($this->settings) . TYPO3_MODE . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('HTTP_HOST'));
+               $cacheHash = md5($cacheIdentifier . implode(',', $filterNamespaces) . GeneralUtility::getIndpEnv('TYPO3_SSL') . serialize($this->settings) . TYPO3_MODE . GeneralUtility::getIndpEnv('HTTP_HOST'));
                // With no_cache always generate the javascript content
                // Generate the javascript content if it wasn't found inside the cache and cache it!
                if ($noCache || !is_array(($javascriptNamespaces = \TYPO3\CMS\Frontend\Page\PageRepository::getHash($cacheHash)))) {
@@ -193,7 +196,7 @@ class ExtDirectApi {
                }
                $found = FALSE;
                foreach ($filterNamespaces as $filter) {
-                       if (\TYPO3\CMS\Core\Utility\GeneralUtility::isFirstPartOfStr($filter, $namespace)) {
+                       if (GeneralUtility::isFirstPartOfStr($filter, $namespace)) {
                                $found = TRUE;
                                break;
                        }
index 34ecdd7..bc38a9f 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\ExtDirect;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Ext Direct Debug
  *
index e77ab72..44f2df0 100644 (file)
@@ -13,6 +13,9 @@ namespace TYPO3\CMS\Core\ExtDirect;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * Ext Direct Router
  *
@@ -29,12 +32,12 @@ class ExtDirectRouter {
         * @return void
         */
        public function route($ajaxParams, \TYPO3\CMS\Core\Http\AjaxRequestHandler $ajaxObj) {
-               $GLOBALS['error'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\ExtDirect\\ExtDirectDebug');
+               $GLOBALS['error'] = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\ExtDirect\\ExtDirectDebug');
                $isForm = FALSE;
                $isUpload = FALSE;
                $rawPostData = file_get_contents('php://input');
-               $postParameters = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST();
-               $namespace = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('namespace');
+               $postParameters = GeneralUtility::_POST();
+               $namespace = GeneralUtility::_GET('namespace');
                $response = array();
                $request = NULL;
                $isValidRequest = TRUE;
@@ -131,7 +134,7 @@ class ExtDirectRouter {
                                ), TRUE);
                        }
                }
-               $endpointObject = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($callbackClass, FALSE);
+               $endpointObject = GeneralUtility::getUserObj($callbackClass, FALSE);
                return call_user_func_array(array($endpointObject, $singleRequest->method), is_array($singleRequest->data) ? $singleRequest->data : array());
        }
 
index 6ebb715..148df2d 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Core\FormProtection;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * This class provides protection against cross-site request forgery (XSRF/CSRF)
  * for forms.
@@ -79,7 +81,7 @@ abstract class AbstractFormProtection {
                if ($formName == '') {
                        throw new \InvalidArgumentException('$formName must not be empty.', 1294586643);
                }
-               $tokenId = \TYPO3\CMS\Core\Utility\GeneralUtility::hmac($formName . $action . $formInstanceName . $this->getSessionToken());
+               $tokenId = GeneralUtility::hmac($formName . $action . $formInstanceName . $this->getSessionToken());
                return $tokenId;
        }
 
@@ -94,7 +96,7 @@ abstract class AbstractFormProtection {
         * @return bool
         */
        public function validateToken($tokenId, $formName, $action = '', $formInstanceName = '') {
-               $validTokenId = \TYPO3\CMS\Core\Utility\GeneralUtility::hmac(((string)$formName . (string)$action) . (string)$formInstanceName . $this->getSessionToken());
+               $validTokenId = GeneralUtility::hmac(((string)$formName . (string)$action) . (string)$formInstanceName . $this->getSessionToken());
                if ((string)$tokenId === $validTokenId) {
                        $isValid = TRUE;
                } else {
@@ -112,7 +114,7 @@ abstract class AbstractFormProtection {
         * @return string
         */
        protected function generateSessionToken() {
-               return bin2hex(\TYPO3\CMS\Core\Utility\GeneralUtility::generateRandomBytes(32));
+               return bin2hex(GeneralUtility::generateRandomBytes(32));
        }
 
        /**
index 9fc4df4..a6ee401 100644 (file)
@@ -72,7 +72,7 @@ namespace TYPO3\CMS\Core\FormProtection;
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
-class BackendFormProtection extends \TYPO3\CMS\Core\FormProtection\AbstractFormProtection {
+class BackendFormProtection extends AbstractFormProtection {
 
        /**
         * Keeps the instance of the user which existed during creation
@@ -92,6 +92,8 @@ class BackendFormProtection extends \TYPO3\CMS\Core\FormProtection\AbstractFormP
 
        /**
         * Only allow construction if we have a backend session
+        *
+        * @throws \TYPO3\CMS\Core\Error\Exception
         */
        public function __construct() {
                if (!$this->isAuthorizedBackendSession()) {
index 2365e6e..7de4dd0 100644 (file)
@@ -20,7 +20,7 @@ namespace TYPO3\CMS\Core\FormProtection;
  *
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
-class DisabledFormProtection extends \TYPO3\CMS\Core\FormProtection\AbstractFormProtection {
+class DisabledFormProtection extends AbstractFormProtection {
 
        /**
         * Disable parent constructor
index 5ff43af..301f47b 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\FormProtection;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Invalid token exception
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\FormProtection;
  */
 class Exception extends \UnexpectedValueException {
 
-
 }
index d2b5e20..8489b3e 100644 (file)
@@ -87,7 +87,6 @@ class FormProtectionFactory {
                                $className = 'TYPO3\\CMS\\Core\\FormProtection\\BackendFormProtection';
                                break;
                        case self::isFrontendSession():
-
                        default:
                                $className = 'TYPO3\\CMS\\Core\\FormProtection\\DisabledFormProtection';
                }
@@ -133,7 +132,7 @@ class FormProtectionFactory {
                        throw new \InvalidArgumentException('$className must be the name of an existing class, but ' . 'actually was "' . $className . '".', 1285352962);
                }
                $instance = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance($className);
-               if (!$instance instanceof \TYPO3\CMS\Core\FormProtection\AbstractFormProtection) {
+               if (!$instance instanceof AbstractFormProtection) {
                        throw new \InvalidArgumentException('$className must be a subclass of ' . 'TYPO3\\CMS\\Core\\FormProtection\\AbstractFormProtection, but actually was "' . $className . '".', 1285353026);
                }
                self::$instances[$className] = $instance;
@@ -147,10 +146,10 @@ class FormProtectionFactory {
         *
         * @access private
         * @param string $className
-        * @param \TYPO3\CMS\Core\FormProtection\AbstractFormProtection $instance
+        * @param AbstractFormProtection $instance
         * @return void
         */
-       static public function set($className, \TYPO3\CMS\Core\FormProtection\AbstractFormProtection $instance) {
+       static public function set($className, AbstractFormProtection $instance) {
                self::$instances[$className] = $instance;
        }
 
index 4a10f30..8cfa3e1 100644 (file)
@@ -13,6 +13,9 @@ namespace TYPO3\CMS\Core\FrontendEditing;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * Controller class for frontend editing.
  *
@@ -40,7 +43,7 @@ class FrontendEditingController {
         * @return void
         */
        public function initConfigOptions() {
-               $this->TSFE_EDIT = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('TSFE_EDIT');
+               $this->TSFE_EDIT = GeneralUtility::_GP('TSFE_EDIT');
                // Include classes for editing IF editing module in Admin Panel is open
                if ($GLOBALS['BE_USER']->isFrontendEditingActive()) {
                        if ($this->isEditAction()) {
@@ -88,7 +91,7 @@ class FrontendEditingController {
                if ($GLOBALS['TSFE']->displayEditIcons && $table && $this->allowedToEdit($table, $dataArray, $conf, $checkEditAccessInternals) && $this->allowedToEditLanguage($table, $dataArray)) {
                        $editClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/classes/class.frontendedit.php']['edit'];
                        if ($editClass) {
-                               $edit = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($editClass, FALSE);
+                               $edit = GeneralUtility::getUserObj($editClass, FALSE);
                                if (is_object($edit)) {
                                        $allowedActions = $this->getAllowedEditActions($table, $conf, $dataArray['pid']);
                                        $content = $edit->editPanel($content, $conf, $currentRecord, $dataArray, $table, $allowedActions, $newUid, $this->getHiddenFields($dataArray));
@@ -113,7 +116,7 @@ class FrontendEditingController {
        public function displayEditIcons($content, $params, array $conf = array(), $currentRecord = '', array $dataArray = array(), $addUrlParamStr = '') {
                // Check incoming params:
                list($currentRecordTable, $currentRecordUID) = explode(':', $currentRecord);
-               list($fieldList, $table) = array_reverse(\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $params, TRUE));
+               list($fieldList, $table) = array_reverse(GeneralUtility::trimExplode(':', $params, TRUE));
                // Reverse the array because table is optional
                if (!$table) {
                        $table = $currentRecordTable;
@@ -129,7 +132,7 @@ class FrontendEditingController {
                if ($GLOBALS['TSFE']->displayFieldEditIcons && $table && $this->allowedToEdit($table, $dataArray, $conf) && $fieldList && $this->allowedToEditLanguage($table, $dataArray)) {
                        $editClass = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/classes/class.frontendedit.php']['edit'];
                        if ($editClass) {
-                               $edit = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($editClass);
+                               $edit = GeneralUtility::getUserObj($editClass);
                                if (is_object($edit)) {
                                        $content = $edit->editIcons($content, $params, $conf, $currentRecord, $dataArray, $addUrlParamStr, $table, $editUid, $fieldList);
                                }
@@ -202,7 +205,7 @@ class FrontendEditingController {
                        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction'])) {
                                $_params = array();
                                foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction'] as $_funcRef) {
-                                       \TYPO3\CMS\Core\Utility\GeneralUtility::callUserFunction($_funcRef, $_params, $this);
+                                       GeneralUtility::callUserFunction($_funcRef, $_params, $this);
                                }
                        }
                        // Perform the requested editing command.
@@ -299,7 +302,7 @@ class FrontendEditingController {
                $sortField = $GLOBALS['TCA'][$table]['ctrl']['sortby'];
                if ($sortField) {
                        // Get self
-                       $fields = array_unique(\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['copyAfterDuplFields'] . ',uid,pid,' . $sortField, TRUE));
+                       $fields = array_unique(GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['copyAfterDuplFields'] . ',uid,pid,' . $sortField, TRUE));
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(implode(',', $fields), $table, 'uid=' . $uid);
                        if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                // Record before or after
@@ -308,7 +311,7 @@ class FrontendEditingController {
                                }
                                $copyAfterFieldsQuery = '';
                                if ($GLOBALS['TCA'][$table]['ctrl']['copyAfterDuplFields']) {
-                                       $cAFields = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['copyAfterDuplFields'], TRUE);
+                                       $cAFields = GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['copyAfterDuplFields'], TRUE);
                                        foreach ($cAFields as $fieldName) {
                                                $copyAfterFieldsQuery .= ' AND ' . $fieldName . '="' . $row[$fieldName] . '"';
                                        }
@@ -470,7 +473,7 @@ class FrontendEditingController {
                        }
                        if (!$conf['onlyCurrentPid'] || $dataArray['pid'] == $GLOBALS['TSFE']->id) {
                                // Permissions:
-                               $types = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::strtolower($conf['allow']), TRUE);
+                               $types = GeneralUtility::trimExplode(',', GeneralUtility::strtolower($conf['allow']), TRUE);
                                $allow = array_flip($types);
                                $perms = $GLOBALS['BE_USER']->calcPerms($GLOBALS['TSFE']->page);
                                if ($table == 'pages') {
@@ -498,12 +501,12 @@ class FrontendEditingController {
         */
        protected function getAllowedEditActions($table, array $conf, $pid, $allow = '') {
                if (!$allow) {
-                       $types = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::strtolower($conf['allow']), TRUE);
+                       $types = GeneralUtility::trimExplode(',', GeneralUtility::strtolower($conf['allow']), TRUE);
                        $allow = array_flip($types);
                }
                if (!$conf['onlyCurrentPid'] || $pid == $GLOBALS['TSFE']->id) {
                        // Permissions
-                       $types = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::strtolower($conf['allow']), TRUE);
+                       $types = GeneralUtility::trimExplode(',', GeneralUtility::strtolower($conf['allow']), TRUE);
                        $allow = array_flip($types);
                        $perms = $GLOBALS['BE_USER']->calcPerms($GLOBALS['TSFE']->page);
                        if ($table == 'pages') {
@@ -558,7 +561,7 @@ class FrontendEditingController {
         */
        protected function initializeTceMain() {
                if (!isset($this->tce)) {
-                       $this->tce = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandling\\DataHandler');
+                       $this->tce = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandling\\DataHandler');
                        $this->tce->stripslashes_values = 0;
                }
        }
index 8d96ff2..7977e67 100644 (file)
@@ -24,10 +24,14 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class HtmlParser {
 
+       /**
+        * @var array
+        */
        protected $caseShift_cache = array();
 
        // Void elements that do not have closing tags, as defined by HTML5, except link element
        const VOID_ELEMENTS = 'area|base|br|col|command|embed|hr|img|input|keygen|meta|param|source|track|wbr';
+
        /**
         * Returns the first subpart encapsulated in the marker, $marker
         * (possibly present in $content as a HTML comment)
index 35d9eed..a4e3362 100644 (file)
@@ -25,74 +25,84 @@ use TYPO3\CMS\Core\Resource;
  */
 class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
 
-       // Static:
        /**
         * @var string
         */
        public $blockElementList = 'PRE,UL,OL,H1,H2,H3,H4,H5,H6,ADDRESS,DL,DD,HEADER,SECTION,FOOTER,NAV,ARTICLE,ASIDE';
 
-       // List of tags for these elements
-       // Internal, static:
-       // Set this to the pid of the record manipulated by the class.
        /**
+        * Set this to the pid of the record manipulated by the class.
+        *
         * @var int
         */
        public $recPid = 0;
 
-       // Element reference [table]:[field], eg. "tt_content:bodytext"
        /**
+        * Element reference [table]:[field], eg. "tt_content:bodytext"
+        *
         * @var string
         */
        public $elRef = '';
 
-       // Relative path
        /**
+        * Relative path
+        *
         * @var string
         */
        public $relPath = '';
 
-       // Relative back-path
        /**
+        * Relative back-path
+        *
         * @var string
         */
        public $relBackPath = '';
 
-       // Current Page TSConfig
+       /**
+        * Current Page TSConfig
+        *
+        * @var array
+        */
        public $tsConfig = array();
 
-       // Set to the TSconfig options coming from Page TSconfig
        /**
+        * Set to the TSconfig options coming from Page TSconfig
+        *
         * @var array
         */
        public $procOptions = array();
 
-       // Internal, dynamic
-       // Run-away brake for recursive calls.
        /**
+        * Run-away brake for recursive calls.
+        *
         * @var int
         */
        public $TS_transform_db_safecounter = 100;
 
-       // Parameters from TCA types configuration related to the RTE
        /**
+        * Parameters from TCA types configuration related to the RTE
+        *
         * @var string
         */
        public $rte_p = '';
 
-       // Data caching for processing function
        /**
+        * Data caching for processing function
+        *
         * @var array
         */
        public $getKeepTags_cache = array();
 
-       // Storage of the allowed CSS class names in the RTE
        /**
+        * Storage of the allowed CSS class names in the RTE
+        *
         * @var array
         */
        public $allowedClasses = array();
 
-       // Set to tags to preserve from Page TSconfig configuration
        /**
+        * Set to tags to preserve from Page TSconfig configuration
+        *
         * @var string
         */
        public $preserveTags = '';
@@ -1712,7 +1722,6 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
        * @return \TYPO3\CMS\Core\Log\Logger
        */
        protected function getLogger() {
-
                /** @var $logManager \TYPO3\CMS\Core\Log\LogManager */
                $logManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Log\\LogManager');
 
index 2d9f5b3..843973b 100644 (file)
@@ -21,20 +21,44 @@ namespace TYPO3\CMS\Core\Http;
  */
 class AjaxRequestHandler {
 
+       /**
+        * @var string|NULL
+        */
        protected $ajaxId = NULL;
 
+       /**
+        * @var string|NULL
+        */
        protected $errorMessage = NULL;
 
+       /**
+        * @var bool
+        */
        protected $isError = FALSE;
 
+       /**
+        * @var array
+        */
        protected $content = array();
 
+       /**
+        * @var string
+        */
        protected $contentFormat = 'plain';
 
+       /**
+        * @var string
+        */
        protected $charset = 'utf-8';
 
+       /**
+        * @var string
+        */
        protected $requestCharset = 'utf-8';
 
+       /**
+        * @var string
+        */
        protected $javascriptCallbackWrap = '
                <script type="text/javascript">
                        /*<![CDATA[*/
@@ -179,9 +203,7 @@ class AjaxRequestHandler {
                }
                switch ($this->contentFormat) {
                        case 'jsonhead':
-
                        case 'jsonbody':
-
                        case 'json':
                                $this->renderAsJSON();
                                break;
index 0e1a157..1afcc8e 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Http\Observer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Observer to automatically save a http request chunk by chunk to a file.
  * If the file already exists, it will be overwritten.
@@ -74,7 +75,6 @@ class Download implements \SplObserver {
                                $this->openFile();
                                break;
                        case 'receivedBodyPart':
-
                        case 'receivedEncodedBodyPart':
                                fwrite($this->filePointer, $event['data']);
                                break;
index bf1aead..f975471 100644 (file)
@@ -27,28 +27,30 @@ use TYPO3\CMS\Core\Utility\MathUtility;
  */
 class GraphicalFunctions {
 
-       // Internal configuration, set in init()
-
-       // If set, there is no frame pointer prepended to the filenames.
        /**
+        * If set, there is no frame pointer prepended to the filenames.
+        *
         * @var bool
         */
        public $noFramePrepended = 0;
 
-       // This should be changed to 'png' if you want this class to read/make PNG-files instead!
        /**
+        * This should be changed to 'png' if you want this class to read/make PNG-files instead!
+        *
         * @var string
         */
        public $gifExtension = 'gif';
 
-       // File formats supported by gdlib. This variable get's filled in "init" method
        /**
+        * File formats supported by gdlib. This variable get's filled in "init" method
+        *
         * @var string
         */
        public $gdlibExtensions = '';
 
-       // Set to TRUE if generated png's should be truecolor by default
        /**
+        * Set to TRUE if generated png's should be truecolor by default
+        *
         * @var bool
         */
        public $png_truecolor = FALSE;
@@ -94,26 +96,33 @@ class GraphicalFunctions {
                'YUV'
        );
 
-       // 16777216 Colors is the maximum value for PNG, JPEG truecolor images (24-bit, 8-bit / Channel)
        /**
+        * 16777216 Colors is the maximum value for PNG, JPEG truecolor images (24-bit, 8-bit / Channel)
+        *
         * @var int
         */
        public $truecolorColors = 16777215;
 
-       // If set, then all files in typo3temp will be logged in a database table. In addition to being a log of the files with original filenames, it also serves to secure that the same image is not rendered simultaneously by two different processes.
        /**
+        * If set, then all files in typo3temp will be logged in a database table.
+        * In addition to being a log of the files with original filenames,
+        * it also serves to secure that the same image is not rendered simultaneously by two different processes.
+        *
         * @var bool
         */
        public $enable_typo3temp_db_tracking = 0;
 
-       // Commalist of file extensions perceived as images by TYPO3. List should be set to 'gif,png,jpeg,jpg' if IM is not available. Lowercase and no spaces between!
        /**
+        * Commalist of file extensions perceived as images by TYPO3.
+        * List should be set to 'gif,png,jpeg,jpg' if IM is not available. Lowercase and no spaces between!
+        *
         * @var string
         */
        public $imageFileExt = 'gif,jpg,jpeg,png,tif,bmp,tga,pcx,ai,pdf';
 
-       // Commalist of web image extensions (can be shown by a webbrowser)
        /**
+        * Commalist of web image extensions (can be shown by a webbrowser)
+        *
         * @var string
         */
        public $webImageExt = 'gif,jpg,jpeg,png';
@@ -148,46 +157,53 @@ class GraphicalFunctions {
         */
        public $mayScaleUp = 1;
 
-       // Variables for testing, alternative usage etc.
-       // Filename prefix for images scaled in imageMagickConvert()
        /**
+        * Filename prefix for images scaled in imageMagickConvert()
+        *
         * @var string
         */
        public $filenamePrefix = '';
 
-       // Forcing the output filename of imageMagickConvert() to this value. However after calling imageMagickConvert() it will be set blank again.
        /**
+        * Forcing the output filename of imageMagickConvert() to this value. However after calling imageMagickConvert() it will be set blank again.
+        *
         * @var string
         */
        public $imageMagickConvert_forceFileNameBody = '';
 
-       // This flag should always be FALSE. If set TRUE, imageMagickConvert will always write a new file to the tempdir! Used for debugging.
        /**
+        * This flag should always be FALSE. If set TRUE, imageMagickConvert will always write a new file to the tempdir! Used for debugging.
+        *
         * @var bool
         */
        public $dontCheckForExistingTempFile = 0;
 
-       // Prevents imageMagickConvert() from compressing the gif-files with \TYPO3\CMS\Core\Utility\GeneralUtility::gif_compress()
        /**
+        * Prevents imageMagickConvert() from compressing the gif-files with \TYPO3\CMS\Core\Utility\GeneralUtility::gif_compress()
+        *
         * @var bool
         */
        public $dontCompress = 0;
 
-       // For debugging ONLY!
        /**
+        * For debugging ONLY!
+        *
         * @var bool
         */
        public $dontUnlinkTempFiles = 0;
 
-       // For debugging only. Filenames will not be based on mtime and only filename (not path) will be used. This key is also included in the hash of the filename...
        /**
+        * For debugging only.
+        * Filenames will not be based on mtime and only filename (not path) will be used.
+        * This key is also included in the hash of the filename...
+        *
         * @var string
         */
        public $alternativeOutputKey = '';
 
-       // Internal:
-       // All ImageMagick commands executed is stored in this array for tracking. Used by the Install Tools Image section
        /**
+        * All ImageMagick commands executed is stored in this array for tracking. Used by the Install Tools Image section
+        *
         * @var array
         */
        public $IM_commands = array();
@@ -204,45 +220,51 @@ class GraphicalFunctions {
         */
        protected $saveAlphaLayer = FALSE;
 
-       // Constants:
-       // The temp-directory where to store the files. Normally relative to PATH_site but is allowed to be the absolute path AS LONG AS it is a subdir to PATH_site.
        /**
+        * The temp-directory where to store the files. Normally relative to PATH_site but is allowed to be the absolute path AS LONG AS it is a subdir to PATH_site.
+        *
         * @var string
         */
        public $tempPath = 'typo3temp/';
 
-       // Prefix for relative paths. Used in "show_item.php" script. Is prefixed the output file name IN imageMagickConvert()
        /**
+        * Prefix for relative paths. Used in "show_item.php" script. Is prefixed the output file name IN imageMagickConvert()
+        *
         * @var string
         */
        public $absPrefix = '';
 
-       // ImageMagick scaling command; "-geometry" eller "-sample". Used in makeText() and imageMagickConvert()
        /**
+        * ImageMagick scaling command; "-geometry" eller "-sample". Used in makeText() and imageMagickConvert()
+        *
         * @var string
         */
        public $scalecmd = '-geometry';
 
-       // Used by v5_blur() to simulate 10 continuous steps of blurring
        /**
+        * Used by v5_blur() to simulate 10 continuous steps of blurring
+        *
         * @var string
         */
        public $im5fx_blurSteps = '1x2,2x2,3x2,4x3,5x3,5x4,6x4,7x5,8x5,9x5';
 
-       // Used by v5_sharpen() to simulate 10 continuous steps of sharpening.
        /**
+        * Used by v5_sharpen() to simulate 10 continuous steps of sharpening.
+        *
         * @var string
         */
        public $im5fx_sharpenSteps = '1x2,2x2,3x2,2x3,3x3,4x3,3x4,4x4,4x5,5x5';
 
-       // This is the limit for the number of pixels in an image before it will be rendered as JPG instead of GIF/PNG
        /**
+        * This is the limit for the number of pixels in an image before it will be rendered as JPG instead of GIF/PNG
+        *
         * @var int
         */
        public $pixelLimitGif = 10000;
 
-       // Array mapping HTML color names to RGB values.
        /**
+        * Array mapping HTML color names to RGB values.
+        *
         * @var array
         */
        public $colMap = array(
@@ -271,8 +293,9 @@ class GraphicalFunctions {
         */
        public $csConvObj;
 
-       // Is set to the native character set of the input strings.
        /**
+        * Is set to the native character set of the input strings.
+        *
         * @var string
         */
        public $nativeCharset = '';
index 05a5ed2..115a312 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
  * Depends on: Depends on \TYPO3\CMS\Core\Database\RelationHandler
  *
  * @todo Need to really extend this class when the tcemain library has been updated and the whole API is better defined. There are some known bugs in this library. Further it would be nice with a facility to not only analyze but also clean up!
- * @see SC_mod_tools_dbint_index::func_relations(), SC_mod_tools_dbint_index::func_records()
+ * @see \TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView::func_relations(), \TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView::func_records()
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class DatabaseIntegrityCheck {
@@ -52,7 +52,6 @@ class DatabaseIntegrityCheck {
         */
        public $genTree_makeHTML = 0;
 
-       // Internal
        /**
         * @var array Will hold id/rec pairs from genTree()
         */
@@ -73,7 +72,6 @@ class DatabaseIntegrityCheck {
         */
        public $backPath = '';
 
-       // Internal
        /**
         * @var array
         */
index 72f5fa0..4fc9324 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * File not found exception
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  */
 class FileNotFoundException extends \RuntimeException {
 
-
 }
index 0f51e11..d03c95e 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Invalid Parser exception
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  */
 class InvalidParserException extends \RuntimeException {
 
-
 }
index d3355a4..78b1d1b 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Invalid XML file exception
  *
@@ -20,5 +21,4 @@ namespace TYPO3\CMS\Core\Localization\Exception;
  */
 class InvalidXmlFileException extends \RuntimeException {
 
-
 }
index 28490c6..518b2d9 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Language store.
  *
index e95d34b..f770727 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Locales.
  *
index f074fb1..a2acd05 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Provides a language parser factory.
  *
index ac4513c..22b24a1 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Localization\Parser;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Abstract class for XML based parser.
  *
index c380e27..1c9d151 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Localization\Parser;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Parser interface.
  *
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
-interface LocalizationParserInterface
-{
+interface LocalizationParserInterface {
+
        /**
         * Returns parsed representation of XML file.
         *
index edf46a9..34bb148 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Localization\Parser;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Parser for PHP locallang array.
  *
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  * @author Dmitry Dulepov <dmitry.dulepov@gmail.com>
  */
-class LocallangArrayParser implements \TYPO3\CMS\Core\Localization\Parser\LocalizationParserInterface {
+class LocallangArrayParser implements LocalizationParserInterface {
 
        /**
         * @var string
index b930f98..d98d220 100644 (file)
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Core\Localization\Parser;
  *
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
-class LocallangXmlParser extends \TYPO3\CMS\Core\Localization\Parser\AbstractXmlParser {
+class LocallangXmlParser extends AbstractXmlParser {
 
        /**
         * Associative array of "filename => parsed data" pairs.
index ae0ef95..4ef04ad 100644 (file)
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Core\Localization\Parser;
  *
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
-class XliffParser extends \TYPO3\CMS\Core\Localization\Parser\AbstractXmlParser {
+class XliffParser extends AbstractXmlParser {
 
        /**
         * Returns array representation of XML data, starting from a root node.
index 64d35e6..b2adf59 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Locking;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
index 3ab5e3d..198ae8a 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Log;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log levels according to RFC 3164
  *
@@ -29,6 +30,7 @@ class LogLevel {
         * @var int
         */
        const EMERGENCY = 0;
+
        /**
         * Alert: action must be taken immediately
         *
@@ -37,6 +39,7 @@ class LogLevel {
         * @var int
         */
        const ALERT = 1;
+
        /**
         * Critical: critical conditions
         *
@@ -45,6 +48,7 @@ class LogLevel {
         * @var int
         */
        const CRITICAL = 2;
+
        /**
         * Error: error conditions
         *
@@ -53,6 +57,7 @@ class LogLevel {
         * @var int
         */
        const ERROR = 3;
+
        /**
         * Warning: warning conditions
         *
@@ -62,6 +67,7 @@ class LogLevel {
         * @var int
         */
        const WARNING = 4;
+
        /**
         * Notice: normal but significant condition
         *
@@ -70,6 +76,7 @@ class LogLevel {
         * @var int
         */
        const NOTICE = 5;
+
        /**
         * Informational: informational messages
         *
@@ -78,6 +85,7 @@ class LogLevel {
         * @var int
         */
        const INFO = 6;
+
        /**
         * Debug: debug-level messages
         *
@@ -86,6 +94,7 @@ class LogLevel {
         * @var int
         */
        const DEBUG = 7;
+
        /**
         * Reverse look up of log level to level name.
         *
index c99f3af..36981e6 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Log;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Global LogManager that keeps track of global logging information.
  *
@@ -28,10 +29,12 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
         * @var string
         */
        const CONFIGURATION_TYPE_WRITER = 'writer';
+
        /**
         * @var string
         */
        const CONFIGURATION_TYPE_PROCESSOR = 'processor';
+
        /**
         * Loggers to retrieve them for repeated use.
         *
@@ -120,7 +123,7 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
         * @return void
         * @throws \RangeException
         */
-       protected function setWritersForLogger(\TYPO3\CMS\Core\Log\Logger $logger) {
+       protected function setWritersForLogger(Logger $logger) {
                $configuration = $this->getConfigurationForLogger(self::CONFIGURATION_TYPE_WRITER, $logger->getName());
                foreach ($configuration as $severityLevel => $writer) {
                        foreach ($writer as $logWriterClassName => $logWriterOptions) {
@@ -143,7 +146,7 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
         * @return void
         * @throws \RangeException
         */
-       protected function setProcessorsForLogger(\TYPO3\CMS\Core\Log\Logger $logger) {
+       protected function setProcessorsForLogger(Logger $logger) {
                $configuration = $this->getConfigurationForLogger(self::CONFIGURATION_TYPE_PROCESSOR, $logger->getName());
                foreach ($configuration as $severityLevel => $processor) {
                        foreach ($processor as $logProcessorClassName => $logProcessorOptions) {
@@ -187,7 +190,7 @@ class LogManager implements \TYPO3\CMS\Core\SingletonInterface, LogManagerInterf
                // Validate the config
                foreach ($result as $level => $unused) {
                        try {
-                               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($level);
+                               LogLevel::validateLevel($level);
                        } catch (\RangeException $e) {
                                throw new \RangeException('The given severity level "' . htmlspecialchars($level) . '" for ' . $configurationKey . ' of logger "' . $loggerName . '" is not valid.', 1326406447);
                        }
index 551d9ed..83e00d0 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Log;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log record
  *
@@ -47,7 +48,7 @@ class LogRecord implements \ArrayAccess {
         *
         * @var int
         */
-       protected $level = \TYPO3\CMS\Core\Log\LogLevel::INFO;
+       protected $level = LogLevel::INFO;
 
        /**
         * Log message one-liner
@@ -154,7 +155,7 @@ class LogRecord implements \ArrayAccess {
         * @see \TYPO3\CMS\Core\Log\Level
         */
        public function setLevel($level) {
-               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($level);
+               LogLevel::validateLevel($level);
                $this->level = $level;
                return $this;
        }
@@ -249,7 +250,7 @@ class LogRecord implements \ArrayAccess {
         */
        public function __toString() {
                $timestamp = date('r', (int)$this->created);
-               $levelName = \TYPO3\CMS\Core\Log\LogLevel::getName($this->level);
+               $levelName = LogLevel::getName($this->level);
                $data = !empty($this->data) ? '- ' . json_encode($this->data) : '';
                $logRecordString = sprintf('%s [%s] request="%s" component="%s": %s %s', $timestamp, $levelName, $this->requestId, $this->component, $this->message, $data);
                return $logRecordString;
index 8d992f7..944bc00 100644 (file)
@@ -38,7 +38,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         *
         * @var int
         */
-       protected $minimumLogLevel = \TYPO3\CMS\Core\Log\LogLevel::EMERGENCY;
+       protected $minimumLogLevel = LogLevel::EMERGENCY;
 
        /**
         * Writers used by this logger
@@ -71,7 +71,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        protected function setMinimumLogLevel($level) {
-               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($level);
+               LogLevel::validateLevel($level);
                $this->minimumLogLevel = $level;
                return $this;
        }
@@ -102,10 +102,10 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function addWriter($minimumLevel, \TYPO3\CMS\Core\Log\Writer\WriterInterface $writer) {
-               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($minimumLevel);
+               LogLevel::validateLevel($minimumLevel);
                // Cycle through all the log levels which are as severe as or higher
                // than $minimumLevel and add $writer to each severity level
-               for ($logLevelWhichTriggersWriter = \TYPO3\CMS\Core\Log\LogLevel::EMERGENCY; $logLevelWhichTriggersWriter <= $minimumLevel; $logLevelWhichTriggersWriter++) {
+               for ($logLevelWhichTriggersWriter = LogLevel::EMERGENCY; $logLevelWhichTriggersWriter <= $minimumLevel; $logLevelWhichTriggersWriter++) {
                        if (!isset($this->writers[$logLevelWhichTriggersWriter])) {
                                $this->writers[$logLevelWhichTriggersWriter] = array();
                        }
@@ -134,10 +134,10 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return void
         */
        public function addProcessor($minimumLevel, \TYPO3\CMS\Core\Log\Processor\ProcessorInterface $processor) {
-               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($minimumLevel);
+               LogLevel::validateLevel($minimumLevel);
                // Cycle through all the log levels which are as severe as or higher
                // than $minimumLevel and add $processor to each severity level
-               for ($logLevelWhichTriggersProcessor = \TYPO3\CMS\Core\Log\LogLevel::EMERGENCY; $logLevelWhichTriggersProcessor <= $minimumLevel; $logLevelWhichTriggersProcessor++) {
+               for ($logLevelWhichTriggersProcessor = LogLevel::EMERGENCY; $logLevelWhichTriggersProcessor <= $minimumLevel; $logLevelWhichTriggersProcessor++) {
                        if (!isset($this->processors[$logLevelWhichTriggersProcessor])) {
                                $this->processors[$logLevelWhichTriggersProcessor] = array();
                        }
@@ -167,7 +167,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         */
        public function log($level, $message, array $data = array()) {
                $level = LogLevel::normalizeLevel($level);
-               \TYPO3\CMS\Core\Log\LogLevel::validateLevel($level);
+               LogLevel::validateLevel($level);
                if ($level > $this->minimumLogLevel) {
                        return $this;
                }
@@ -185,11 +185,11 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @throws \RuntimeException
         * @return \TYPO3\CMS\Core\Log\LogRecord Processed log record
         */
-       protected function callProcessors(\TYPO3\CMS\Core\Log\LogRecord $record) {
+       protected function callProcessors(LogRecord $record) {
                if (!empty($this->processors[$record->getLevel()])) {
                        foreach ($this->processors[$record->getLevel()] as $processor) {
                                $processedRecord = $processor->processLogRecord($record);
-                               if (!$processedRecord instanceof \TYPO3\CMS\Core\Log\LogRecord) {
+                               if (!$processedRecord instanceof LogRecord) {
                                        throw new \RuntimeException('Processor ' . get_class($processor) . ' returned invalid data. Instance of TYPO3\\CMS\\Core\\Log\\LogRecord expected', 1343593398);
                                }
                                $record = $processedRecord;
@@ -204,7 +204,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @param \TYPO3\CMS\Core\Log\LogRecord $record
         * @return void
         */
-       protected function writeLog(\TYPO3\CMS\Core\Log\LogRecord $record) {
+       protected function writeLog(LogRecord $record) {
                if (!empty($this->writers[$record->getLevel()])) {
                        foreach ($this->writers[$record->getLevel()] as $writer) {
                                $writer->writeLog($record);
@@ -220,7 +220,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function emergency($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::EMERGENCY, $message, $data);
+               return $this->log(LogLevel::EMERGENCY, $message, $data);
        }
 
        /**
@@ -231,7 +231,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function alert($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::ALERT, $message, $data);
+               return $this->log(LogLevel::ALERT, $message, $data);
        }
 
        /**
@@ -242,7 +242,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function critical($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::CRITICAL, $message, $data);
+               return $this->log(LogLevel::CRITICAL, $message, $data);
        }
 
        /**
@@ -253,7 +253,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function error($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::ERROR, $message, $data);
+               return $this->log(LogLevel::ERROR, $message, $data);
        }
 
        /**
@@ -264,7 +264,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function warning($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::WARNING, $message, $data);
+               return $this->log(LogLevel::WARNING, $message, $data);
        }
 
        /**
@@ -275,7 +275,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function notice($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::NOTICE, $message, $data);
+               return $this->log(LogLevel::NOTICE, $message, $data);
        }
 
        /**
@@ -286,7 +286,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function info($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::INFO, $message, $data);
+               return $this->log(LogLevel::INFO, $message, $data);
        }
 
        /**
@@ -297,7 +297,7 @@ class Logger implements \Psr\Log\LoggerInterface {
         * @return \TYPO3\CMS\Core\Log\Logger $this
         */
        public function debug($message, array $data = array()) {
-               return $this->log(\TYPO3\CMS\Core\Log\LogLevel::DEBUG, $message, $data);
+               return $this->log(LogLevel::DEBUG, $message, $data);
        }
 
 }
index 2431015..8cf9bcc 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Common memory processor methods.
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
+abstract class AbstractMemoryProcessor extends AbstractProcessor {
 
        /**
         * Allocated memory usage type to use
index 72f3db9..cc9371a 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Abstract implementation of a log processor
  *
  * @author Steffen Müller <typo3@t3node.com>
  */
-abstract class AbstractProcessor implements \TYPO3\CMS\Core\Log\Processor\ProcessorInterface {
+abstract class AbstractProcessor implements ProcessorInterface {
 
        /**
         * Constructs this log processor
index d238bbc..7486d90 100644 (file)
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-class IntrospectionProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
+class IntrospectionProcessor extends AbstractProcessor {
 
        /**
         * Add the full backtrace to the log entry or
index f2f8215..652c6d5 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Memory peak usage processor methods.
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-class MemoryPeakUsageProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractMemoryProcessor {
+class MemoryPeakUsageProcessor extends AbstractMemoryProcessor {
 
        /**
         * Processes a log record and adds memory peak usage information.
index 562bcdd..0f86ff0 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Memory usage processor methods.
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-class MemoryUsageProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractMemoryProcessor {
+class MemoryUsageProcessor extends AbstractMemoryProcessor {
 
        /**
         * Processes a log record and adds memory usage information.
index b7569c0..09f9189 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A log processor that does nothing. Used in unit tests.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  */
-class NullProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
+class NullProcessor extends AbstractProcessor {
 
        /**
         * Processes a log record and returns the same.
index 35ac25a..394022e 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log processor interface
  *
@@ -22,6 +23,7 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * @author Ingo Renner <ingo@typo3.org>
  */
 interface ProcessorInterface {
+
        /**
         * Processes a log record and adds additional data.
         *
index 8377670..46f6e0e 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Web log processor to automatically add web request related data to a log
  * record.
@@ -20,7 +21,7 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-class WebProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
+class WebProcessor extends AbstractProcessor {
 
        /**
         * Processes a log record and adds webserver environment data.
index 69152a0..dff066c 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Abstract implementation of a log writer
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-abstract class AbstractWriter implements \TYPO3\CMS\Core\Log\Writer\WriterInterface {
+abstract class AbstractWriter implements WriterInterface {
 
        /**
         * Constructs this log writer
index 0ef7b73..02583e3 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log writer that writes the log records into a database table.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  */
-class DatabaseWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
+class DatabaseWriter extends AbstractWriter {
 
        /**
         * Table to write the log records to.
index 857ef2f..af60bb3 100644 (file)
@@ -13,6 +13,9 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * Log writer that writes the log records into a file.
  *
@@ -20,7 +23,7 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * @author Steffen Müller <typo3@t3node.com>
  * @author Ingo Renner <ingo@typo3.org>
  */
-class FileWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
+class FileWriter extends AbstractWriter {
 
        /**
         * Log file path, relative to PATH_site
@@ -79,10 +82,10 @@ class FileWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
                // Skip handling if logFile is a stream resource. This is used by unit tests with vfs:// directories
                if (FALSE === strpos($logFile, '://')) {
-                       if (!\TYPO3\CMS\Core\Utility\GeneralUtility::isAllowedAbsPath((PATH_site . $logFile))) {
+                       if (!GeneralUtility::isAllowedAbsPath((PATH_site . $logFile))) {
                                throw new \InvalidArgumentException('Log file path "' . $logFile . '" is not valid!', 1326411176);
                        }
-                       $logFile = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($logFile);
+                       $logFile = GeneralUtility::getFileAbsFileName($logFile);
                }
                $this->logFile = $logFile;
                $this->openLogFile();
@@ -156,12 +159,12 @@ class FileWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
                }
                $logFileDirectory = dirname($this->logFile);
                if (!@is_dir($logFileDirectory)) {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($logFileDirectory);
+                       GeneralUtility::mkdir_deep($logFileDirectory);
                        // only create .htaccess, if we created the directory on our own
                        $this->createHtaccessFile($logFileDirectory . '/.htaccess');
                }
                // create the log file
-               \TYPO3\CMS\Core\Utility\GeneralUtility::writeFile($this->logFile, '');
+               GeneralUtility::writeFile($this->logFile, '');
        }
 
        /**
@@ -173,7 +176,7 @@ class FileWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
        protected function createHtaccessFile($htaccessFile) {
                // write .htaccess file to protect the log file
                if (!empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['generateApacheHtaccess']) && !file_exists($htaccessFile)) {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::writeFile($htaccessFile, 'Deny From All');
+                       GeneralUtility::writeFile($htaccessFile, 'Deny From All');
                }
        }
 
index b5bef99..ec6f3ee 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Null writer - just forgets about everything
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-class NullWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
+class NullWriter extends AbstractWriter {
 
        /**
         * Writes the log record
index 7cdba9f..51e0f4a 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log writer that writes the log records into PHP error log.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-class PhpErrorLogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
+class PhpErrorLogWriter extends AbstractWriter {
 
        /**
         * Writes the log record
index 4b94f08..8f5aa1d 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log writer that writes to syslog
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  */
-class SyslogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
+class SyslogWriter extends AbstractWriter {
 
        /**
         * List of valid syslog facility names.
index 73dea25..dd9edfd 100644 (file)
@@ -13,12 +13,14 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Log writer interface
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
 interface WriterInterface {
+
        /**
         * Writes the log record
         *
index 7847bae..e600785 100644 (file)
@@ -13,12 +13,14 @@ namespace TYPO3\CMS\Core\Mail;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Mailer Adapter interface
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
 interface MailerAdapterInterface {
+
        /**
         * Mail sending function
         *
index f7e4ca7..e513362 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Mail;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Adapter for Swift_Mailer to be used by TYPO3 extensions.
  *
index 0485c8a..ce36c8a 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A class used for any kind of messages.
  *
@@ -26,6 +27,7 @@ abstract class AbstractMessage {
        const OK = 0;
        const WARNING = 1;
        const ERROR = 2;
+
        /**
         * The message's title
         *
index a136663..8d83954 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Abstract class as base for standalone messages (error pages etc.)
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  */
-abstract class AbstractStandaloneMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
+abstract class AbstractStandaloneMessage extends AbstractMessage {
 
        /**
         * Path to the HTML template file, relative to PATH_site
@@ -48,7 +49,7 @@ abstract class AbstractStandaloneMessage extends \TYPO3\CMS\Core\Messaging\Abstr
         * @param string $title Title
         * @param int $severity Severity, see class constants of AbstractMessage
         */
-       public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
+       public function __construct($message = '', $title = '', $severity = AbstractMessage::ERROR) {
                if (!empty($message)) {
                        $this->setMessage($message);
                }
index ecf1563..ba3b48a 100644 (file)
@@ -13,13 +13,14 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A class representing error messages shown on a page.
  * Classic Example: "No pages are found on rootlevel"
  *
  * @author Benjamin Mack <benni@typo3.org>
  */
-class ErrorpageMessage extends \TYPO3\CMS\Core\Messaging\AbstractStandaloneMessage {
+class ErrorpageMessage extends AbstractStandaloneMessage {
 
        /**
         * Constructor for an Error message
@@ -28,7 +29,7 @@ class ErrorpageMessage extends \TYPO3\CMS\Core\Messaging\AbstractStandaloneMessa
         * @param string $title Title of the message, can be empty
         * @param int $severity Optional severity, must be either of AbstractMessage::INFO or related constants
         */
-       public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
+       public function __construct($message = '', $title = '', $severity = AbstractMessage::ERROR) {
                $this->setHtmlTemplate(TYPO3_mainDir . 'sysext/t3skin/templates/errorpage-message.html');
                parent::__construct($message, $title, $severity);
        }
index 3c23835..88532d8 100644 (file)
@@ -13,12 +13,13 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A class representing flash messages.
  *
  * @author Ingo Renner <ingo@typo3.org>
  */
-class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
+class FlashMessage extends AbstractMessage {
 
        /**
         * defines whether the message should be stored in the session (to survive redirects) or only for one request (default)
index 4b9ae2d..86692d2 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Authentication\AbstractUserAuthentication;
 
 /**
index 8a99de7..9328995 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A class representing flash messages.
  *
index 99c224f..9131f67 100644 (file)
@@ -40,6 +40,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
        const JQUERY_NAMESPACE_NONE = 'none';
        const JQUERY_NAMESPACE_DEFAULT = 'jQuery';
        const JQUERY_NAMESPACE_DEFAULT_NOCONFLICT = 'defaultNoConflict';
+
        /**
         * @var bool
         */
index c1ddbc2..bce09a5 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A class to store and retrieve entries in a registry database table.
  *
index a02a659..52ffc17 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * "empty" interface for singletons (marker interface pattern)
  *
index c66c51b..202943a 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\TimeTracker;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * A fake time tracker that does nothing but providing the methods of the real time tracker.
  * This is done to save some performance over the real time tracker.
index bbc2f85..4317baa 100644 (file)
@@ -23,14 +23,17 @@ namespace TYPO3\CMS\Core\TimeTracker;
  */
 class TimeTracker {
 
-       // Is loaded with the millisecond time when this object is created
        /**
+        * Is loaded with the millisecond time when this object is created
+        *
         * @var int
         */
        public $starttime = 0;
 
-       // Log Rendering flag. If set, ->push() and ->pull() is called from the cObj->cObjGetSingle(). This determines whether or not the TypoScript parsing activity is logged. But it also slows down the rendering
        /**
+        * Log Rendering flag. If set, ->push() and ->pull() is called from the cObj->cObjGetSingle().
+        * This determines whether or not the TypoScript parsing activity is logged. But it also slows down the rendering
+        *
         * @var bool
         */
        public $LR = 1;
@@ -97,8 +100,9 @@ class TimeTracker {
         */
        public $currentHashPointer = array();
 
-       // Log entries that take than this number of milliseconds (own time) will be highlighted during log display. Set 0 to disable highlighting.
        /**
+        * Log entries that take than this number of milliseconds (own time) will be highlighted during log display. Set 0 to disable highlighting.
+        *
         * @var int
         */
        public $highlightLongerThan = 0;
index f419f9a..c56561b 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -20,11 +21,12 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
  */
-class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\AbstractTableConfigurationTreeDataProvider {
+class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvider {
 
        const SIGNAL_PostProcessTreeData = 'PostProcessTreeData';
        const MODE_CHILDREN = 1;
        const MODE_PARENT = 2;
+
        /**
         * @var string
         */
@@ -230,9 +232,9 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
         * @param int $level
         * @return \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode Node object
         */
-       protected function buildRepresentationForNode(\TYPO3\CMS\Backend\Tree\TreeNode $basicNode, \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $parent = NULL, $level = 0) {
+       protected function buildRepresentationForNode(\TYPO3\CMS\Backend\Tree\TreeNode $basicNode, DatabaseTreeNode $parent = NULL, $level = 0) {
                /** @var $node \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode */
-               $node = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\DatabaseTreeNode');
+               $node = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\DatabaseTreeNode');
                $row = array();
                if ($basicNode->getId() == 0) {
                        $node->setSelected(FALSE);
@@ -245,18 +247,18 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                        } else {
                                $node->setLabel($basicNode->getId());
                        }
-                       $node->setSelected(\TYPO3\CMS\Core\Utility\GeneralUtility::inList($this->getSelectedList(), $basicNode->getId()));
+                       $node->setSelected(GeneralUtility::inList($this->getSelectedList(), $basicNode->getId()));
                        $node->setExpanded($this->isExpanded($basicNode));
                }
                $node->setId($basicNode->getId());
-               $node->setSelectable(!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($this->getNonSelectableLevelList(), $level) && !in_array($basicNode->getId(), $this->getItemUnselectableList()));
+               $node->setSelectable(!GeneralUtility::inList($this->getNonSelectableLevelList(), $level) && !in_array($basicNode->getId(), $this->getItemUnselectableList()));
                $node->setSortValue($this->nodeSortValues[$basicNode->getId()]);
                $node->setIcon(\TYPO3\CMS\Backend\Utility\IconUtility::mapRecordTypeToSpriteIconClass($this->tableName, $row));
                $node->setParentNode($parent);
                if ($basicNode->hasChildNodes()) {
                        $node->setHasChildren(TRUE);
                        /** @var $childNodes \TYPO3\CMS\Backend\Tree\SortedTreeNodeCollection */
-                       $childNodes = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\SortedTreeNodeCollection');
+                       $childNodes = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\SortedTreeNodeCollection');
                        foreach ($basicNode->getChildNodes() as $child) {
                                $childNodes->append($this->buildRepresentationForNode($child, $node, $level + 1));
                        }
@@ -277,7 +279,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                if (isset($this->columnConfiguration['foreign_table']) && $this->columnConfiguration['foreign_table'] != $this->getTableName()) {
                        throw new \InvalidArgumentException('TCA Tree configuration is invalid: tree for different node-Tables is not implemented yet', 1290944650);
                }
-               $this->treeData = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNode');
+               $this->treeData = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNode');
                $this->treeData->setId($this->getRootUid());
                $this->treeData->setParentNode(NULL);
                $childNodes = $this->getChildrenOf($this->treeData, 0);
@@ -310,9 +312,9 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                $children = $this->getRelatedRecords($nodeData);
                if (count($children)) {
                        /** @var $storage \TYPO3\CMS\Backend\Tree\TreeNodeCollection */
-                       $storage = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNodeCollection');
+                       $storage = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNodeCollection');
                        foreach ($children as $child) {
-                               $node = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNode');
+                               $node = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\TreeNode');
                                $node->setId($child);
                                if ($level <= $this->levelMaximum) {
                                        $children = $this->getChildrenOf($node, $level + 1);
@@ -333,7 +335,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
         * @return array
         */
        protected function getRelatedRecords(array $row) {
-               if ($this->getLookupMode() == \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_PARENT) {
+               if ($this->getLookupMode() == DatabaseTreeDataProvider::MODE_PARENT) {
                        $children = $this->getChildrenUidsFromParentRelation($row);
                } else {
                        $children = $this->getChildrenUidsFromChildrenRelation($row);
@@ -362,7 +364,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                        case 'select':
                                if ($this->columnConfiguration['MM']) {
                                        /** @var $dbGroup \TYPO3\CMS\Core\Database\RelationHandler */
-                                       $dbGroup = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
+                                       $dbGroup = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
                                        // Dummy field for setting "look from other site"
                                        $this->columnConfiguration['MM_oppositeField'] = 'children';
                                        $dbGroup->start($row[$this->getLookupField()], $this->getTableName(), $this->columnConfiguration['MM'], $uid, $this->getTableName(), $this->columnConfiguration);
@@ -395,7 +397,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                        case 'select':
                                if ($this->columnConfiguration['MM']) {
                                        /** @var $dbGroup \TYPO3\CMS\Core\Database\RelationHandler */
-                                       $dbGroup = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
+                                       $dbGroup = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\RelationHandler');
                                        $dbGroup->start($value, $this->getTableName(), $this->columnConfiguration['MM'], $uid, $this->getTableName(), $this->columnConfiguration);
                                        $relatedUids = $dbGroup->tableArray[$this->getTableName()];
                                } elseif ($this->columnConfiguration['foreign_field']) {
@@ -404,11 +406,11 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
                                                $relatedUids[] = $record['uid'];
                                        }
                                } else {
-                                       $relatedUids = \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $value, TRUE);
+                                       $relatedUids = GeneralUtility::intExplode(',', $value, TRUE);
                                }
                                break;
                        default:
-                               $relatedUids = \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $value, TRUE);
+                               $relatedUids = GeneralUtility::intExplode(',', $value, TRUE);
                }
                return $relatedUids;
        }
index a946be2..3fbf3ea 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Represents a node in a TCA database setup
  *
index 4dc87ff..4054748 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Renders a tca tree array for ExtJS
  *
@@ -27,7 +28,7 @@ class ExtJsArrayTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\ExtJsJsonT
         * @param \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $node
         * @return array
         */
-       protected function getNodeArray(\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $node) {
+       protected function getNodeArray(DatabaseTreeNode $node) {
                $nodeArray = parent::getNodeArray($node);
                $nodeArray = array_merge($nodeArray, array(
                        'expanded' => $node->getExpanded(),
index c9635ec..67122f3 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class for tca tree
  *
index 60813a4..e1f4adc 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Builds a \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider
  * object based on some TCA configuration
@@ -82,10 +83,10 @@ class TreeDataProviderFactory {
                                $dataProvider->setNonSelectableLevelList('');
                        }
                        if (isset($treeConfiguration['childrenField'])) {
-                               $dataProvider->setLookupMode(\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_CHILDREN);
+                               $dataProvider->setLookupMode(DatabaseTreeDataProvider::MODE_CHILDREN);
                                $dataProvider->setLookupField($treeConfiguration['childrenField']);
                        } elseif (isset($treeConfiguration['parentField'])) {
-                               $dataProvider->setLookupMode(\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider::MODE_PARENT);
+                               $dataProvider->setLookupMode(DatabaseTreeDataProvider::MODE_PARENT);
                                $dataProvider->setLookupField($treeConfiguration['parentField']);
                        } else {
                                throw new \InvalidArgumentException('TCA Tree configuration is invalid: neither "childrenField" nor "parentField" is set', 1288215889);
index 7c17c53..916c9b1 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\TypoScript;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Provides a simplified layer for making Constant Editor style configuration forms
  *
@@ -20,7 +21,6 @@ namespace TYPO3\CMS\Core\TypoScript;
  */
 class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService {
 
-       // Internal
        /**
         * @var array
         */
@@ -51,7 +51,7 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
         * @param string $pathRel PathRel is the path relative to the typo3/ directory
         * @param string $pathAbs PathAbs is the absolute path from root
         * @param string $backPath BackPath is the backReference from current position to typo3/ dir
-        * @return      [type]          ...
+        * @return array
         */
        public function ext_initTSstyleConfig($configTemplate, $pathRel, $pathAbs, $backPath) {
                // Do not log time-performance information
@@ -66,11 +66,11 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
+        * Ext set value array
         *
-        * @param       [type]          $theConstants: ...
-        * @param       [type]          $valueArray: ...
-        * @return      [type]          ...
+        * @param array $theConstants
+        * @param array $valueArray
+        * @return array
         */
        public function ext_setValueArray($theConstants, $valueArray) {
                $temp = $this->flatSetup;
@@ -91,19 +91,15 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
-        *
-        * @return      [type]          ...
+        * @return array
         */
        public function ext_getCategoriesForModMenu() {
                return $this->ext_getCategoryLabelArray();
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $cat: ...
-        * @return      [type]          ...
+        * @param string $cat
+        * @return void
         */
        public function ext_makeHelpInformationForCategory($cat) {
                return $this->ext_getTSCE_config($cat);
@@ -141,9 +137,9 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
+        * Display example
         *
-        * @return      [type]          ...
+        * @return string
         */
        public function ext_displayExample() {
                if ($this->helpConfig['imagetag'] || $this->helpConfig['description'] || $this->helpConfig['header']) {
@@ -153,10 +149,10 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
+        * Merge incoming with existing
         *
-        * @param       [type]          $arr: ...
-        * @return      [type]          ...
+        * @param array $arr
+        * @return array
         */
        public function ext_mergeIncomingWithExisting($arr) {
                $parseObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
@@ -166,18 +162,16 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
                return $arr;
        }
 
-       // Extends:
        /**
+        * @return string
         */
        public function ext_getKeyImage($key) {
                return '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($this->ext_backPath, ('gfx/rednumbers/' . $key . '.gif'), '') . ' hspace="2" align="top" alt="" />';
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $imgConf: ...
-        * @return      [type]          ...
+        * @param string $imgConf
+        * @return string
         */
        public function ext_getTSCE_config_image($imgConf) {
                $iFile = $this->ext_localGfxPrefix . $imgConf;
@@ -187,10 +181,8 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $params: ...
-        * @return      [type]          ...
+        * @param array $params
+        * @return array
         */
        public function ext_fNandV($params) {
                $fN = 'data[' . $params['name'] . ']';
@@ -205,21 +197,17 @@ class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateServi
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $key: ...
-        * @param       [type]          $var: ...
-        * @return      [type]          ...
+        * @param string $key
+        * @param string $var
+        * @return void
         */
        public function ext_putValueInConf($key, $var) {
                $this->ext_incomingValues[$key] = $key . '=' . $var;
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $key: ...
-        * @return      [type]          ...
+        * @param string $key
+        * @return void
         */
        public function ext_removeValueInConf($key) {
 
index 11ef07a..da4152a 100644 (file)
@@ -24,14 +24,24 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
-class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService {
+class ExtendedTemplateService extends TemplateService {
 
-       // This string is used to indicate the point in a template from where the editable constants are listed. Any vars before this point (if it exists though) is regarded as default values.
+       /**
+        * This string is used to indicate the point in a template from where the editable constants are listed.
+        * Any vars before this point (if it exists though) is regarded as default values.
+        *
+        * @var string
+        */
        public $edit_divider = '###MOD_TS:EDITABLE_CONSTANTS###';
 
+       /**
+        * @var string
+        */
        public $HTMLcolorList = 'aqua,beige,black,blue,brown,fuchsia,gold,gray,green,lime,maroon,navy,olive,orange,purple,red,silver,tan,teal,turquoise,yellow,white';
 
-       // internal
+       /**
+        * @var array
+        */
        public $categories = array(
                'basic' => array(),
                // Constants of superior importance for the template-layout. This is dimensions, imagefiles and enabling of various features. The most basic constants, which you would almost always want to configure.
@@ -53,7 +63,11 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         */
        protected $categoryLabels = array();
 
-       // This will be filled with the available categories of the current template.
+       /**
+        * This will be filled with the available categories of the current template.
+        *
+        * @var array
+        */
        public $subCategories = array(
                // Standard categories:
                'enable' => array('Enable features', 'a'),
@@ -82,30 +96,68 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
                'chtml' => array('Content: \'HTML\'', 'mq')
        );
 
-       public $backend_info = 1;
+       /**
+        * @var bool
+        */
+       public $backend_info = TRUE;
 
-       // Tsconstanteditor
+       /**
+        * Tsconstanteditor
+        *
+        * @var int
+        */
        public $ext_inBrace = 0;
 
-       // Tsbrowser
+       /**
+        * Tsbrowser
+        *
+        * @var array
+        */
        public $tsbrowser_searchKeys = array();
 
+       /**
+        * @var array
+        */
        public $tsbrowser_depthKeys = array();
 
+       /**
+        * @var string
+        */
        public $constantMode = '';
 
+       /**
+        * @var string
+        */
        public $regexMode = '';
 
+       /**
+        * @var string
+        */
        public $fixedLgd = '';
 
+       /**
+        * @var int
+        */
        public $ext_lineNumberOffset = 0;
 
+       /**
+        * @var string
+        */
        public $ext_localGfxPrefix = '';
 
+       /**
+        * @var string
+        */
        public $ext_localWebGfxPrefix = '';
 
+       /**
+        * @var int
+        */
        public $ext_expandAllNotes = 0;
 
+       /**
+        * @var int
+        */
        public $ext_noPMicons = 0;
 
        /**
@@ -115,20 +167,43 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         */
        public $ext_noSpecialCharsOnLabels = 0;
 
+       /**
+        * @var array
+        */
        public $ext_listOfTemplatesArr = array();
 
+       /**
+        * @var string
+        */
        public $ext_lineNumberOffset_mode = '';
 
-       // Dont change...
+       /**
+        * Don't change
+        *
+        * @var int
+        */
        public $ext_dontCheckIssetValues = 0;
 
+       /**
+        * @var int
+        */
        public $ext_printAll = 0;
 
+       /**
+        * @var string
+        */
        public $ext_CEformName = 'forms[0]';
 
+       /**
+        * @var bool
+        */
        public $doNotSortCategoriesBeforeMakingForm = FALSE;
 
-       // Ts analyzer
+       /**
+        * Ts analyzer
+        *
+        * @var array
+        */
        public $templateTitles = array();
 
        /**
@@ -136,11 +211,11 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         */
        protected $lnToScript = NULL;
 
-       /*
-        * [Describe function...]
+       /**
+        * Substitute constant
         *
-        * @param       [type]          $all: ...
-        * @return      [type]          ...
+        * @param string $all
+        * @return string
         */
        public function substituteConstants($all) {
                $this->Cmarker = substr(md5(uniqid('', TRUE)), 0, 6);
@@ -172,10 +247,10 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
+        * Subsitute markers
         *
-        * @param       [type]          $all: ...
-        * @return      [type]          ...
+        * @param string $all
+        * @return string
         */
        public function substituteCMarkers($all) {
                switch ($this->constantMode) {
@@ -196,7 +271,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         * Parse constants with respect to the constant-editor in this module.
         * In particular comments in the code are registered and the edit_divider is taken into account.
         *
-        * @return      [type]          ...
+        * @return array
         */
        public function generateConfig_constants() {
                // These vars are also set lateron...
@@ -234,11 +309,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $theSetup: ...
-        * @param       [type]          $theKey: ...
-        * @return      [type]          ...
+        * @param array $theSetup
+        * @param string $theKey
+        * @return array
         */
        public function ext_getSetup($theSetup, $theKey) {
                $parts = explode('.', $theKey, 2);
@@ -258,15 +331,15 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
+        * Get object tree
         *
-        * @param       [type]          $arr: ...
-        * @param       [type]          $depth_in: ...
-        * @param       [type]          $depthData: ...
-        * @param       [type]          $parentType: ...
-        * @param       [type]          $parentValue: ...
-        * @param bool $alphaSort sorts the array keys / tree by alphabet when set to 1
-        * @return      [type]          ...
+        * @param array $arr
+        * @param string $depth_in
+        * @param string $depthData
+        * @param string $parentType
+        * @param string $parentValue
+        * @param string $alphaSort sorts the array keys / tree by alphabet when set to 1
+        * @return array
         */
        public function ext_getObjTree($arr, $depth_in, $depthData, $parentType = '', $parentValue = '', $alphaSort = '0') {
                $HTML = '';
@@ -426,10 +499,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $theValue: ...
-        * @return      [type]          ...
+        * @param array $theValue
+        * @return array
         * @deprecated since CMS 7.0, will be removed in CMS 8  - use htmlspecialchars() directly
         */
        public function makeHtmlspecialchars($theValue) {
@@ -438,13 +509,11 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $arr: ...
-        * @param       [type]          $depth_in: ...
-        * @param       [type]          $searchString: ...
-        * @param       [type]          $keyArray: ...
-        * @return      [type]          ...
+        * @param array $arr
+        * @param string $depth_in
+        * @param string $searchString
+        * @param array $keyArray
+        * @return array
         */
        public function ext_getSearchKeys($arr, $depth_in, $searchString, $keyArray) {
                $keyArr = array();
@@ -500,10 +569,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $pid: ...
-        * @return      [type]          ...
+        * @param int $pid
+        * @return string
         */
        public function ext_getRootlineNumber($pid) {
                if ($pid && is_array($GLOBALS['rootLine'])) {
@@ -516,13 +583,11 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $arr: ...
-        * @param       [type]          $depthData: ...
-        * @param       [type]          $keyArray: ...
-        * @param       [type]          $first: ...
-        * @return      [type]          ...
+        * @param array $arr
+        * @param string $depthData
+        * @param array $keyArray
+        * @param int $first
+        * @return array
         */
        public function ext_getTemplateHierarchyArr($arr, $depthData, $keyArray, $first = 0) {
                $keyArr = array();
@@ -588,7 +653,6 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         *
         * @param array $depthDataArr (empty array on external call)
         * @param int &$pointer Element number (1! to count()) of $this->hierarchyInfo that should be processed.
-        *
         * @return array Processed hierachyInfo.
         */
        public function ext_process_hierarchyInfo(array $depthDataArr, &$pointer) {
@@ -618,9 +682,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         * @param bool $crop Enable cropping of long lines.
         * @param bool $syntaxHL Enrich output with syntaxhighlighting.
         * @param int $syntaxHLBlockmode
-        *
         * @return string
-        *
         */
        public function ext_outputTS(
                array $config, $lineNumbers = FALSE, $comments = FALSE, $crop = FALSE, $syntaxHL = FALSE, $syntaxHLBlockmode = 0
@@ -644,9 +706,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         * If the string is longer, it will be truncated and prepended with '...'
         * $chars must be an integer of at least 4
         *
-        * @param       [type]          $string: ...
-        * @param       [type]          $chars: ...
-        * @return      [type]          ...
+        * @param string $string
+        * @param int $chars
+        * @return string
         */
        public function ext_fixed_lgd($string, $chars) {
                if ($chars >= 4) {
@@ -662,10 +724,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
         * @param int $lineNumber Line Number
-        * @param       [type]          $str: ...
+        * @param array $str
         * @return string
         */
        public function ext_lnBreakPointWrap($lineNumber, $str) {
@@ -673,13 +733,11 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $input: ...
-        * @param       [type]          $ln: ...
-        * @param       [type]          $comments: ...
-        * @param       [type]          $crop: ...
-        * @return      [type]          ...
+        * @param string $input
+        * @param bool $ln
+        * @param bool $comments
+        * @param bool $crop
+        * @return string
         */
        public function ext_formatTS($input, $ln, $comments = 1, $crop = 0) {
                $cArr = explode(LF, $input);
@@ -711,11 +769,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $id: ...
-        * @param       [type]          $template_uid: ...
-        * @return      [type]          ...
+        * @param int $id
+        * @param int $template_uid
+        * @return array
         */
        public function ext_getFirstTemplate($id, $template_uid = 0) {
                // Query is taken from the runThroughTemplates($theRootLine) function in the parent class.
@@ -733,10 +789,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $id: ...
-        * @return      [type]          ...
+        * @param int $id
+        * @return array
         */
        public function ext_getAllTemplates($id) {
                // Query is taken from the runThroughTemplates($theRootLine) function in the parent class.
@@ -759,8 +813,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         * This function compares the flattened constants (default and all).
         * Returns an array with the constants from the whole template which may be edited by the module.
         *
-        * @param       [type]          $default: ...
-        * @return      [type]          ...
+        * @param array $default
+        * @return array
         */
        public function ext_compareFlatSetups($default) {
                $editableComments = array();
@@ -835,10 +889,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $editConstArray: ...
-        * @return      [type]          ...
+        * @param array $editConstArray
+        * @return void
         */
        public function ext_categorizeEditableConstants($editConstArray) {
                // Runs through the available constants and fills the $this->categories array with pointers and priority-info
@@ -858,9 +910,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @return      [type]          ...
+        * @return array
         */
        public function ext_getCategoryLabelArray() {
                // Returns array used for labels in the menu.
@@ -874,10 +924,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $type: ...
-        * @return      [type]          ...
+        * @param string $type
+        * @return array
         */
        public function ext_getTypeData($type) {
                $retArr = array();
@@ -915,10 +963,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $category: ...
-        * @return      [type]          ...
+        * @param string $category
+        * @return void
         */
        public function ext_getTSCE_config($category) {
                $catConf = $this->setup['constants']['TSConstantEditor.'][$category . '.'];
@@ -930,9 +976,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
                                                $out['imagetag'] = $this->ext_getTSCE_config_image($catConf['image']);
                                                break;
                                        case 'description':
-
                                        case 'bulletlist':
-
                                        case 'header':
                                                $out[$key] = $val;
                                                break;
@@ -953,20 +997,17 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $key: ...
-        * @return      [type]          ...
+        * @param string $key
+        * @return string
         */
        public function ext_getKeyImage($key) {
                return '<img src="' . $this->ext_localWebGfxPrefix . 'gfx/' . $key . '.gif" align="top" hspace=2>';
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $imgConf: ...
-        * @return      [type]          ...
+
+        * @param string $imgConf
+        * @return string
         */
        public function ext_getTSCE_config_image($imgConf) {
                if (substr($imgConf, 0, 4) == 'gfx/') {
@@ -984,10 +1025,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $params: ...
-        * @return      [type]          ...
+        * @param array $params
+        * @return array
         */
        public function ext_fNandV($params) {
                $fN = 'data[' . $params['name'] . ']';
@@ -1003,9 +1042,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        /**
         * This functions returns the HTML-code that creates the editor-layout of the module.
         *
-        * @param       [type]          $theConstants: ...
-        * @param       [type]          $category: ...
-        * @return      [type]          ...
+        * @param array $theConstants
+        * @param string $category
+        * @return string
         */
        public function ext_printFields($theConstants, $category) {
                reset($theConstants);
@@ -1216,8 +1255,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
         *
         ***************************/
        /**
-        * @param       [type]          $constants: ...
-        * @return      [type]          ...
+        * @param string $constants
+        * @return void
         */
        public function ext_regObjectPositions($constants) {
                // This runs through the lines of the constants-field of the active template and registers the constants-names
@@ -1230,10 +1269,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $pre: ...
-        * @return      [type]          ...
+        * @param string $pre
+        * @return void
         */
        public function ext_regObjects($pre) {
                // Works with regObjectPositions. "expands" the names of the TypoScript objects
@@ -1275,11 +1312,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $key: ...
-        * @param       [type]          $var: ...
-        * @return      [type]          ...
+        * @param string $key
+        * @param string $var
+        * @return void
         */
        public function ext_putValueInConf($key, $var) {
                // Puts the value $var to the TypoScript value $key in the current lines of the templates.
@@ -1299,10 +1334,8 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $key: ...
-        * @return      [type]          ...
+        * @param string $key
+        * @return void
         */
        public function ext_removeValueInConf($key) {
                // Removes the value in the configuration
@@ -1314,11 +1347,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $arr: ...
-        * @param       [type]          $settings: ...
-        * @return      [type]          ...
+        * @param array $arr
+        * @param array $settings
+        * @return array
         */
        public function ext_depthKeys($arr, $settings) {
                $tsbrArray = array();
@@ -1345,13 +1376,13 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
+        * Proces input
         *
-        * @param       [type]          $http_post_vars: ...
-        * @param       array (not used anymore)
-        * @param       [type]          $theConstants: ...
-        * @param       [type]          $tplRow: ...
-        * @return      [type]          ...
+        * @param array $http_post_vars
+        * @param array $http_post_files (not used anymore)
+        * @param array $theConstants
+        * @param array $tplRow Not used
+        * @return void
         */
        public function ext_procesInput($http_post_vars, $http_post_files, $theConstants, $tplRow) {
                $data = $http_post_vars['data'];
@@ -1459,11 +1490,9 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * [Describe function...]
-        *
-        * @param       [type]          $id: ...
-        * @param       [type]          $perms_clause: ...
-        * @return      [type]          ...
+        * @param int $id
+        * @param string $perms_clause
+        * @return array
         */
        public function ext_prevPageWithTemplate($id, $perms_clause) {
                $rootLine = BackendUtility::BEgetRootLine($id, $perms_clause ? ' AND ' . $perms_clause : '');
index 4d3fbc1..f2fb400 100644 (file)
@@ -13,8 +13,9 @@ namespace TYPO3\CMS\Core\TypoScript\Parser;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use \TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
 
 /**
  * The TypoScript parser
@@ -23,130 +24,150 @@ use \TYPO3\CMS\Core\Utility\PathUtility;
  */
 class TypoScriptParser {
 
-       // If set, then key names cannot contain characters other than [:alnum:]_\.-
        /**
+        * If set, then key names cannot contain characters other than [:alnum:]_\.-
+        *
         * @var bool
         */
        public $strict = 1;
 
-       // Internal
-       // TypoScript hierarchy being build during parsing.
        /**
+        * TypoScript hierarchy being build during parsing.
+        *
         * @var array
         */
        public $setup = array();
 
-       // Raw data, the input string exploded by LF
        /**
+        * Raw data, the input string exploded by LF
+        *
         * @var array
         */
        public $raw;
 
-       // Pointer to entry in raw data array
        /**
+        * Pointer to entry in raw data array
+        *
         * @var int
         */
        public $rawP;
 
-       // Holding the value of the last comment
        /**
+        * Holding the value of the last comment
+        *
         * @var string
         */
        public $lastComment = '';
 
-       // Internally set, used as internal flag to create a multi-line comment (one of those like /*... */)
        /**
+        * Internally set, used as internal flag to create a multi-line comment (one of those like /* ... * /
+        *
         * @var bool
         */
        public $commentSet = 0;
 
-       // Internally set, when multiline value is accumulated
        /**
+        * Internally set, when multiline value is accumulated
+        *
         * @var bool
         */
        public $multiLineEnabled = 0;
 
-       // Internally set, when multiline value is accumulated
        /**
+        * Internally set, when multiline value is accumulated
+        *
         * @var string
         */
        public $multiLineObject = '';
 
-       // Internally set, when multiline value is accumulated
        /**
+        * Internally set, when multiline value is accumulated
+        *
         * @var array
         */
        public $multiLineValue = array();
 
-       // Internally set, when in brace. Counter.
        /**
+        * Internally set, when in brace. Counter.
+        *
         * @var int
         */
        public $inBrace = 0;
 
-       // For each condition this flag is set, if the condition is TRUE, else it's cleared. Then it's used by the [ELSE] condition to determine if the next part should be parsed.
        /**
+        * For each condition this flag is set, if the condition is TRUE,
+        * else it's cleared. Then it's used by the [ELSE] condition to determine if the next part should be parsed.
+        *
         * @var bool
         */
        public $lastConditionTrue = 1;
 
-       // Tracking all conditions found
        /**
+        * Tracking all conditions found
+        *
         * @var array
         */
        public $sections = array();
 
-       // Tracking all matching conditions found
        /**
+        * Tracking all matching conditions found
+        *
         * @var array
         */
        public $sectionsMatch = array();
 
-       // If set, then syntax highlight mode is on; Call the function syntaxHighlight() to use this function
        /**
+        * If set, then syntax highlight mode is on; Call the function syntaxHighlight() to use this function
+        *
         * @var bool
         */
        public $syntaxHighLight = 0;
 
-       // Syntax highlight data is accumulated in this array. Used by syntaxHighlight_print() to construct the output.
        /**
+        * Syntax highlight data is accumulated in this array. Used by syntaxHighlight_print() to construct the output.
+        *
         * @var array
         */
        public $highLightData = array();
 
-       // Syntax highlight data keeping track of the curly brace level for each line
        /**
+        * Syntax highlight data keeping track of the curly brace level for each line
+        *
         * @var array
         */
        public $highLightData_bracelevel = array();
 
-       // Debugging, analysis:
-       // DO NOT register the comments. This is default for the ordinary sitetemplate!
        /**
+        * DO NOT register the comments. This is default for the ordinary sitetemplate!
+        *
         * @var bool
         */
        public $regComments = 0;
 
-       // DO NOT register the linenumbers. This is default for the ordinary sitetemplate!
        /**
+        * DO NOT register the linenumbers. This is default for the ordinary sitetemplate!
+        *
         * @var bool
         */
        public $regLinenumbers = 0;
 
-       // Error accumulation array.
        /**
+        * Error accumulation array.
+        *
         * @var array
         */
        public $errors = array();
 
-       // Used for the error messages line number reporting. Set externally.
        /**
+        * Used for the error messages line number reporting. Set externally.
+        *
         * @var string
         */
        public $lineNumberOffset = 0;
 
-       // Line for break point.
        /**
+        * Line for break point.
+        *
         * @var int
         */
        public $breakPointLN = 0;
@@ -184,14 +205,16 @@ class TypoScriptParser {
                'linenum' => array('<span class="ts-linenum">', '</span>')
        );
 
-       // Additional attributes for the <span> tags for a blockmode line
        /**
+        * Additional attributes for the <span> tags for a blockmode line
+        *
         * @var string
         */
        public $highLightBlockStyles = '';
 
-       // The hex-HTML color for the blockmode
        /**
+        * The hex-HTML color for the blockmode
+        *
         * @var string
         */
        public $highLightBlockStyles_basecolor = '#cccccc';
index d6d033b..b83d2dc 100644 (file)
@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class TemplateService {
 
-       // Debugging, analysis:
        /**
         * option to enable logging, time-tracking (FE-only)
         * usually, this is only done when
@@ -36,99 +35,210 @@ class TemplateService {
         */
        protected $verbose = FALSE;
 
-       // If set, the global tt-timeobject is used to log the performance.
-       public $tt_track = 1;
+       /**
+        * If set, the global tt-timeobject is used to log the performance.
+        *
+        * @var bool
+        */
+       public $tt_track = TRUE;
 
-       // If set, the template is always rendered. Used from Admin Panel.
-       public $forceTemplateParsing = 0;
+       /**
+        * If set, the template is always rendered. Used from Admin Panel.
+        *
+        * @var bool
+        */
+       public $forceTemplateParsing = FALSE;
 
-       // Backend Analysis modules settings:
-       // This array is passed on to matchObj by generateConfig(). If it holds elements, they are used for matching instead. See commment at the match-class. Used for backend modules only. Never frontend!
+       /**
+        * This array is passed on to matchObj by generateConfig().
+        * If it holds elements, they are used for matching instead. See commment at the match-class.
+        * Used for backend modules only. Never frontend!
+        *
+        * @var array
+        */
        public $matchAlternative = array();
 
-       // If set, the match-class matches everything! Used for backend modules only. Never frontend!
-       public $matchAll = 0;
+       /**
+        * If set, the match-class matches everything! Used for backend modules only. Never frontend!
+        *
+        * @var bool
+        */
+       public $matchAll = FALSE;
 
-       public $backend_info = 0;
+       /**
+        * @var bool
+        */
+       public $backend_info = FALSE;
 
-       // Externally set breakpoints (used by Backend Modules)
+       /**
+        * Externally set breakpoints (used by Backend Modules)
+        *
+        * @var int
+        */
        public $ext_constants_BRP = 0;
 
+       /**
+        * @var int
+        */
        public $ext_config_BRP = 0;
 
+       /**
+        * @var bool
+        */
        public $ext_regLinenumbers = FALSE;
 
+       /**
+        * @var bool
+        */
        public $ext_regComments = FALSE;
 
-       // Constants:
+       /**
+        * @var string
+        */
        public $tempPath = 'typo3temp/';
 
-       // Set Internally:
-       // This MUST be initialized by the init() function
+       /**
+        * This MUST be initialized by the init() function
+        *
+        * @var string
+        */
        public $whereClause = '';
 
-       public $debug = 0;
+       /**
+        * @var bool
+        */
+       public $debug = FALSE;
 
-       // This is the only paths (relative!!) that are allowed for resources in TypoScript. Should all be appended with '/'. You can extend these by the global array TYPO3_CONF_VARS. See init() function.
+       /**
+        * This is the only paths (relative!!) that are allowed for resources in TypoScript.
+        * Should all be appended with '/'. You can extend these by the global array TYPO3_CONF_VARS. See init() function.
+        *
+        * @var array
+        */
        public $allowedPaths = array();
 
-       // See init(); Set if preview of some kind is enabled.
+       /**
+        * See init(); Set if preview of some kind is enabled.
+        *
+        * @var int
+        */
        public $simulationHiddenOrTime = 0;
 
-       // Set, if the TypoScript template structure is loaded and OK, see ->start()
-       public $loaded = 0;
+       /**
+        * Set, if the TypoScript template structure is loaded and OK, see ->start()
+        *
+        * @var bool
+        */
+       public $loaded = FALSE;
 
        /**
         * @var array Contains TypoScript setup part after parsing
         */
        public $setup = array();
 
+       /**
+        * @var array
+        */
        public $flatSetup = array();
 
-       // For fetching TypoScript code from template hierarchy before parsing it. Each array contains code field values from template records/files:
-       // Setup field
+       /**
+        * For fetching TypoScript code from template hierarchy before parsing it.
+        * Each array contains code field values from template records/files:
+        * Setup field
+        *
+        * @var array
+        */
        public $config = array();
 
-       // Constant field
+       /**
+        * Constant field
+        *
+        * @var array
+        */
        public $constants = array();
 
        /**
         * Holds the include paths of the templates (empty if from database)
+        *
         * @var array
         */
        protected $templateIncludePaths = array();
 
-       // For Template Analyser in backend
+       /**
+        * For Template Analyser in backend
+        *
+        * @var array
+        */
        public $hierarchyInfo = array();
 
-       // For Template Analyser in backend (setup content only)
+       /**
+        * For Template Analyser in backend (setup content only)
+        *
+        * @var array
+        */
        public $hierarchyInfoToRoot = array();
 
-       // Next-level flag (see runThroughTemplates())
+       /**
+        * Next-level flag (see runThroughTemplates())
+        *
+        * @var int
+        */
        public $nextLevel = 0;
 
-       // The Page UID of the root page
+       /**
+        * The Page UID of the root page
+        *
+        * @var int
+        */
        public $rootId;
 
-       // The rootline from current page to the root page
+       /**
+        * The rootline from current page to the root page
+        *
+        * @var array
+        */
        public $rootLine;
 
-       // Rootline all the way to the root. Set but runThroughTemplates
+       /**
+        * Rootline all the way to the root. Set but runThroughTemplates
+        *
+        * @var array
+        */
        public $absoluteRootLine;
 
-       // A pointer to the last entry in the rootline where a template was found.
+       /**
+        * A pointer to the last entry in the rootline where a template was found.
+        *
+        * @var int
+        */
        public $outermostRootlineIndexWithTemplate = 0;
 
-       // Array of arrays with title/uid of templates in hierarchy
+       /**
+        * Array of arrays with title/uid of templates in hierarchy
+        *
+        * @var array
+        */
        public $rowSum;
 
-       // The current site title field.
+       /**
+        * The current site title field.
+        *
+        * @var string
+        */
        public $sitetitle = '';
 
-       // Tracking all conditions found during parsing of TypoScript. Used for the "all" key in currentPageData
+       /**
+        * Tracking all conditions found during parsing of TypoScript. Used for the "all" key in currentPageData
+        *
+        * @var string
+        */
        public $sections;
 
-       // Tracking all matching conditions found
+       /**
+        * Tracking all matching conditions found
+        *
+        * @var array
+        */
        public $sectionsMatch;
 
        /**
@@ -140,21 +250,39 @@ class TemplateService {
        /**
         * Used by Backend only (Typoscript Template Analyzer)
         *
+        * @var array
         */
        public $clearList_setup = array();
 
+       /**
+        * @var array
+        */
        public $parserErrors = array();
 
+       /**
+        * @var array
+        */
        public $setup_constants = array();
 
-       // Other:
-       // Used by getFileName for caching of references to file resources
+       /**
+        * Used by getFileName for caching of references to file resources
+        *
+        * @var array
+        */
        public $fileCache = array();
 
-       // Keys are frame names and values are type-values, which must be used to refer correctly to the content of the frames.
+       /**
+        * Keys are frame names and values are type-values, which must be used to refer correctly to the content of the frames.
+        *
+        * @var array
+        */
        public $frames = array();
 
-       // Contains mapping of Page id numbers to MP variables.
+       /**
+        * Contains mapping of Page id numbers to MP variables.
+        *
+        * @var string
+        */
        public $MPmap = '';
 
        /**
@@ -405,7 +533,7 @@ class TemplateService {
                        }
                        // If everything OK.
                        if ($this->rootId && $this->rootLine && $this->setup) {
-                               $this->loaded = 1;
+                               $this->loaded = TRUE;
                        }
                }
        }
index f38774a..6766cce 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class with helper functions for array handling
  *
index e7d0a56..ddb18b9 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Several functions related to naming and conversions of names
  * such as translation between Repository and Model names or
index fbe98fb..8da6d39 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class to handle and determine browser specific information.
  *
index c1c07a7..20f0fa8 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class to handle system commands.
  * finds executables (programs) on Unix and Windows without knowing where they are
index a578b58..64342e0 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class to handle debug
  *
index 893f22d..805f7be 100644 (file)
@@ -21,22 +21,23 @@ namespace TYPO3\CMS\Core\Utility;
  */
 class DiffUtility {
 
-       // External, static
-       // If set, the HTML tags are stripped from the input strings first.
        /**
+        * If set, the HTML tags are stripped from the input strings first.
+        *
         * @var bool
         */
        public $stripTags = 0;
 
-       // Diff options. eg "--unified=3"
        /**
+        * Diff options. eg "--unified=3"
+        *
         * @var string
         */
        public $diffOptions = '';
 
-       // Internal, dynamic
-       // This indicates the number of times the function addClearBuffer has been called - and used to detect the very first call...
        /**
+        * This indicates the number of times the function addClearBuffer has been called - and used to detect the very first call...
+        *
         * @var int
         */
        public $clearBufferIdx = 0;
index b07cc3d..9f51d86 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Category\CategoryRegistry;
 use TYPO3\CMS\Core\Package\PackageManager;
 
@@ -26,6 +27,9 @@ use TYPO3\CMS\Core\Package\PackageManager;
  */
 class ExtensionManagementUtility {
 
+       /**
+        * @var array
+        */
        static protected $extensionKeyMap;
 
        /**
index 76b81a9..816bcfa 100644 (file)
@@ -32,6 +32,7 @@ use TYPO3\CMS\Core\Utility\PathUtility;
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class BasicFileUtility {
+
        /**
         * @var string
         */
@@ -42,51 +43,58 @@ class BasicFileUtility {
         */
        public $getUniqueNamePrefix = '';
 
-       // Prefix which will be prepended the file when using the getUniqueName-function
        /**
+        * Prefix which will be prepended the file when using the getUniqueName-function
+        *
         * @var int
         */
        public $maxNumber = 99;
 
-       // This number decides the highest allowed appended number used on a filename before we use naming with unique strings
        /**
+        * This number decides the highest allowed appended number used on a filename before we use naming with unique strings
+        *
         * @var int
         */
        public $uniquePrecision = 6;
 
-       // This number decides how many characters out of a unique MD5-hash that is appended to a filename if getUniqueName is asked to find an available filename.
        /**
+        * This number decides how many characters out of a unique MD5-hash that is appended to a filename if getUniqueName is asked to find an available filename.
+        *
         * @var int
         */
        public $maxInputNameLen = 60;
 
-       // This is the maximum length of names treated by cleanFileName()
        /**
+        * This is the maximum length of names treated by cleanFileName()
+        *
         * @var string
         */
        public $tempFN = '_temp_';
 
-       // Temp-foldername. A folder in the root of one of the mounts with this name is regarded a TEMP-folder (used for upload from clipboard)
-       // internal
        /**
+        * Temp-foldername. A folder in the root of one of the mounts with this name is regarded a TEMP-folder (used for upload from clipboard)
+        *
         * @var array
         */
        public $f_ext = array();
 
-       // See comment in header
        /**
+        * See comment in header
+        *
         * @var array
         */
        public $mounts = array();
 
-       // See comment in header
        /**
+        * See comment in header
+        *
         * @var string
         */
        public $webPath = '';
 
-       // Set to DOCUMENT_ROOT.
        /**
+        * Set to DOCUMENT_ROOT.
+        *
         * @var bool
         */
        public $isInit = 0;
@@ -96,7 +104,6 @@ class BasicFileUtility {
         */
        public $csConvObj;
 
-       // Set to TRUE after init()/start();
        /**********************************
         *
         * Checking functions
index b3f5dd7..704451d 100644 (file)
@@ -55,16 +55,18 @@ use TYPO3\CMS\Core\Utility\PathUtility;
  */
 class ExtendedFileUtility extends BasicFileUtility {
 
-       // External static variables:
-       // Notice; some of these are overridden in the start() method with values from $GLOBALS['TYPO3_CONF_VARS']['BE']
-       // Path to unzip-program (with trailing '/')
        /**
+        * External static variables:
+        * Notice; some of these are overridden in the start() method with values from $GLOBALS['TYPO3_CONF_VARS']['BE']
+        * Path to unzip-program (with trailing '/')
+        *
         * @var string
         */
        public $unzipPath = '';
 
-       // If set, the uploaded files will overwrite existing files.
        /**
+        * If set, the uploaded files will overwrite existing files.
+        *
         * @var bool
         */
        public $dontCheckForUnique = 0;
@@ -97,15 +99,16 @@ class ExtendedFileUtility extends BasicFileUtility {
                'recursivedeleteFolder' => FALSE
        );
 
-       // This is regarded to be the recycler folder
        /**
+        * This is regarded to be the recycler folder
+        *
         * @var string
         */
        public $recyclerFN = '_recycler_';
 
-       // Internal, dynamic
-       // Will contain map between upload ID and the final filename
        /**
+        * Will contain map between upload ID and the final filename
+        *
         * @var array
         */
        public $internalUploadMap = array();
@@ -134,7 +137,6 @@ class ExtendedFileUtility extends BasicFileUtility {
         */
        protected $fileFactory;
 
-
        /**
         * Initialization of the class
         *
index 698b5f6..f4fb398 100644 (file)
@@ -13,12 +13,14 @@ namespace TYPO3\CMS\Core\Utility\File;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Interface for classes which hook into extFileFunctions and do additional processData processing.
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
  */
 interface ExtendedFileUtilityProcessDataHookInterface {
+
        /**
         * Post-process a file action.
         *
index 6fd96e2..c6c62ac 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Core\Core\ApplicationContext;
 use TYPO3\CMS\Core\Core\ClassLoader;
 use TYPO3\CMS\Core\SingletonInterface;
index 90afb63..898e4af 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * HTTP Utility class
  *
@@ -64,6 +65,7 @@ class HttpUtility {
        // URL Schemes
        const SCHEME_HTTP = 1;
        const SCHEME_HTTPS = 2;
+
        /**
         * Sends a redirect header response and exits. Additionally the URL is
         * checked and if needed corrected to match the format required for a
index 077efc0..59c9da5 100644 (file)
@@ -158,8 +158,8 @@ class MailUtility {
        static public function parseAddresses($rawAddresses) {
                /** @var $addressParser \TYPO3\CMS\Core\Mail\Rfc822AddressesParser */
                $addressParser = GeneralUtility::makeInstance(
-                               'TYPO3\\CMS\\Core\\Mail\\Rfc822AddressesParser',
-                               $rawAddresses
+                       'TYPO3\\CMS\\Core\\Mail\\Rfc822AddressesParser',
+                       $rawAddresses
                );
                $addresses = $addressParser->parseAddressList();
                $addressList = array();
index 2170da5..1fb9102 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class with helper functions for mathematical calculations
  *
index 3521eac..cac9ed7 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class to handle monitoring actions.
  *
index 3aa6686..14953df 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class with helper functions for file paths.
  *
index 6284801..ad843c6 100644 (file)
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Core\Utility;
  * Utility class for the File Abstraction Layer (aka subpackage Resource in EXT:core)
  */
 class ResourceUtility {
+
        /**
         * This is a helper method that can be used with u?sort methods to sort a list of (relative) file paths, e.g.
         * array("someDir/fileA", "fileA", "fileB", "anotherDir/fileA").
@@ -29,7 +30,7 @@ class ResourceUtility {
         * @param string $elementB
         * @return int
         */
-       public static function recursiveFileListSortingHelper($elementA, $elementB) {
+       static public function recursiveFileListSortingHelper($elementA, $elementB) {
                if (strpos($elementA, '/') === FALSE) {
                        // first element is a file
                        if (strpos($elementB, '/') === FALSE) {
index 448d75a..24e6084 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Frontend\Page\PageRepository;
 
 /**
index 297a742..76a2eb6 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class with helper functions for string handling
  *
index c468912..c8c09fe 100644 (file)
@@ -13,6 +13,7 @@ namespace TYPO3\CMS\Core\Utility;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 /**
  * Class with helper functions for version number handling
  *
index c49b62b..e2d8c83 100644 (file)
@@ -16,8 +16,6 @@ namespace TYPO3\CMS\Core\Versioning;
 
 /**
  * Enumeration object for VersionState
- *
- * @package TYPO3\CMS\Core\Versioning
  */
 class VersionState extends \TYPO3\CMS\Core\Type\Enumeration {