[TASK] Use name-resolution instead of strings where possible: 2 55/34855/2
authorStefan Neufeind <typo3.neufeind@speedpartner.de>
Mon, 1 Dec 2014 12:45:55 +0000 (13:45 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Mon, 1 Dec 2014 23:59:57 +0000 (00:59 +0100)
(part for EXT:core)

Use name-resolution with ...::class instead of strings where
possible.
(needs PHP 5.5, which is meanwhile required for master)

Change-set Iedbb896607adddce2b23ab67f990fa2296c0d1bb
first introduced usage of ::class in master. We now add it
in various more places.

Change-Id: I9f75521db330b1c3282c221a7ae2257fbf3557f7
Resolves: #63477
Releases: master
Reviewed-on: http://review.typo3.org/34855
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
117 files changed:
typo3/sysext/core/Build/UnitTestsBootstrap.php
typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
typo3/sysext/core/Classes/Cache/Cache.php
typo3/sysext/core/Classes/Cache/CacheManager.php
typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/core/Classes/DataHandling/DataHandler.php
typo3/sysext/core/Classes/Database/DatabaseConnection.php
typo3/sysext/core/Classes/Error/ErrorHandler.php
typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
typo3/sysext/core/Classes/Package/PackageFactory.php
typo3/sysext/core/Classes/Resource/Collection/FileCollectionRegistry.php
typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
typo3/sysext/core/Classes/Resource/FileRepository.php
typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
typo3/sysext/core/Classes/Resource/ResourceFactory.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
typo3/sysext/core/Classes/Resource/StorageRepository.php
typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Classes/Utility/PathUtility.php
typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/core/Configuration/FactoryConfiguration.php
typo3/sysext/core/Configuration/TCA/pages.php
typo3/sysext/core/Migrations/Code/ClassAliasMap.php
typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/PackageFactory.php
typo3/sysext/core/Tests/BaseTestCase.php
typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/AdditionalConfiguration.php
typo3/sysext/core/Tests/Integrity/IntegrityTest.php
typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/XcacheBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php
typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
typo3/sysext/core/Tests/Unit/Core/BootstrapTest.php
typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
typo3/sysext/core/Tests/Unit/Log/Processor/AbstractMemoryTest.php
typo3/sysext/core/Tests/Unit/Log/Writer/AbstractWriterTest.php
typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
typo3/sysext/core/Tests/Unit/Package/PackageTest.php
typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
typo3/sysext/core/Tests/Unit/RegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
typo3/sysext/core/Tests/Unit/Resource/Collection/FileCollectionRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
typo3/sysext/core/Tests/Unit/Resource/FileTest.php
typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
typo3/sysext/core/Tests/Unit/Resource/ProcessedFileRepositoryTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
typo3/sysext/core/Tests/Unit/Resource/Service/FrontendContentAdapterServiceTest.php
typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php
typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
typo3/sysext/core/Tests/Unit/Utility/ClassNamingUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
typo3/sysext/core/Tests/UnitTestCase.php
typo3/sysext/core/ext_localconf.php

index 51f21de..8ace966 100644 (file)
@@ -97,7 +97,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] = '.*';
        ->disableCoreAndClassesCache()
        ->initializeCachingFramework()
        ->initializeClassLoaderCaches()
-       ->initializePackageManagement('TYPO3\\CMS\\Core\\Package\\UnitTestPackageManager');
+       ->initializePackageManagement(\TYPO3\CMS\Core\Package\UnitTestPackageManager::class);
 
 /**
  * Creates directory (recursively if required).
index e3d9106..0d3f649 100644 (file)
@@ -384,7 +384,7 @@ abstract class AbstractUserAuthentication {
                        $this->writeDevLog = TRUE;
                }
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('## Beginning of auth logging.', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('## Beginning of auth logging.', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                // Init vars.
                $mode = '';
@@ -495,7 +495,7 @@ abstract class AbstractUserAuthentication {
                        }
                        if ($this->writeDevLog) {
                                $devLogMessage = ($isRefreshTimeBasedCookie ? 'Updated Cookie: ' : 'Set Cookie: ') . $this->id;
-                               GeneralUtility::devLog($devLogMessage . ($cookieDomain ? ', ' . $cookieDomain : ''), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog($devLogMessage . ($cookieDomain ? ', ' . $cookieDomain : ''), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                }
        }
@@ -599,14 +599,14 @@ abstract class AbstractUserAuthentication {
                // Indicates if an active authentication failed (not auto login)
                $this->loginFailure = FALSE;
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('Login type: ' . $this->loginType, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('Login type: ' . $this->loginType, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                // The info array provide additional information for auth services
                $authInfo = $this->getAuthInfoArray();
                // Get Login/Logout data submitted by a form or params
                $loginData = $this->getLoginFormData();
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('Login data: ' . GeneralUtility::arrayToLogString($loginData), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('Login data: ' . GeneralUtility::arrayToLogString($loginData), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                // Active logout (eg. with "logout" button)
                if ($loginData['status'] == 'logout') {
@@ -616,7 +616,7 @@ abstract class AbstractUserAuthentication {
                        }
                        // Logout written to log
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('User logged out. Id: ' . $this->id, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', -1);
+                               GeneralUtility::devLog('User logged out. Id: ' . $this->id, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, -1);
                        }
                        $this->logoff();
                }
@@ -624,7 +624,7 @@ abstract class AbstractUserAuthentication {
                if ($loginData['status'] == 'login') {
                        $activeLogin = TRUE;
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('Active login (eg. with login form)', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('Active login (eg. with login form)', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                        // check referer for submitted login values
                        if ($this->formfield_status && $loginData['uident'] && $loginData['uname']) {
@@ -656,12 +656,12 @@ abstract class AbstractUserAuthentication {
                }
                if ($this->writeDevLog) {
                        if ($haveSession) {
-                               GeneralUtility::devLog('User session found: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], array($this->userid_column, $this->username_column)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 0);
+                               GeneralUtility::devLog('User session found: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], array($this->userid_column, $this->username_column)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 0);
                        } else {
-                               GeneralUtility::devLog('No user session found.', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 2);
+                               GeneralUtility::devLog('No user session found.', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
                        }
                        if (is_array($this->svConfig['setup'])) {
-                               GeneralUtility::devLog('SV setup: ' . GeneralUtility::arrayToLogString($this->svConfig['setup']), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 0);
+                               GeneralUtility::devLog('SV setup: ' . GeneralUtility::arrayToLogString($this->svConfig['setup']), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 0);
                        }
                }
                // Fetch user if ...
@@ -679,7 +679,7 @@ abstract class AbstractUserAuthentication {
                                if ($row = $serviceObj->getUser()) {
                                        $tempuserArr[] = $row;
                                        if ($this->writeDevLog) {
-                                               GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($row, array($this->userid_column, $this->username_column)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 0);
+                                               GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($row, array($this->userid_column, $this->username_column)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 0);
                                        }
                                        // User found, just stop to search for more if not configured to go on
                                        if (!$this->svConfig['setup'][($this->loginType . '_fetchAllUsers')]) {
@@ -690,16 +690,16 @@ abstract class AbstractUserAuthentication {
                        }
                        unset($serviceObj);
                        if ($this->writeDevLog && $this->svConfig['setup'][$this->loginType . '_alwaysFetchUser']) {
-                               GeneralUtility::devLog($this->loginType . '_alwaysFetchUser option is enabled', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog($this->loginType . '_alwaysFetchUser option is enabled', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                        if ($this->writeDevLog && $serviceChain) {
-                               GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                        if ($this->writeDevLog && !count($tempuserArr)) {
-                               GeneralUtility::devLog('No user found by services', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('No user found by services', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                        if ($this->writeDevLog && count($tempuserArr)) {
-                               GeneralUtility::devLog(count($tempuserArr) . ' user records found by services', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog(count($tempuserArr) . ' user records found by services', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                }
                // If no new user was set we use the already found user session
@@ -709,14 +709,14 @@ abstract class AbstractUserAuthentication {
                        // User is authenticated because we found a user session
                        $authenticated = TRUE;
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('User session used: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], array($this->userid_column, $this->username_column)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('User session used: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], array($this->userid_column, $this->username_column)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                }
                // Re-auth user when 'auth'-service option is set
                if ($this->svConfig['setup'][$this->loginType . '_alwaysAuthUser']) {
                        $authenticated = FALSE;
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('alwaysAuthUser option is enabled', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('alwaysAuthUser option is enabled', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                }
                // Authenticate the user if needed
@@ -726,7 +726,7 @@ abstract class AbstractUserAuthentication {
                                // If one service returns FALSE then authentication failed
                                // a service might return 100 which means there's no reason to stop but the user can't be authenticated by that service
                                if ($this->writeDevLog) {
-                                       GeneralUtility::devLog('Auth user: ' . GeneralUtility::arrayToLogString($tempuser), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                                       GeneralUtility::devLog('Auth user: ' . GeneralUtility::arrayToLogString($tempuser), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                                }
                                $serviceChain = '';
                                $subType = 'authUser' . $this->loginType;
@@ -751,7 +751,7 @@ abstract class AbstractUserAuthentication {
                                }
                                unset($serviceObj);
                                if ($this->writeDevLog && $serviceChain) {
-                                       GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                                       GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                                }
                                if ($authenticated) {
                                        // Leave foreach() because a user is authenticated
@@ -775,7 +775,7 @@ abstract class AbstractUserAuthentication {
                                // The login session is started.
                                $this->loginSessionStarted = TRUE;
                                if ($this->writeDevLog && is_array($this->user)) {
-                                       GeneralUtility::devLog('User session finally read: ' . GeneralUtility::arrayToLogString($this->user, array($this->userid_column, $this->username_column)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', -1);
+                                       GeneralUtility::devLog('User session finally read: ' . GeneralUtility::arrayToLogString($this->user, array($this->userid_column, $this->username_column)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, -1);
                                }
                        } elseif ($haveSession) {
                                $this->user = $authInfo['userSession'];
@@ -785,10 +785,10 @@ abstract class AbstractUserAuthentication {
                                $this->writelog(255, 1, 0, 1, 'User %s logged in from %s (%s)', array($tempuser[$this->username_column], GeneralUtility::getIndpEnv('REMOTE_ADDR'), GeneralUtility::getIndpEnv('REMOTE_HOST')), '', '', '', -1, '', $tempuser['uid']);
                        }
                        if ($this->writeDevLog && $activeLogin) {
-                               GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' logged in from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', -1);
+                               GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' logged in from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, -1);
                        }
                        if ($this->writeDevLog && !$activeLogin) {
-                               GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' authenticated from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', -1);
+                               GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' authenticated from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, -1);
                        }
                        if ((int)$GLOBALS['TYPO3_CONF_VARS']['BE']['lockSSL'] === 3 && $this->user_table === 'be_users') {
                                $requestStr = substr(GeneralUtility::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir));
@@ -807,16 +807,16 @@ abstract class AbstractUserAuthentication {
                } elseif ($activeLogin || count($tempuserArr)) {
                        $this->loginFailure = TRUE;
                        if ($this->writeDevLog && !count($tempuserArr) && $activeLogin) {
-                               GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($loginData), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 2);
+                               GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($loginData), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
                        }
                        if ($this->writeDevLog && count($tempuserArr)) {
-                               GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($tempuser, array($this->userid_column, $this->username_column)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 2);
+                               GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($tempuser, array($this->userid_column, $this->username_column)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
                        }
                }
                // If there were a login failure, check to see if a warning email should be sent:
                if ($this->loginFailure && $activeLogin) {
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('Call checkLogFailures: ' . GeneralUtility::arrayToLogString(array('warningEmail' => $this->warningEmail, 'warningPeriod' => $this->warningPeriod, 'warningMax' => $this->warningMax)), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', -1);
+                               GeneralUtility::devLog('Call checkLogFailures: ' . GeneralUtility::arrayToLogString(array('warningEmail' => $this->warningEmail, 'warningPeriod' => $this->warningPeriod, 'warningMax' => $this->warningMax)), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, -1);
                        }
                        $this->checkLogFailures($this->warningEmail, $this->warningPeriod, $this->warningMax);
                }
@@ -845,7 +845,7 @@ abstract class AbstractUserAuthentication {
         */
        public function createUserSession($tempuser) {
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('Create session ses_id = ' . $this->id, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('Create session ses_id = ' . $this->id, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                // Delete session entry first
                $this->db->exec_DELETEquery(
@@ -860,7 +860,7 @@ abstract class AbstractUserAuthentication {
                        $message = 'Session data could not be written to DB. Error: ' . $this->db->sql_error();
                        GeneralUtility::sysLog($message, 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog($message, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 2);
+                               GeneralUtility::devLog($message, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
                        }
                }
                // Updating lastLogin_column carrying information about last login.
@@ -902,7 +902,7 @@ abstract class AbstractUserAuthentication {
        public function fetchUserSession($skipSessionUpdate = FALSE) {
                $user = FALSE;
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('Fetch session ses_id = ' . $this->id, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('Fetch session ses_id = ' . $this->id, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
 
                // Fetch the user session from the DB
@@ -949,7 +949,7 @@ abstract class AbstractUserAuthentication {
         */
        public function logoff() {
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('logoff: ses_id = ' . $this->id, 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('logoff: ses_id = ' . $this->id, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                // Release the locked records
                \TYPO3\CMS\Backend\Utility\BackendUtility::lockRecords();
@@ -1190,7 +1190,7 @@ abstract class AbstractUserAuthentication {
                                $variable = $this->uc;
                        }
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('writeUC: ' . $this->userid_column . '=' . (int)$this->user[$this->userid_column], 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('writeUC: ' . $this->userid_column . '=' . (int)$this->user[$this->userid_column], \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                        $this->db->exec_UPDATEquery($this->user_table, $this->userid_column . '=' . (int)$this->user[$this->userid_column], array('uc' => serialize($variable)));
                }
@@ -1269,7 +1269,7 @@ abstract class AbstractUserAuthentication {
                $sesDat[$key] = $data;
                $this->user['ses_data'] = serialize($sesDat);
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('setAndSaveSessionData: ses_id = ' . $this->user['ses_id'], 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('setAndSaveSessionData: ses_id = ' . $this->user['ses_id'], \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                $this->db->exec_UPDATEquery($this->session_table, 'ses_id=' . $this->db->fullQuoteStr($this->user['ses_id'], $this->session_table), array('ses_data' => $this->user['ses_data']));
        }
@@ -1320,7 +1320,7 @@ abstract class AbstractUserAuthentication {
                        : 'normal';
                $passwordTransmissionStrategy = $passwordTransmissionStrategy ?: $loginSecurityLevel;
                if ($this->writeDevLog) {
-                       GeneralUtility::devLog('Login data before processing: ' . GeneralUtility::arrayToLogString($loginData), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                       GeneralUtility::devLog('Login data before processing: ' . GeneralUtility::arrayToLogString($loginData), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                }
                $serviceChain = '';
                $subType = 'processLoginData' . $this->loginType;
@@ -1344,7 +1344,7 @@ abstract class AbstractUserAuthentication {
                if ($isLoginDataProcessed) {
                        $loginData = $processedLoginData;
                        if ($this->writeDevLog) {
-                               GeneralUtility::devLog('Processed login data: ' . GeneralUtility::arrayToLogString($processedLoginData), 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication');
+                               GeneralUtility::devLog('Processed login data: ' . GeneralUtility::arrayToLogString($processedLoginData), \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
                        }
                }
                return $loginData;
@@ -1402,7 +1402,7 @@ abstract class AbstractUserAuthentication {
                                        session_start();
                                        if ($_SESSION['login_challenge'] !== $loginData['chalvalue']) {
                                                if ($this->writeDevLog) {
-                                                       GeneralUtility::devLog('PHP Session stored challenge "' . $_SESSION['login_challenge'] . '" and submitted challenge "' . $loginData['chalvalue'] . '" did not match, so authentication failed!', 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', 2);
+                                                       GeneralUtility::devLog('PHP Session stored challenge "' . $_SESSION['login_challenge'] . '" and submitted challenge "' . $loginData['chalvalue'] . '" did not match, so authentication failed!', \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
                                                }
                                                $this->logoff();
                                                return FALSE;
index fd66ec3..53d8f9f 100644 (file)
@@ -47,11 +47,11 @@ class Cache {
                if (!self::isCachingFrameworkInitialized()) {
                        // New operator used on purpose, makeInstance() is not ready to be used so early in bootstrap
                        self::$cacheManager = new CacheManager();
-                       GeneralUtility::setSingletonInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager', self::$cacheManager);
+                       GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, self::$cacheManager);
                        self::$cacheManager->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']);
                        // New operator used on purpose, makeInstance() is not ready to be used so early in bootstrap
                        self::$cacheFactory = new CacheFactory('production', self::$cacheManager);
-                       GeneralUtility::setSingletonInstance('TYPO3\\CMS\\Core\\Cache\\CacheFactory', self::$cacheFactory);
+                       GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheFactory::class, self::$cacheFactory);
                        self::$isCachingFrameworkInitialized = TRUE;
                }
                return self::$cacheManager;
@@ -75,8 +75,8 @@ class Cache {
         */
        static public function flagCachingFrameworkForReinitialization() {
                self::$isCachingFrameworkInitialized = FALSE;
-               GeneralUtility::removeSingletonInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager', self::$cacheManager);
-               GeneralUtility::removeSingletonInstance('TYPO3\\CMS\\Core\\Cache\\CacheFactory', self::$cacheFactory);
+               GeneralUtility::removeSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, self::$cacheManager);
+               GeneralUtility::removeSingletonInstance(\TYPO3\CMS\Core\Cache\CacheFactory::class, self::$cacheFactory);
                self::$cacheManager = NULL;
                self::$cacheFactory = NULL;
        }
index b2fc6d3..142b117 100644 (file)
@@ -57,8 +57,8 @@ class CacheManager implements \TYPO3\CMS\Core\SingletonInterface {
         * @var array Default cache configuration as fallback
         */
        protected $defaultCacheConfiguration = array(
-               'frontend' => 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend',
-               'backend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend',
+               'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+               'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                'options' => array(),
                'groups' => array('all')
        );
index 00d5e17..4cf8c70 100644 (file)
@@ -46,7 +46,7 @@ class CategoryCollection extends \TYPO3\CMS\Core\Collection\AbstractRecordCollec
                if (!empty($tableName)) {
                        $this->setItemTableName($tableName);
                } elseif (empty($this->itemTableName)) {
-                       throw new \RuntimeException('TYPO3\\CMS\\Core\\Category\\Collection\\CategoryCollection needs a valid itemTableName.', 1341826168);
+                       throw new \RuntimeException(\TYPO3\CMS\Core\Category\Collection\CategoryCollection::class . ' needs a valid itemTableName.', 1341826168);
                }
                if (!empty($fieldName)) {
                        $this->setRelationFieldName($fieldName);
index 98eea2a..a017f1a 100644 (file)
@@ -53,7 +53,7 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
                if (!empty($tableName)) {
                        $this->setItemTableName($tableName);
                } elseif (empty($this->itemTableName)) {
-                       throw new \RuntimeException('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection needs a valid itemTableName.', 1330293778);
+                       throw new \RuntimeException(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class . ' needs a valid itemTableName.', 1330293778);
                }
        }
 
index 5ac9b70..d11f064 100644 (file)
@@ -103,7 +103,7 @@ class Bootstrap {
                        $applicationContext = getenv('TYPO3_CONTEXT') ?: (getenv('REDIRECT_TYPO3_CONTEXT') ?: 'Production');
                        self::$instance = new static($applicationContext);
                        // Establish an alias for Flow/Package interoperability
-                       class_alias(get_class(static::$instance), 'TYPO3\\Flow\\Core\\Bootstrap');
+                       class_alias(get_class(static::$instance), \TYPO3\Flow\Core\Bootstrap::class);
                }
                return static::$instance;
        }
@@ -166,7 +166,7 @@ class Bootstrap {
         */
        public function redirectToInstallerIfEssentialConfigurationDoesNotExist($pathUpToDocumentRoot = '') {
                $configurationManager = new \TYPO3\CMS\Core\Configuration\ConfigurationManager;
-               $this->setEarlyInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', $configurationManager);
+               $this->setEarlyInstance(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, $configurationManager);
                if (!file_exists($configurationManager->getLocalConfigurationFileLocation()) || !file_exists(PATH_typo3conf . 'PackageStates.php')) {
                        define('TYPO3_enterInstallScript', '1');
                        $this->defineTypo3RequestTypes();
@@ -221,7 +221,7 @@ class Bootstrap {
         * @return Bootstrap
         * @internal This is not a public API method, do not use in own extensions
         */
-       public function loadConfigurationAndInitialize($allowCaching = TRUE, $packageManagerClassName = 'TYPO3\\CMS\\Core\\Package\\PackageManager') {
+       public function loadConfigurationAndInitialize($allowCaching = TRUE, $packageManagerClassName = \TYPO3\CMS\Core\Package\PackageManager::class) {
                $this->initializeClassLoader()
                        ->populateLocalConfiguration();
                if (!$allowCaching) {
@@ -256,11 +256,11 @@ class Bootstrap {
         */
        public function initializeClassLoader() {
                $classLoader = new ClassLoader($this->applicationContext);
-               $this->setEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassLoader', $classLoader);
+               $this->setEarlyInstance(\TYPO3\CMS\Core\Core\ClassLoader::class, $classLoader);
                $classLoader->setRuntimeClassLoadingInformationFromAutoloadRegistry((array)include __DIR__ . '/../../ext_autoload.php');
                $classAliasMap = new ClassAliasMap();
                $classAliasMap->injectClassLoader($classLoader);
-               $this->setEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassAliasMap', $classAliasMap);
+               $this->setEarlyInstance(\TYPO3\CMS\Core\Core\ClassAliasMap::class, $classAliasMap);
                $classLoader->injectClassAliasMap($classAliasMap);
                spl_autoload_register(array($classLoader, 'loadClass'), TRUE, TRUE);
                return $this;
@@ -273,7 +273,7 @@ class Bootstrap {
         * @internal This is not a public API method, do not use in own extensions
         */
        public function unregisterClassLoader() {
-               $currentClassLoader = $this->getEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassLoader');
+               $currentClassLoader = $this->getEarlyInstance(\TYPO3\CMS\Core\Core\ClassLoader::class);
                spl_autoload_unregister(array($currentClassLoader, 'loadClass'));
                return $this;
        }
@@ -286,9 +286,9 @@ class Bootstrap {
         */
        public function initializeClassLoaderCaches() {
                /** @var $classLoader ClassLoader */
-               $classLoader = $this->getEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassLoader');
-               $classLoader->injectCoreCache($this->getEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->getCache('cache_core'));
-               $classLoader->injectClassesCache($this->getEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->getCache('cache_classes'));
+               $classLoader = $this->getEarlyInstance(\TYPO3\CMS\Core\Core\ClassLoader::class);
+               $classLoader->injectCoreCache($this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_core'));
+               $classLoader->injectClassesCache($this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_classes'));
                return $this;
        }
 
@@ -303,13 +303,13 @@ class Bootstrap {
        public function initializePackageManagement($packageManagerClassName) {
                /** @var \TYPO3\CMS\Core\Package\PackageManager $packageManager */
                $packageManager = new $packageManagerClassName();
-               $this->setEarlyInstance('TYPO3\\Flow\\Package\\PackageManager', $packageManager);
+               $this->setEarlyInstance(\TYPO3\Flow\Package\PackageManager::class, $packageManager);
                Utility\ExtensionManagementUtility::setPackageManager($packageManager);
-               $packageManager->injectClassLoader($this->getEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassLoader'));
-               $packageManager->injectCoreCache($this->getEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->getCache('cache_core'));
+               $packageManager->injectClassLoader($this->getEarlyInstance(\TYPO3\CMS\Core\Core\ClassLoader::class));
+               $packageManager->injectCoreCache($this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_core'));
                $packageManager->injectDependencyResolver(Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Package\DependencyResolver::class));
                $packageManager->initialize($this);
-               Utility\GeneralUtility::setSingletonInstance('TYPO3\\CMS\\Core\\Package\\PackageManager', $packageManager);
+               Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
                return $this;
        }
 
@@ -322,7 +322,7 @@ class Bootstrap {
        protected function initializeRuntimeActivatedPackagesFromConfiguration() {
                if (isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['runtimeActivatedPackages']) && is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['runtimeActivatedPackages'])) {
                        /** @var \TYPO3\CMS\Core\Package\PackageManager $packageManager */
-                       $packageManager = $this->getEarlyInstance('TYPO3\\Flow\\Package\\PackageManager');
+                       $packageManager = $this->getEarlyInstance(\TYPO3\Flow\Package\PackageManager::class);
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['EXT']['runtimeActivatedPackages'] as $runtimeAddedPackageKey) {
                                $packageManager->activatePackageDuringRuntime($runtimeAddedPackageKey);
                        }
@@ -381,10 +381,10 @@ class Bootstrap {
         */
        public function populateLocalConfiguration() {
                try {
-                       $configurationManager = $this->getEarlyInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
+                       $configurationManager = $this->getEarlyInstance(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
                } catch(\TYPO3\CMS\Core\Exception $exception) {
                        $configurationManager = new \TYPO3\CMS\Core\Configuration\ConfigurationManager();
-                       $this->setEarlyInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', $configurationManager);
+                       $this->setEarlyInstance(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, $configurationManager);
                }
                $configurationManager->exportConfiguration();
                return $this;
@@ -398,9 +398,9 @@ class Bootstrap {
         */
        public function disableCoreAndClassesCache() {
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_core']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_classes']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\TransientMemoryBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend::class;
                return $this;
        }
 
@@ -438,18 +438,18 @@ class Bootstrap {
         */
        protected function registerExtDirectComponents() {
                if (TYPO3_MODE === 'BE') {
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.DataProvider', 'TYPO3\\CMS\\Backend\\Tree\\Pagetree\\ExtdirectTreeDataProvider', 'web', 'user,group');
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.Commands', 'TYPO3\\CMS\\Backend\\Tree\\Pagetree\\ExtdirectTreeCommands', 'web', 'user,group');
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.ContextMenuDataProvider', 'TYPO3\\CMS\\Backend\\ContextMenu\\Pagetree\\Extdirect\\ContextMenuConfiguration', 'web', 'user,group');
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.LiveSearchActions.ExtDirect', 'TYPO3\\CMS\\Backend\\Search\\LiveSearch\\ExtDirect\\LiveSearchDataProvider', 'web_list', 'user,group');
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.BackendUserSettings.ExtDirect', 'TYPO3\\CMS\\Backend\\User\\ExtDirect\\BackendUserSettingsDataProvider');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.DataProvider', \TYPO3\CMS\Backend\Tree\Pagetree\ExtdirectTreeDataProvider::class, 'web', 'user,group');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.Commands', \TYPO3\CMS\Backend\Tree\Pagetree\ExtdirectTreeCommands::class, 'web', 'user,group');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.Components.PageTree.ContextMenuDataProvider', \TYPO3\CMS\Backend\ContextMenu\Pagetree\Extdirect\ContextMenuConfiguration::class, 'web', 'user,group');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.LiveSearchActions.ExtDirect', \TYPO3\CMS\Backend\Search\LiveSearch\ExtDirect\LiveSearchDataProvider::class, 'web_list', 'user,group');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.BackendUserSettings.ExtDirect', \TYPO3\CMS\Backend\User\ExtDirect\BackendUserSettingsDataProvider::class);
                        if (Utility\ExtensionManagementUtility::isLoaded('context_help')) {
-                               Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.CSH.ExtDirect', 'TYPO3\\CMS\\ContextHelp\\ExtDirect\\ContextHelpDataProvider');
+                               Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.CSH.ExtDirect', \TYPO3\CMS\ContextHelp\ExtDirect\ContextHelpDataProvider::class);
                        }
-                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.ExtDirectStateProvider.ExtDirect', 'TYPO3\\CMS\\Backend\\InterfaceState\\ExtDirect\\DataProvider');
+                       Utility\ExtensionManagementUtility::registerExtDirectComponent('TYPO3.ExtDirectStateProvider.ExtDirect', \TYPO3\CMS\Backend\InterfaceState\ExtDirect\DataProvider::class);
                        Utility\ExtensionManagementUtility::registerExtDirectComponent(
                                'TYPO3.Components.DragAndDrop.CommandController',
-                               Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php:TYPO3\\CMS\\Backend\\View\\PageLayout\\ExtDirect\\ExtdirectPageCommands', 'web', 'user,group'
+                               Utility\ExtensionManagementUtility::extPath('backend') . 'Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php:' . \TYPO3\CMS\Backend\View\PageLayout\ExtDirect\ExtdirectPageCommands::class, 'web', 'user,group'
                        );
                }
                return $this;
@@ -462,7 +462,7 @@ class Bootstrap {
         * @internal This is not a public API method, do not use in own extensions
         */
        public function initializeCachingFramework() {
-               $this->setEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager', \TYPO3\CMS\Core\Cache\Cache::initializeCachingFramework());
+               $this->setEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, \TYPO3\CMS\Core\Cache\Cache::initializeCachingFramework());
                return $this;
        }
 
@@ -682,7 +682,7 @@ class Bootstrap {
         * @return Bootstrap
         */
        protected function setFinalCachingFrameworkCacheConfiguration() {
-               $this->getEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']);
+               $this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']);
                return $this;
        }
 
@@ -879,7 +879,7 @@ class Bootstrap {
        public function loadCachedTca() {
                $cacheIdentifier = 'tca_fe_' . sha1((TYPO3_version . PATH_site . 'tca_fe'));
                /** @var $codeCache \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend */
-               $codeCache = $this->getEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->getCache('cache_core');
+               $codeCache = $this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_core');
                if ($codeCache->has($cacheIdentifier)) {
                        // substr is necessary, because the php frontend wraps php code around the cache value
                        $GLOBALS['TCA'] = unserialize(substr($codeCache->get($cacheIdentifier), 6, -2));
index 2a2b503..9493ab2 100644 (file)
@@ -3574,7 +3574,7 @@ class DataHandler {
                                                                        $sysRefObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
                                                                        $error = $sysRefObj->setReferenceValue($rteFileRecord['hash'], \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($copyDestName), FALSE, TRUE);
                                                                        if ($error) {
-                                                                               echo $this->newlog('TYPO3\\CMS\\Core\\Database\\ReferenceIndex::setReferenceValue(): ' . $error, 1);
+                                                                               echo $this->newlog(\TYPO3\CMS\Core\Database\ReferenceIndex::class . '::setReferenceValue(): ' . $error, 1);
                                                                        }
                                                                } else {
                                                                        $this->newlog('File "' . $copyDestName . '" was not created!', 1);
index b482bd4..72c9275 100644 (file)
@@ -1713,7 +1713,7 @@ class DatabaseConnection {
                if ($error || (int)$this->debugOutput === 2) {
                        \TYPO3\CMS\Core\Utility\DebugUtility::debug(
                                array(
-                                       'caller' => 'TYPO3\\CMS\\Core\\Database\\DatabaseConnection::' . $func,
+                                       'caller' => \TYPO3\CMS\Core\Database\DatabaseConnection::class . '::' . $func,
                                        'ERROR' => $error,
                                        'lastBuiltQuery' => $query ? $query : $this->debug_lastBuiltQuery,
                                        'debug_backtrace' => \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail()
index 1c8c031..5643d01 100644 (file)
@@ -95,7 +95,7 @@ class ErrorHandler implements ErrorHandlerInterface {
                        // We need to manually require the exception classes in case
                        // the autoloader is not available at this point yet.
                        // @see http://forge.typo3.org/issues/23444
-                       if (!class_exists('TYPO3\\CMS\\Core\\Error\\Exception', FALSE)) {
+                       if (!class_exists(\TYPO3\CMS\Core\Error\Exception::class, FALSE)) {
                                require_once PATH_site . 'typo3/sysext/core/Classes/Exception.php';
                                require_once PATH_site . 'typo3/sysext/core/Classes/Error/Exception.php';
                        }
index 8489b3e..2750b3f 100644 (file)
@@ -81,14 +81,14 @@ class FormProtectionFactory {
        static protected function getClassNameByState() {
                switch (TRUE) {
                        case self::isInstallToolSession():
-                               $className = 'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection';
+                               $className = \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class;
                                break;
                        case self::isBackendSession():
-                               $className = 'TYPO3\\CMS\\Core\\FormProtection\\BackendFormProtection';
+                               $className = \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class;
                                break;
                        case self::isFrontendSession():
                        default:
-                               $className = 'TYPO3\\CMS\\Core\\FormProtection\\DisabledFormProtection';
+                               $className = \TYPO3\CMS\Core\FormProtection\DisabledFormProtection::class;
                }
                return $className;
        }
@@ -133,7 +133,7 @@ class FormProtectionFactory {
                }
                $instance = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance($className);
                if (!$instance instanceof AbstractFormProtection) {
-                       throw new \InvalidArgumentException('$className must be a subclass of ' . 'TYPO3\\CMS\\Core\\FormProtection\\AbstractFormProtection, but actually was "' . $className . '".', 1285353026);
+                       throw new \InvalidArgumentException('$className must be a subclass of ' . \TYPO3\CMS\Core\FormProtection\AbstractFormProtection::class . ', but actually was "' . $className . '".', 1285353026);
                }
                self::$instances[$className] = $instance;
        }
index 34fa3da..b13eacc 100644 (file)
@@ -997,7 +997,7 @@ class GraphicalFunctions {
                                        $offsetInfo[5] += $calc[5] - $calc[7] - (int)$splitRendering['compY'] - (int)$strCfg['ySpaceBefore'] - (int)$strCfg['ySpaceAfter'];
                                }
                        } else {
-                               debug('cannot read file: ' . $fontFile, 'TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions::ImageTTFBBoxWrapper()');
+                               debug('cannot read file: ' . $fontFile, \TYPO3\CMS\Core\Imaging\GraphicalFunctions::class . '::ImageTTFBBoxWrapper()');
                        }
                }
                return $offsetInfo;
@@ -1047,7 +1047,7 @@ class GraphicalFunctions {
                                $x += $wordInf[2] - $wordInf[0] + (int)$splitRendering['compX'] + (int)$strCfg['xSpaceAfter'];
                                $y += $wordInf[5] - $wordInf[7] - (int)$splitRendering['compY'] - (int)$strCfg['ySpaceAfter'];
                        } else {
-                               debug('cannot read file: ' . $fontFile, 'TYPO3\\CMS\\Core\\Imaging\\GraphicalFunctions::ImageTTFTextWrapper()');
+                               debug('cannot read file: ' . $fontFile, \TYPO3\CMS\Core\Imaging\GraphicalFunctions::class . '::ImageTTFTextWrapper()');
                        }
                }
        }
index 7486d90..de3da66 100644 (file)
@@ -86,7 +86,7 @@ class IntrospectionProcessor extends AbstractProcessor {
 
                // skip TYPO3\CMS\Core\Log classes
                foreach ($trace as $traceEntry) {
-                       if (isset($traceEntry['class']) && FALSE !== strpos($traceEntry['class'], 'TYPO3\CMS\Core\Log')) {
+                       if (isset($traceEntry['class']) && FALSE !== strpos($traceEntry['class'], \TYPO3\CMS\Core\Log::class)) {
                                $trace = $this->shiftBacktraceLevel($trace);
                        } else {
                                break;
index 2f85c69..6a05be6 100644 (file)
@@ -62,7 +62,7 @@ class PackageFactory extends \TYPO3\Flow\Package\PackageFactory {
                        }
                } else {
                        $emConfPath = Files::concatenatePaths(array($packagePath, 'ext_emconf.php'));
-                       $packageClassName = @file_exists($emConfPath) ? 'TYPO3\CMS\Core\Package\Package' : 'TYPO3\Flow\Package\Package';
+                       $packageClassName = @file_exists($emConfPath) ? \TYPO3\CMS\Core\Package\Package::class : \TYPO3\Flow\Package\Package::class;
                }
 
                /** @var $package \TYPO3\Flow\Package\PackageInterface */
index 8c9ff0e..ee0d7f2 100644 (file)
@@ -54,7 +54,7 @@ class FileCollectionRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                        throw new \InvalidArgumentException('Class ' . $className . ' does not exist.', 1391295613);
                }
 
-               if (!in_array('TYPO3\\CMS\\Core\\Resource\\Collection\\AbstractFileCollection', class_parents($className), TRUE)) {
+               if (!in_array(\TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection::class, class_parents($className), TRUE)) {
                        throw new \InvalidArgumentException('FileCollection ' . $className . ' needs to extend the AbstractFileCollection.', 1391295633);
                }
 
index 72f948c..13d5712 100644 (file)
@@ -57,7 +57,7 @@ class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                        throw new \InvalidArgumentException('Class ' . $className . ' does not exist.', 1314979197);
                }
 
-               if (!in_array('TYPO3\CMS\Core\Resource\Driver\DriverInterface', class_implements($className), TRUE)) {
+               if (!in_array(\TYPO3\CMS\Core\Resource\Driver\DriverInterface::class, class_implements($className), TRUE)) {
                        throw new \InvalidArgumentException('Driver ' . $className . ' needs to implement the DriverInterface.', 1387619575);
                }
                if ($shortName === '') {
index cfa5d95..7d19159 100644 (file)
@@ -34,7 +34,7 @@ class FileRepository extends AbstractRepository {
         *
         * @var string
         */
-       protected $objectType = 'TYPO3\\CMS\\Core\\Resource\\File';
+       protected $objectType = \TYPO3\CMS\Core\Resource\File::class;
 
        /**
         * Main File object storage table. Note that this repository also works on
index 65041a9..68f19cf 100644 (file)
@@ -51,7 +51,7 @@ class ExtractorRegistry implements \TYPO3\CMS\Core\SingletonInterface {
        public function registerExtractionService($className) {
                if (!class_exists($className)) {
                        throw new \RuntimeException('The Class you are registering is not available');
-               } elseif (!in_array('TYPO3\\CMS\\Core\\Resource\\Index\\ExtractorInterface', class_implements($className))) {
+               } elseif (!in_array(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, class_implements($className))) {
                        throw new \RuntimeException('The extractor needs to implement the ExtractorInterface');
                } else {
                        $this->extractors[] = $className;
index 37e7608..1431ed3 100644 (file)
@@ -368,7 +368,7 @@ class FileIndexRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordUpdatedSignal(array $data) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\FileIndexRepository', 'recordUpdated', array($data));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\FileIndexRepository::class, 'recordUpdated', array($data));
        }
 
        /**
@@ -378,7 +378,7 @@ class FileIndexRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordCreatedSignal(array $data) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\FileIndexRepository', 'recordCreated', array($data));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\FileIndexRepository::class, 'recordCreated', array($data));
        }
 
        /**
@@ -388,6 +388,6 @@ class FileIndexRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordDeletedSignal($fileUid) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\FileIndexRepository', 'recordDeleted', array($fileUid));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\FileIndexRepository::class, 'recordDeleted', array($fileUid));
        }
 }
index 8a7d899..967fc0f 100644 (file)
@@ -177,7 +177,7 @@ class MetaDataRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordPostRetrievalSignal(\ArrayObject $data) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\MetaDataRepository', 'recordPostRetrieval', array($data));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class, 'recordPostRetrieval', array($data));
        }
 
        /**
@@ -187,7 +187,7 @@ class MetaDataRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordUpdatedSignal(array $data) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\MetaDataRepository', 'recordUpdated', array($data));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class, 'recordUpdated', array($data));
        }
 
        /**
@@ -197,7 +197,7 @@ class MetaDataRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordCreatedSignal(array $data) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\MetaDataRepository', 'recordCreated', array($data));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class, 'recordCreated', array($data));
        }
 
        /**
@@ -207,7 +207,7 @@ class MetaDataRepository implements SingletonInterface {
         * @signal
         */
        protected function emitRecordDeletedSignal($fileUid) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\Index\\MetaDataRepository', 'recordDeleted', array($fileUid));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class, 'recordDeleted', array($fileUid));
        }
 
        /**
index 9cac51a..4afee8d 100644 (file)
@@ -30,7 +30,7 @@ class ProcessedFileRepository extends AbstractRepository {
         *
         * @var string
         */
-       protected $objectType = 'TYPO3\\CMS\\Core\\Resource\\ProcessedFile';
+       protected $objectType = \TYPO3\CMS\Core\Resource\ProcessedFile::class;
 
        /**
         * Main File object storage table. Note that this repository also works on
index 5bccb4b..cc57113 100644 (file)
@@ -54,7 +54,7 @@ class RendererRegistry implements \TYPO3\CMS\Core\SingletonInterface {
        public function registerRendererClass($className) {
                if (!class_exists($className)) {
                        throw new \InvalidArgumentException('The class you are registering is not available', 1411840171);
-               } elseif (!in_array('TYPO3\\CMS\\Core\\Resource\\Rendering\\FileRendererInterface', class_implements($className), TRUE)) {
+               } elseif (!in_array(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, class_implements($className), TRUE)) {
                        throw new \InvalidArgumentException('The renderer needs to implement the FileRendererInterface', 1411840172);
                } else {
                        $this->classNames[] = $className;
index 3869dfd..13b90d5 100644 (file)
@@ -178,7 +178,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
         * @param ResourceStorage $storageObject
         */
        protected function emitPostProcessStorageSignal(ResourceStorage $storageObject) {
-               $this->signalSlotDispatcher->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceFactory', self::SIGNAL_PostProcessStorage, array($this, $storageObject));
+               $this->signalSlotDispatcher->dispatch(\TYPO3\CMS\Core\Resource\ResourceFactory::class, self::SIGNAL_PostProcessStorage, array($this, $storageObject));
        }
 
        /**
@@ -303,7 +303,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
         * @return ResourceStorage
         */
        public function createStorageObject(array $storageRecord, array $storageConfiguration = NULL) {
-               $className = 'TYPO3\\CMS\\Core\\Resource\\ResourceStorage';
+               $className = \TYPO3\CMS\Core\Resource\ResourceStorage::class;
                if (!$storageConfiguration) {
                        $storageConfiguration = $this->convertFlexFormDataToConfigurationArray($storageRecord['configuration']);
                }
index fcce3df..bd20f94 100644 (file)
@@ -2029,7 +2029,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return string Modified target file name
         */
        protected function emitPreFileAddSignal($targetFileName, Folder $targetFolder, $sourceFilePath) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileAdd, array(&$targetFileName, $targetFolder, $sourceFilePath, $this, $this->driver));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileAdd, array(&$targetFileName, $targetFolder, $sourceFilePath, $this, $this->driver));
                return $targetFileName;
        }
 
@@ -2041,7 +2041,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileAddSignal(FileInterface $file, Folder $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileAdd, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileAdd, array($file, $targetFolder));
        }
 
        /**
@@ -2052,7 +2052,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFileCopySignal(FileInterface $file, Folder $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileCopy, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileCopy, array($file, $targetFolder));
        }
 
        /**
@@ -2063,7 +2063,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileCopySignal(FileInterface $file, Folder $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileCopy, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileCopy, array($file, $targetFolder));
        }
 
        /**
@@ -2074,7 +2074,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFileMoveSignal(FileInterface $file, Folder $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileMove, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileMove, array($file, $targetFolder));
        }
 
        /**
@@ -2086,7 +2086,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileMoveSignal(FileInterface $file, Folder $targetFolder, Folder $originalFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileMove, array($file, $targetFolder, $originalFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileMove, array($file, $targetFolder, $originalFolder));
        }
 
        /**
@@ -2097,7 +2097,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFileRenameSignal(FileInterface $file, $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileRename, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileRename, array($file, $targetFolder));
        }
 
        /**
@@ -2108,7 +2108,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileRenameSignal(FileInterface $file, $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileRename, array($file, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileRename, array($file, $targetFolder));
        }
 
        /**
@@ -2119,7 +2119,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFileReplaceSignal(FileInterface $file, $localFilePath) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileReplace, array($file, $localFilePath));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileReplace, array($file, $localFilePath));
        }
 
        /**
@@ -2130,7 +2130,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileReplaceSignal(FileInterface $file, $localFilePath) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileReplace, array($file, $localFilePath));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileReplace, array($file, $localFilePath));
        }
 
        /**
@@ -2140,7 +2140,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @param Folder $targetFolder
         */
        protected function emitPostFileCreateSignal($newFileIdentifier, Folder $targetFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileCreate, array($newFileIdentifier, $targetFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileCreate, array($newFileIdentifier, $targetFolder));
        }
 
        /**
@@ -2150,7 +2150,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFileDeleteSignal(FileInterface $file) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileDelete, array($file));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileDelete, array($file));
        }
 
        /**
@@ -2160,7 +2160,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileDeleteSignal(FileInterface $file) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileDelete, array($file));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileDelete, array($file));
        }
 
        /**
@@ -2171,7 +2171,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFileSetContentsSignal(FileInterface $file, $content) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileSetContents, array($file, $content));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileSetContents, array($file, $content));
        }
 
        /**
@@ -2182,7 +2182,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFolderAddSignal(Folder $targetFolder, $name) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFolderAdd, array($targetFolder, $name));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFolderAdd, array($targetFolder, $name));
        }
 
        /**
@@ -2192,7 +2192,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFolderAddSignal(Folder $folder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFolderAdd, array($folder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFolderAdd, array($folder));
        }
 
        /**
@@ -2204,7 +2204,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFolderCopySignal(Folder $folder, Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFolderCopy, array($folder, $targetFolder, $newName));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFolderCopy, array($folder, $targetFolder, $newName));
        }
 
        /**
@@ -2216,7 +2216,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFolderCopySignal(Folder $folder, Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFolderCopy, array($folder, $targetFolder, $newName));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFolderCopy, array($folder, $targetFolder, $newName));
        }
 
        /**
@@ -2228,7 +2228,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFolderMove, array($folder, $targetFolder, $newName));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFolderMove, array($folder, $targetFolder, $newName));
        }
 
        /**
@@ -2241,7 +2241,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName, Folder $originalFolder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFolderMove, array($folder, $targetFolder, $newName, $originalFolder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFolderMove, array($folder, $targetFolder, $newName, $originalFolder));
        }
 
        /**
@@ -2252,7 +2252,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFolderRenameSignal(Folder $folder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFolderRename, array($folder, $newName));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFolderRename, array($folder, $newName));
        }
 
        /**
@@ -2263,7 +2263,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFolderRenameSignal(Folder $folder, $newName) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFolderRename, array($folder, $newName));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFolderRename, array($folder, $newName));
        }
 
        /**
@@ -2273,7 +2273,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPreFolderDeleteSignal(Folder $folder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFolderDelete, array($folder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFolderDelete, array($folder));
        }
 
        /**
@@ -2283,7 +2283,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @return void
         */
        protected function emitPostFolderDeleteSignal(Folder $folder) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFolderDelete, array($folder));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFolderDelete, array($folder));
        }
 
        /**
@@ -2294,7 +2294,7 @@ class ResourceStorage implements ResourceStorageInterface {
         * @param array $urlData
         */
        protected function emitPreGeneratePublicUrlSignal(ResourceInterface $resourceObject, $relativeToCurrentScript, array $urlData) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreGeneratePublicUrl, array($this, $this->driver, $resourceObject, $relativeToCurrentScript, $urlData));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreGeneratePublicUrl, array($this, $this->driver, $resourceObject, $relativeToCurrentScript, $urlData));
        }
 
        /**
index 7992422..493a629 100644 (file)
@@ -151,7 +151,7 @@ class FileProcessingService {
         * @param array $configuration
         */
        protected function emitPreFileProcessSignal(Resource\ProcessedFile $processedFile, Resource\FileInterface $file, $context, array $configuration = array()) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PreFileProcess, array($this, $this->driver, $processedFile, $file, $context, $configuration));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PreFileProcess, array($this, $this->driver, $processedFile, $file, $context, $configuration));
        }
 
        /**
@@ -163,6 +163,6 @@ class FileProcessingService {
         * @param array $configuration
         */
        protected function emitPostFileProcessSignal(Resource\ProcessedFile $processedFile, Resource\FileInterface $file, $context, array $configuration = array()) {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', self::SIGNAL_PostFileProcess, array($this, $this->driver, $processedFile, $file, $context, $configuration));
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Resource\ResourceStorage::class, self::SIGNAL_PostFileProcess, array($this, $this->driver, $processedFile, $file, $context, $configuration));
        }
 }
index 7d5a0a8..1e25271 100644 (file)
@@ -29,7 +29,7 @@ class StorageRepository extends AbstractRepository {
        /**
         * @var string
         */
-       protected $objectType = 'TYPO3\\CMS\\Core\\Resource\\ResourceStorage';
+       protected $objectType = \TYPO3\CMS\Core\Resource\ResourceStorage::class;
 
        /**
         * @var string
index 9f1b228..c12dada 100644 (file)
@@ -437,7 +437,7 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
         * @return void
         */
        protected function emitPostProcessTreeDataSignal() {
-               $this->getSignalSlotDispatcher()->dispatch('TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\TableConfiguration\\DatabaseTreeDataProvider',
+               $this->getSignalSlotDispatcher()->dispatch(\TYPO3\CMS\Core\Tree\TableConfiguration\TableConfiguration\DatabaseTreeDataProvider::class,
                        self::SIGNAL_PostProcessTreeData,
                        array($this, $this->treeData)
                );
index ba2aadd..2588136 100644 (file)
@@ -521,7 +521,7 @@ class ExtensionManagementUtility {
                        ),
                        'filter' => array(
                                array(
-                                       'userFunc' => 'TYPO3\\CMS\\Core\\Resource\\Filter\\FileExtensionFilter->filterInlineChildren',
+                                       'userFunc' => \TYPO3\CMS\Core\Resource\Filter\FileExtensionFilter::class . '->filterInlineChildren',
                                        'parameters' => array(
                                                'allowedFileExtensions' => $allowedFileExtensions,
                                                'disallowedFileExtensions' => $disallowedFileExtensions
@@ -770,7 +770,7 @@ class ExtensionManagementUtility {
                $moduleConfiguration['name'] = $moduleSignature;
                $moduleConfiguration['script'] = 'extjspaneldummy.html';
                $moduleConfiguration['extensionName'] = $extensionName;
-               $moduleConfiguration['configureModuleFunction'] = array('TYPO3\\CMS\\Core\\Utility\\ExtensionManagementUtility', 'configureModule');
+               $moduleConfiguration['configureModuleFunction'] = array(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::class, 'configureModule');
                $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature] = $moduleConfiguration;
                self::addModule($mainModuleName, $subModuleName, $position);
        }
index 3f4bfef..ac52bb3 100755 (executable)
@@ -2383,7 +2383,7 @@ class GeneralUtility {
                                } catch (\Exception $e) {
                                        $errorMessage = 'Error minifying java script: ' . $e->getMessage();
                                        $error .= $errorMessage;
-                                       static::devLog($errorMessage, 'TYPO3\\CMS\\Core\\Utility\\GeneralUtility', 2, array(
+                                       static::devLog($errorMessage, \TYPO3\CMS\Core\Utility\GeneralUtility::class, 2, array(
                                                'JavaScript' => $script,
                                                'Stack trace' => $e->getTrace(),
                                                'hook' => $hookMethod
@@ -4243,7 +4243,7 @@ Connection: close
                                        if ($errorMode == 2) {
                                                throw new \InvalidArgumentException($errorMsg, 1294585865);
                                        } elseif (!$errorMode) {
-                                               debug($errorMsg, 'TYPO3\\CMS\\Core\\Utility\\GeneralUtility::callUserFunction');
+                                               debug($errorMsg, \TYPO3\CMS\Core\Utility\GeneralUtility::class . '::callUserFunction');
                                        }
                                }
                        } else {
@@ -4251,7 +4251,7 @@ Connection: close
                                if ($errorMode == 2) {
                                        throw new \InvalidArgumentException($errorMsg, 1294585866);
                                } elseif (!$errorMode) {
-                                       debug($errorMsg, 'TYPO3\\CMS\\Core\\Utility\\GeneralUtility::callUserFunction');
+                                       debug($errorMsg, \TYPO3\CMS\Core\Utility\GeneralUtility::class . '::callUserFunction');
                                }
                        }
                } else {
@@ -4263,7 +4263,7 @@ Connection: close
                                if ($errorMode == 2) {
                                        throw new \InvalidArgumentException($errorMsg, 1294585867);
                                } elseif (!$errorMode) {
-                                       debug($errorMsg, 'TYPO3\\CMS\\Core\\Utility\\GeneralUtility::callUserFunction');
+                                       debug($errorMsg, \TYPO3\CMS\Core\Utility\GeneralUtility::class . '::callUserFunction');
                                }
                        }
                }
@@ -5031,7 +5031,7 @@ Connection: close
                $date = date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'] . ': ');
                if (in_array('file', $log) !== FALSE) {
                        // In case lock is acquired before autoloader was defined:
-                       if (class_exists('TYPO3\\CMS\\Core\\Locking\\Locker') === FALSE) {
+                       if (class_exists(\TYPO3\CMS\Core\Locking\Locker::class) === FALSE) {
                                require_once ExtensionManagementUtility::extPath('core') . 'Classes/Locking/Locker.php';
                        }
                        // Write a longer message to the deprecation log
index 14953df..8d64ed7 100644 (file)
@@ -77,7 +77,7 @@ class PathUtility {
         * @return NULL|string
         */
        static public function getCommonPrefix(array $paths) {
-               $paths = array_map(array('TYPO3\\CMS\\Core\\Utility\\GeneralUtility', 'fixWindowsFilePath'), $paths);
+               $paths = array_map(array(\TYPO3\CMS\Core\Utility\GeneralUtility::class, 'fixWindowsFilePath'), $paths);
                $commonPath = NULL;
                if (count($paths) === 1) {
                        $commonPath = array_shift($paths);
index c8c09fe..ed0e602 100644 (file)
@@ -41,7 +41,7 @@ class VersionNumberUtility {
         */
        static public function convertIntegerToVersionNumber($versionInteger) {
                if (!is_int($versionInteger)) {
-                       throw new \InvalidArgumentException('TYPO3\\CMS\\Core\\Utility\\VersionNumberUtility::convertIntegerToVersionNumber() supports an integer argument only!', 1334072223);
+                       throw new \InvalidArgumentException(\TYPO3\CMS\Core\Utility\VersionNumberUtility::class . '::convertIntegerToVersionNumber() supports an integer argument only!', 1334072223);
                }
                $versionString = str_pad($versionInteger, 9, '0', STR_PAD_LEFT);
                $parts = array(
index 249c561..18748b6 100644 (file)
@@ -51,8 +51,8 @@ return array(
                                'priority' => 'xlf,xml'
                        ),
                        'parser' => array(
-                               'xml' => 'TYPO3\\CMS\\Core\\Localization\\Parser\\LocallangXmlParser',
-                               'xlf' => 'TYPO3\\CMS\\Core\\Localization\\Parser\\XliffParser'
+                               'xml' => \TYPO3\CMS\Core\Localization\Parser\LocallangXmlParser::class,
+                               'xlf' => \TYPO3\CMS\Core\Localization\Parser\XliffParser::class
                        )
                ),
                'sitename' => 'TYPO3',                                  // Name of the base-site. This title shows up in the root of the tree structure if you're an 'admin' backend user.
@@ -120,38 +120,38 @@ return array(
                                // The cache_core cache is is for core php code only and must
                                // not be abused by third party extensions.
                                'cache_core' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\PhpFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
                                        'groups' => array('system')
                                ),
                                'cache_classes' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\StringFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
                                        'groups' => array('system')
                                ),
                                'cache_hash' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(),
                                        'groups' => array('pages', 'all')
                                ),
                                'cache_pages' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(
                                                'compression' => TRUE
                                        ),
                                        'groups' => array('pages', 'all')
                                ),
                                'cache_pagesection' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(
                                                'compression' => TRUE,
                                                'defaultLifetime' => 2592000   //  30 days; set this to a lower value in case your cache gets too big
@@ -159,44 +159,44 @@ return array(
                                        'groups' => array('pages', 'all')
                                ),
                                'cache_phpcode' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\PhpFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\FileBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\FileBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
                                        'groups' => array('system')
                                ),
                                'cache_runtime' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend::class,
                                        'options' => array(),
                                        'groups' => array()
                                ),
                                'cache_rootline' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(),
                                        'groups' => array('pages', 'all')
                                ),
                                'l10n' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
                                        'groups' => array('system')
                                ),
                                'extbase_object' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
                                        'groups' => array('system')
                                ),
                                'extbase_reflection' => array(
-                                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend',
+                                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                                       'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                                        'options' => array(
                                                'defaultLifetime' => 0,
                                        ),
@@ -206,9 +206,9 @@ return array(
                ),
                'defaultCategorizedTables' => 'pages,tt_content,sys_file_metadata', // List of comma separated tables that are categorizable by default.
                'displayErrors' => -1,          // <p>Integer (-1, 0, 1, 2). Configures whether PHP errors or Exceptions should be displayed.</p><dl><dt>0</dt><dd>Do not display any PHP error message. Sets PHP "display_errors" setting to 0. Overrides the value of [SYS][exceptionalErrors] and sets it to 0 (= no errors are turned into exceptions). The configured [SYS][productionExceptionHandler] is used as exception handler.</dd><dt>1</dt><dd>Display error messages with the registered [SYS][errorHandler]. Sets PHP "display_errors" setting to 1. The configured [SYS][debugExceptionHandler] is used as exception handler.</dd><dt>2</dt><dd>Lets the [SYS][devIPmask] decide if this setting shall be "1" (user's IP matches) or "0" (IP does not match).</dd><dt>-1</dt><dd>Default setting. TYPO3 CMS does not touch the PHP "display_errors" setting. If [SYS][devIPmask] matches the user's IP address, the configured [SYS][debugExceptionHandler] is used instead of the [SYS][productionExceptionHandler] to handle exceptions.</dd></dl>
-               'productionExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler',          // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if [SYS][displayErrors] is set to "0" or is set to "-1" and [SYS][devIPmask] doesn't match the user's IP.
-               'debugExceptionHandler' => 'TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler',            // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler". This exception handler displays the complete stack trace of any encountered exception. The error message and the stack trace is logged to the configured logs. Note: The configured "debugExceptionHandler" is used if [SYS][displayErrors] is set to "1" or is set to "-1" or "2" and the [SYS][devIPmask] matches the user's IP.
-               'errorHandler' => 'TYPO3\\CMS\\Core\\Error\\ErrorHandler',              // String: Classname to handle PHP errors. E.g.: TYPO3\CMS\Core\Error\ErrorHandler. This class displays and logs all errors that are registered as [SYS][errorHandlerErrors]. Leave empty to disable error handling. Errors can be logged to syslog (see: [SYS][systemLog]), to the installed developer log and to the "syslog" table. If an error is registered in [SYS][exceptionalErrors] it will be turned into an exception to be handled by the configured exceptionHandler.
+               'productionExceptionHandler' => \TYPO3\CMS\Core\Error\ProductionExceptionHandler::class,                // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if [SYS][displayErrors] is set to "0" or is set to "-1" and [SYS][devIPmask] doesn't match the user's IP.
+               'debugExceptionHandler' => \TYPO3\CMS\Core\Error\DebugExceptionHandler::class,          // String: Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\\CMS\\Core\\Error\\DebugExceptionHandler". This exception handler displays the complete stack trace of any encountered exception. The error message and the stack trace is logged to the configured logs. Note: The configured "debugExceptionHandler" is used if [SYS][displayErrors] is set to "1" or is set to "-1" or "2" and the [SYS][devIPmask] matches the user's IP.
+               'errorHandler' => \TYPO3\CMS\Core\Error\ErrorHandler::class,            // String: Classname to handle PHP errors. E.g.: TYPO3\CMS\Core\Error\ErrorHandler. This class displays and logs all errors that are registered as [SYS][errorHandlerErrors]. Leave empty to disable error handling. Errors can be logged to syslog (see: [SYS][systemLog]), to the installed developer log and to the "syslog" table. If an error is registered in [SYS][exceptionalErrors] it will be turned into an exception to be handled by the configured exceptionHandler.
                'errorHandlerErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR),               // Integer: The E_* constant that will be handled by the [SYS][errorHandler]. Not all PHP error types can be handled! Default is 30466 = <code>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
                'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING),             // Integer: The E_* constant that will be converted into an exception by the default [SYS][errorHandler]. Default is 20480 = <code>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
                'enable_errorDLOG' => 0,        // Boolean: If set, errors are written to the developer log (requires an installed *devlog* extension).
@@ -221,7 +221,7 @@ return array(
                'fal' => array(
                        'registeredDrivers' => array(
                                'Local' => array(
-                                       'class' => 'TYPO3\\CMS\\Core\\Resource\\Driver\\LocalDriver',
+                                       'class' => \TYPO3\CMS\Core\Resource\Driver\LocalDriver::class,
                                        'shortName' => 'Local',
                                        'flexFormDS' => 'FILE:EXT:core/Configuration/Resource/Driver/LocalDriverFlexForm.xml',
                                        'label' => 'Local filesystem'
@@ -229,18 +229,18 @@ return array(
                        ),
                        'defaultFilterCallbacks' => array(
                                array(
-                                       'TYPO3\\CMS\\Core\\Resource\\Filter\\FileNameFilter',
+                                       \TYPO3\CMS\Core\Resource\Filter\FileNameFilter::class,
                                        'filterHiddenFilesAndFolders'
                                )
                        ),
                        'processingTaskTypes' => array(
-                               'Image.Preview' => 'TYPO3\\CMS\\Core\\Resource\\Processing\\ImagePreviewTask',
-                               'Image.CropScaleMask' => 'TYPO3\\CMS\\Core\\Resource\\Processing\\ImageCropScaleMaskTask'
+                               'Image.Preview' => \TYPO3\CMS\Core\Resource\Processing\ImagePreviewTask::class,
+                               'Image.CropScaleMask' => \TYPO3\CMS\Core\Resource\Processing\ImageCropScaleMaskTask::class
                        ),
                        'registeredCollections' => array(
-                               'static' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\StaticFileCollection',
-                               'folder' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\FolderBasedFileCollection',
-                               'category' => 'TYPO3\\CMS\\Core\\Resource\\Collection\\CategoryBasedFileCollection',
+                               'static' => \TYPO3\CMS\Core\Resource\Collection\StaticFileCollection::class,
+                               'folder' => \TYPO3\CMS\Core\Resource\Collection\FolderBasedFileCollection::class,
+                               'category' => \TYPO3\CMS\Core\Resource\Collection\CategoryBasedFileCollection::class,
                        )
                ),
                'isInitialInstallationInProgress' => FALSE,             // Boolean: If TRUE, the installation is 'in progress'. This value is handled within the install tool step installer internally.
@@ -254,14 +254,14 @@ return array(
                'extConf' => array(
                        'saltedpasswords' => serialize(array(
                                'BE.' => array(
-                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'saltedPWHashingMethod' => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class,
                                        'forceSalted' => 0,
                                        'onlyAuthService' => 0,
                                        'updatePasswd' => 1,
                                ),
                                'FE.' => array(
                                        'enabled' => 0,
-                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'saltedPWHashingMethod' => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class,
                                        'forceSalted' => 0,
                                        'onlyAuthService' => 0,
                                        'updatePasswd' => 1,
@@ -599,106 +599,106 @@ return array(
                'flexformForceCDATA' => 0,                                                      // Boolean:  If set, will add CDATA to Flexform XML. Some versions of libxml have a bug that causes HTML entities to be stripped from any XML content and this setting will avoid the bug by adding CDATA.
                'explicitConfirmationOfTranslation' => FALSE,           // If set, then the diff-data of localized records is not saved automatically when updated but requires that a translator clicks the special finish_translation/save/close button that becomes available.
                'versionNumberInFilename' => FALSE,                                     // <p>Boolean: If TRUE, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)</p><p>If FALSE the filemtime will be appended as a query-string.</p>
-               'spriteIconGenerator_handler' => 'TYPO3\\CMS\\Backend\\Sprite\\SimpleSpriteHandler',            // String: Used to register own/other spriteGenerating Handler, they have to implement the interface \TYPO3\CMS\Backend\Sprite\SpriteIconGeneratorInterface. If set to "\TYPO3\CMS\Backend\Sprite\SpriteBuildingHandler" icons from extensions will automatically merged into sprites.
+               'spriteIconGenerator_handler' => \TYPO3\CMS\Backend\Sprite\SimpleSpriteHandler::class,          // String: Used to register own/other spriteGenerating Handler, they have to implement the interface \TYPO3\CMS\Backend\Sprite\SpriteIconGeneratorInterface. If set to "\TYPO3\CMS\Backend\Sprite\SpriteBuildingHandler" icons from extensions will automatically merged into sprites.
                'debug' => FALSE,                                                                       // Boolean: If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!
                'AJAX' => array(                                                                        // array of key-value pairs for a unified use of AJAX calls in the TYPO3 backend. Keys are the unique ajaxIDs where the value will be resolved to call a method in an object. See ajax.php for more information.
                        'SC_alt_db_navframe::expandCollapse' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Controller\\PageTreeNavigationController->ajaxExpandCollapse',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Controller\PageTreeNavigationController::class . '->ajaxExpandCollapse',
                                'csrfTokenCheck' => TRUE
                        ),
                        'SC_alt_file_navframe::expandCollapse' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Controller\\FileSystemNavigationFrameController->ajaxExpandCollapse',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController::class . '->ajaxExpandCollapse',
                                'csrfTokenCheck' => TRUE
                        ),
                        'TYPO3_tcefile::process' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Controller\\File\\FileController->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Controller\File\FileController::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        't3lib_TCEforms_inline::createNewRecord' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Form\Element\InlineElement::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        't3lib_TCEforms_inline::getRecordDetails' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Form\Element\InlineElement::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        't3lib_TCEforms_inline::synchronizeLocalizeRecords' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Form\Element\InlineElement::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        't3lib_TCEforms_inline::setExpandedCollapsedState' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Form\\Element\\InlineElement->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Form\Element\InlineElement::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        't3lib_TCEforms_suggest::searchRecord' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Form\\Element\\SuggestElement->processAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Form\Element\SuggestElement::class . '->processAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ShortcutMenu::getShortcutEditForm' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Backend\\ToolbarItems\\ShortcutToolbarItem->getAjaxShortcutEditForm',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Backend\ToolbarItems\ShortcutToolbarItem::class . '->getAjaxShortcutEditForm',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ShortcutMenu::saveShortcut' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Backend\\ToolbarItems\\ShortcutToolbarItem->setAjaxShortcut',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Backend\ToolbarItems\ShortcutToolbarItem::class . '->setAjaxShortcut',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ShortcutMenu::render' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Backend\\ToolbarItems\\ShortcutToolbarItem->renderAjaxMenu',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Backend\ToolbarItems\ShortcutToolbarItem::class . '->renderAjaxMenu',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ShortcutMenu::delete' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Backend\\ToolbarItems\\ShortcutToolbarItem->deleteAjaxShortcut',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Backend\ToolbarItems\ShortcutToolbarItem::class . '->deleteAjaxShortcut',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ShortcutMenu::create' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Backend\\ToolbarItems\\ShortcutToolbarItem->createAjaxShortcut',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Backend\ToolbarItems\ShortcutToolbarItem::class . '->createAjaxShortcut',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ModuleMenu::reload' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Controller\\BackendController->getModuleMenuForReload',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Controller\BackendController::class . '->getModuleMenuForReload',
                                'csrfTokenCheck' => TRUE
                        ),
                        'BackendLogin::login' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\AjaxLoginHandler->login',
+                               'callbackMethod' => \TYPO3\CMS\Backend\AjaxLoginHandler::class . '->login',
                                // Needs to be unprotected
                                'csrfTokenCheck' => FALSE
                        ),
                        'BackendLogin::logout' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\AjaxLoginHandler->logout',
+                               'callbackMethod' => \TYPO3\CMS\Backend\AjaxLoginHandler::class . '->logout',
                                // Needs to be unprotected
                                'csrfTokenCheck' => FALSE
                        ),
                        'BackendLogin::refreshLogin' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\AjaxLoginHandler->refreshLogin',
+                               'callbackMethod' => \TYPO3\CMS\Backend\AjaxLoginHandler::class . '->refreshLogin',
                                // Needs to be unprotected
                                'csrfTokenCheck' => FALSE
                        ),
                        'BackendLogin::isTimedOut' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\AjaxLoginHandler->isTimedOut',
+                               'callbackMethod' => \TYPO3\CMS\Backend\AjaxLoginHandler::class . '->isTimedOut',
                                // Needs to be unprotected
                                'csrfTokenCheck' => FALSE
                        ),
                        'BackendLogin::getChallenge' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\AjaxLoginHandler->getChallenge',
+                               'callbackMethod' => \TYPO3\CMS\Backend\AjaxLoginHandler::class . '->getChallenge',
                                // Needs to be unprotected
                                'csrfTokenCheck' => FALSE
                        ),
                        'ExtDirect::getAPI' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Core\\ExtDirect\\ExtDirectApi->getAPI',
+                               'callbackMethod' => \TYPO3\CMS\Core\ExtDirect\ExtDirectApi::class . '->getAPI',
                                // No need to be CSRF protected
                                'csrfTokenCheck' => FALSE
                        ),
                        'ExtDirect::route' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Core\\ExtDirect\\ExtDirectRouter->route',
+                               'callbackMethod' => \TYPO3\CMS\Core\ExtDirect\ExtDirectRouter::class . '->route',
                                // All ExtJS calls are CSRF protected with another token
                                'csrfTokenCheck' => FALSE
                        ),
                        'DocumentTemplate::getFlashMessages' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Template\\DocumentTemplate->renderFlashMessages',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Template\DocumentTemplate::class . '->renderFlashMessages',
                                'csrfTokenCheck' => TRUE
                        ),
                        'ContextMenu::load' => array(
-                               'callbackMethod' => 'TYPO3\\CMS\\Backend\\Controller\\ClickMenuController->printContentForAjaxRequest',
+                               'callbackMethod' => \TYPO3\CMS\Backend\Controller\ClickMenuController::class . '->printContentForAjaxRequest',
                                'csrfTokenCheck' => TRUE
                        ),
                ),
@@ -799,7 +799,7 @@ return array(
        'LOG' => array(
                'writerConfiguration' => array(
                        \TYPO3\CMS\Core\Log\LogLevel::DEBUG => array(
-                               'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => array(
+                               \TYPO3\CMS\Core\Log\Writer\FileWriter::class => array(
                                        'logFile' => 'typo3temp/logs/typo3.log'
                                )
                        )
@@ -807,7 +807,7 @@ return array(
                'deprecated' => array(
                        'writerConfiguration' => array(
                                \TYPO3\CMS\Core\Log\LogLevel::WARNING => array(
-                                       'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => array(
+                                       \TYPO3\CMS\Core\Log\Writer\FileWriter::class => array(
                                                'logFile' => 'typo3conf/deprecation.log'
                                        )
                                )
@@ -820,16 +820,16 @@ return array(
                // Here you can more or less freely define additional configuration for scripts in TYPO3. Of course the features supported depends on the script. See documentation "Inside TYPO3" for examples. Keys in the array are the relative path of a script (for output scripts it should be the "script ID" as found in a comment in the HTML header ) and values can then be anything that scripts wants to define for itself. The key "GLOBAL" is reserved.
                'GLOBAL' => array(
                        'softRefParser' => array(
-                               'substitute' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'notify' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'images' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'typolink' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'typolink_tag' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'TSconfig' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'TStemplate' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'ext_fileref' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'email' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
-                               'url' => 'TYPO3\\CMS\\Core\\Database\\SoftReferenceIndex',
+                               'substitute' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'notify' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'images' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'typolink' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'typolink_tag' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'TSconfig' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'TStemplate' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'ext_fileref' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'email' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
+                               'url' => \TYPO3\CMS\Core\Database\SoftReferenceIndex::class,
                        ),
                        'softRefParser_GL' => array(),
                        // Global soft reference parsers
index d9b51fb..ca8b48a 100644 (file)
@@ -18,14 +18,14 @@ return array(
                        'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
                        'saltedpasswords' => serialize(array(
                                'BE.' => array(
-                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'saltedPWHashingMethod' => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class,
                                        'forceSalted' => 0,
                                        'onlyAuthService' => 0,
                                        'updatePasswd' => 1,
                                ),
                                'FE.' => array(
                                        'enabled' => 1,
-                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'saltedPWHashingMethod' => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class,
                                        'forceSalted' => 0,
                                        'onlyAuthService' => 0,
                                        'updatePasswd' => 1,
index 1bb566f..92a5085 100644 (file)
@@ -797,7 +797,7 @@ return array(
                                        array('', ''),
                                        array('LLL:EXT:cms/locallang_tca.xlf:pages.backend_layout.none', -1)
                                ),
-                               'itemsProcFunc' => 'TYPO3\\CMS\\Backend\\View\\BackendLayoutView->addBackendLayoutItems',
+                               'itemsProcFunc' => \TYPO3\CMS\Backend\View\BackendLayoutView::class . '->addBackendLayoutItems',
                                'selicon_cols' => 5,
                                'size' => 1,
                                'maxitems' => 1,
@@ -812,7 +812,7 @@ return array(
                                        array('', ''),
                                        array('LLL:EXT:cms/locallang_tca.xlf:pages.backend_layout.none', -1)
                                ),
-                               'itemsProcFunc' => 'TYPO3\\CMS\\Backend\\View\\BackendLayoutView->addBackendLayoutItems',
+                               'itemsProcFunc' => \TYPO3\CMS\Backend\View\BackendLayoutView::class . '->addBackendLayoutItems',
                                'selicon_cols' => 5,
                                'size' => 1,
                                'maxitems' => 1,
index 7e9ec4f..e41b14f 100644 (file)
@@ -1,4 +1,4 @@
 <?php
 return array(
-       't3lib_extMgm' => 'TYPO3\\CMS\\Core\\Utility\\ExtensionManagementUtility',
+       't3lib_extMgm' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::class,
 );
index ae799be..81b1c76 100644 (file)
@@ -56,7 +56,7 @@ class PackageFactory {
                                throw new \TYPO3\Flow\Package\Exception\CorruptPackageException(sprintf('The package "%s" does not contain a valid package class. Check if the file "%s" really contains a class called "%s".', $packageKey, $packageClassPathAndFilename, $packageClassName), 1327587091);
                        }
                } else {
-                       $packageClassName = 'TYPO3\Flow\Package\Package';
+                       $packageClassName = \TYPO3\Flow\Package\Package::class;
                }
                $packagePath = Files::concatenatePaths(array($packagesBasePath, $packagePath)) . '/';
 
index 4b89fcc..1afaaaf 100644 (file)
@@ -120,7 +120,7 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase {
 
                eval(
                        $abstractModifier . 'class ' . $accessibleClassName .
-                               ' extends ' . $className . ' implements \TYPO3\CMS\Core\Tests\AccessibleObjectInterface {' .
+                               ' extends ' . $className . ' implements ' . \TYPO3\CMS\Core\Tests\AccessibleObjectInterface::class . ' {' .
                                        'public function _call($methodName) {' .
                                                'if ($methodName === \'\') {' .
                                                        'throw new \InvalidArgumentException(\'$methodName must not be empty.\', 1334663993);' .
index 2e57fa4..0e4deab 100644 (file)
@@ -120,7 +120,7 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         * @return void
         */
        public function getCollectedRecordsReturnsEmptyRecordSet() {
-               $method = new \ReflectionMethod('TYPO3\\CMS\\Core\\Category\\Collection\\CategoryCollection', 'getCollectedRecords');
+               $method = new \ReflectionMethod(\TYPO3\CMS\Core\Category\Collection\CategoryCollection::class, 'getCollectedRecords');
                $method->setAccessible(TRUE);
                $records = $method->invoke($this->fixture);
                $this->assertInternalType('array', $records);
index bea1993..a031af4 100644 (file)
@@ -28,7 +28,7 @@ class ContentController extends AbstractController {
        /**
         * @var string
         */
-       protected $defaultViewObjectName = 'TYPO3\\CMS\\Extbase\\Mvc\\View\\JsonView';
+       protected $defaultViewObjectName = \TYPO3\CMS\Extbase\Mvc\View\JsonView::class;
 
        /**
         * @return void
index 842b7c4..5cc880f 100644 (file)
@@ -28,7 +28,7 @@ class QueueController extends AbstractController {
        /**
         * @var string
         */
-       protected $defaultViewObjectName = 'TYPO3\\CMS\\Extbase\\Mvc\\View\\JsonView';
+       protected $defaultViewObjectName = \TYPO3\CMS\Extbase\Mvc\View\JsonView::class;
 
        /**
         * @return void
index be193ec..25a7a77 100644 (file)
@@ -12,5 +12,5 @@ $GLOBALS['TYPO3_CONF_VARS']['FE']['debug'] = FALSE;
 // Register hooks for frontend test
 if (TYPO3_MODE === 'FE') {
        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['postBeUser']['FunctionalTest'] =
-               'TYPO3\\CMS\\Core\\Tests\\Functional\\Framework\\Frontend\\Hook\\BackendUserHandler->initialize';
+               \TYPO3\CMS\Core\Tests\Functional\Framework\Frontend\Hook\BackendUserHandler::class . '->initialize';
 }
index fae334e..6cdb3d2 100644 (file)
@@ -37,7 +37,7 @@ class IntegrityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function standardSingletonIsRegistered() {
                $registeredSingletons = \TYPO3\CMS\Core\Utility\GeneralUtility::getSingletonInstances();
-               $this->assertArrayHasKey('TYPO3\\CMS\\Core\\Cache\\CacheManager', $registeredSingletons);
-               $this->assertTrue($registeredSingletons['TYPO3\\CMS\\Core\\Cache\\CacheManager'] instanceof \TYPO3\CMS\Core\Cache\CacheManager);
+               $this->assertArrayHasKey(\TYPO3\CMS\Core\Cache\CacheManager::class, $registeredSingletons);
+               $this->assertTrue($registeredSingletons[\TYPO3\CMS\Core\Cache\CacheManager::class] instanceof \TYPO3\CMS\Core\Cache\CacheManager);
        }
 }
index 13a5c98..60b546b 100644 (file)
@@ -24,11 +24,11 @@ class AbstractUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         * @test
         */
        public function getAuthInfoArrayReturnsEmptyPidListIfNoCheckPidValueIsGiven() {
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array('cleanIntList'));
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('cleanIntList'));
                $GLOBALS['TYPO3_DB']->expects($this->never())->method('cleanIntList');
 
                /** @var $mock \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication */
-               $mock = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication', array('dummy'));
+               $mock = $this->getMock(\TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, array('dummy'));
                $mock->checkPid = TRUE;
                $mock->checkPid_value = NULL;
                $result = $mock->getAuthInfoArray();
index 02de2c8..8978f5f 100644 (file)
@@ -62,7 +62,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function logoffCleansFormProtectionIfBackendUserIsLoggedIn() {
                $formProtection = $this->getMock(
-                       'TYPO3\\CMS\\Core\\FormProtection\\BackendFormProtection',
+                       \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class,
                        array('clean'),
                        array(),
                        '',
@@ -71,16 +71,16 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $formProtection->expects($this->once())->method('clean');
 
                \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::set(
-                       'TYPO3\\CMS\\Core\\FormProtection\\BackendFormProtection',
+                       \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class,
                        $formProtection
                );
 
                // logoff() call the static factory that has a dependency to a valid BE_USER object. Mock this away
-               $GLOBALS['BE_USER'] = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array(), array(), '', FALSE);
+               $GLOBALS['BE_USER'] = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array(), array(), '', FALSE);
                $GLOBALS['BE_USER']->user = array('uid' => uniqid());
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
 
-               $subject = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('dummy'), array(), '', FALSE);
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('dummy'), array(), '', FALSE);
                $subject->_set('db', $GLOBALS['TYPO3_DB']);
                $subject->logoff();
        }
@@ -230,7 +230,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getTSConfigReturnsCorrectArrayForGivenObjectString(array $completeConfiguration, $objectString, array $expectedConfiguration) {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('dummy'), array(), '', FALSE);
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('dummy'), array(), '', FALSE);
                $subject->userTS = $completeConfiguration;
 
                $actualConfiguration = $subject->getTSConfig($objectString);
@@ -296,7 +296,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider getFilePermissionsTakesUserDefaultAndStoragePermissionsIntoAccountIfUserIsNotAdminDataProvider
         */
        public function getFilePermissionsTakesUserDefaultPermissionsFromTsConfigIntoAccountIfUserIsNotAdmin(array $userTsConfiguration) {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('isAdmin'));
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('isAdmin'));
 
                $subject
                        ->expects($this->any())
@@ -433,8 +433,8 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider getFilePermissionsFromStorageDataProvider
         */
        public function getFilePermissionsFromStorageOverwritesDefaultPermissions(array $defaultPermissions, $storageUid, array $storagePermissions, array $expectedPermissions) {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('isAdmin', 'getFilePermissions'));
-               $storageMock = $this->getMock('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', array(), array(), '', FALSE);
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('isAdmin', 'getFilePermissions'));
+               $storageMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', FALSE);
                $storageMock->expects($this->any())->method('getUid')->will($this->returnValue($storageUid));
 
                $subject
@@ -468,8 +468,8 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider getFilePermissionsFromStorageDataProvider
         */
        public function getFilePermissionsFromStorageAlwaysReturnsDefaultPermissionsForAdmins(array $defaultPermissions, $storageUid, array $storagePermissions) {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('isAdmin', 'getFilePermissions'));
-               $storageMock = $this->getMock('TYPO3\\CMS\\Core\\Resource\\ResourceStorage', array(), array(), '', FALSE);
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('isAdmin', 'getFilePermissions'));
+               $storageMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', FALSE);
                $storageMock->expects($this->any())->method('getUid')->will($this->returnValue($storageUid));
 
                $subject
@@ -634,7 +634,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider getFilePermissionsTakesUserDefaultPermissionsFromRecordIntoAccountIfUserIsNotAdminDataProvider
         */
        public function getFilePermissionsTakesUserDefaultPermissionsFromRecordIntoAccountIfUserIsNotAdmin($permissionValue, $expectedPermissions) {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('isAdmin'));
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('isAdmin'));
 
                $subject
                        ->expects($this->any())
@@ -650,7 +650,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getFilePermissionsGrantsAllPermissionsToAdminUsers() {
-               $subject = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication', array('isAdmin'));
+               $subject = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array('isAdmin'));
 
                $subject
                        ->expects($this->any())
index a1b7fe4..13ac4b9 100644 (file)
@@ -137,14 +137,14 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCacheIsSettingIdentifierPrefixWithCacheIdentifier() {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cacheMock */
-               $cacheMock = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $cacheMock->expects($this->any())->method('getIdentifier')->will($this->returnValue(
                        'testidentifier'
                ));
 
                /** @var $backendMock \PHPUnit_Framework_MockObject_MockObject|ApcBackend */
                $backendMock = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\Backend\\ApcBackend',
+                       \TYPO3\CMS\Core\Cache\Backend\ApcBackend::class,
                        array('setIdentifierPrefix','getCurrentUserData','getPathSite'),
                        array('testcontext')
                );
@@ -217,13 +217,13 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushRemovesOnlyOwnEntries() {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-               $thisCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
                $thisBackend = new ApcBackend('Testing');
                $thisBackend->setCache($thisCache);
 
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-               $thatCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
                $thatBackend = new ApcBackend('Testing');
                $thatBackend->setCache($thatCache);
@@ -277,7 +277,7 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        protected function setUpBackend($accessible = FALSE) {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                if ($accessible) {
                        $accessibleClassName = $this->buildAccessibleProxy('\\TYPO3\\CMS\\Core\\Cache\\Backend\\ApcBackend');
                        $backend = new $accessibleClassName('Testing');
index 9f4be4e..9fc78e6 100644 (file)
@@ -46,9 +46,9 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Core\Cache\Exception
         */
        public function setCacheDirectoryThrowsExceptionOnNonWritableDirectory() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('http://localhost/');
 
                $backend->setCache($mockCache);
@@ -58,10 +58,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getCacheDirectoryReturnsTheCurrentCacheDirectory() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('SomeCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -72,10 +72,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function aDedicatedCacheDirectoryIsUsedForCodeCaches() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\PhpFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('SomeCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -87,9 +87,9 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
         */
        public function setThrowsExceptionIfDataIsNotAString() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -100,14 +100,14 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setReallySavesToTheSpecifiedDirectory() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
                $data = 'some data' . microtime();
                $entryIdentifier = 'BackendFileTest';
                $pathAndFilename = 'vfs://Foo/Cache/Data/UnitTestCache/' . $entryIdentifier;
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -122,14 +122,14 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setOverwritesAnAlreadyExistingCacheEntryForTheSameIdentifier() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
                $data1 = 'some data' . microtime();
                $data2 = 'some data' . microtime();
                $entryIdentifier = 'BackendFileRemoveBeforeSetTest';
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -146,13 +146,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setAlsoSavesSpecifiedTags() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
                $data = 'some data' . microtime();
                $entryIdentifier = 'BackendFileRemoveBeforeSetTest';
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -168,13 +168,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setCacheDetectsAndLoadsAFrozenCache() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
                $data = 'some data' . microtime();
                $entryIdentifier = 'BackendFileTest';
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -184,7 +184,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                unset($backend);
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -196,10 +196,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getReturnsContentOfTheCorrectCacheFile() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('setTag'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('setTag'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -219,10 +219,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getReturnsFalseForExpiredEntries() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->expects($this->once())->method('isCacheFileExpired')->with('vfs://Foo/Cache/Data/UnitTestCache/ExpiredEntry')->will($this->returnValue(TRUE));
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
@@ -234,10 +234,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getDoesNotCheckIfAnEntryIsExpiredIfTheCacheIsFrozen() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -253,10 +253,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasReturnsTrueIfAnEntryExists() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -273,7 +273,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasReturnsFalseForExpiredEntries() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->expects($this->exactly(2))->method('isCacheFileExpired')->will($this->onConsecutiveCalls(TRUE, FALSE));
 
                $this->assertFalse($backend->has('foo'));
@@ -284,10 +284,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasDoesNotCheckIfAnEntryIsExpiredIfTheCacheIsFrozen() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -303,14 +303,14 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function removeReallyRemovesACacheEntry() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
                $data = 'some data' . microtime();
                $entryIdentifier = 'BackendFileTest';
                $pathAndFilename = 'vfs://Foo/Cache/Data/UnitTestCache/' . $entryIdentifier;
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -346,10 +346,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function setThrowsExceptionForInvalidIdentifier($identifier) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array('test'), '', TRUE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array('test'), '', TRUE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -362,10 +362,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function getThrowsExceptionForInvalidIdentifier($identifier) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -378,7 +378,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function hasThrowsExceptionForInvalidIdentifier($identifier) {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
 
                $backend->has($identifier);
        }
@@ -389,10 +389,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function removeThrowsExceptionForInvalidIdentifier($identifier) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -405,10 +405,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function requireOnceThrowsExceptionForInvalidIdentifier($identifier) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -419,10 +419,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function requireOnceIncludesAndReturnsResultOfIncludedPhpFile() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -439,10 +439,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function requireOnceDoesNotCheckExpiryTimeIfBackendIsFrozen() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-                               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+                               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -461,10 +461,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -484,10 +484,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function findIdentifiersByTagDoesNotReturnExpiredEntries() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -504,10 +504,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushRemovesAllCacheEntries() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -528,10 +528,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushCreatesCacheDirectoryAgain() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
@@ -543,7 +543,7 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushByTagRemovesCacheEntriesWithSpecifiedTag() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('findIdentifiersByTag', 'remove'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('findIdentifiersByTag', 'remove'), array(), '', FALSE);
 
                $backend->expects($this->once())->method('findIdentifiersByTag')->with('UnitTestTag%special')->will($this->returnValue(array('foo', 'bar', 'baz')));
                $backend->expects($this->at(1))->method('remove')->with('foo');
@@ -557,10 +557,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function collectGarbageRemovesExpiredCacheEntries() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('isCacheFileExpired'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', FALSE);
                $backend->expects($this->exactly(2))->method('isCacheFileExpired')->will($this->onConsecutiveCalls(TRUE, FALSE));
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
@@ -581,10 +581,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushUnfreezesTheCache() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', array('dummy'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', FALSE);
                $backend->setCacheDirectory('vfs://Foo/');
                $backend->setCache($mockCache);
 
index d781012..1cc66ea 100644 (file)
@@ -199,14 +199,14 @@ class MemcachedBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function flushRemovesOnlyOwnEntries() {
                $backendOptions = array('servers' => array('localhost:11211'));
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-               $thisCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
                $thisBackend = new MemcachedBackend('Testing', $backendOptions);
                $thisBackend->setCache($thisCache);
                $thisBackend->initializeObject();
 
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-               $thatCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
                $thatBackend = new MemcachedBackend('Testing', $backendOptions);
                $thatBackend->setCache($thatCache);
@@ -263,7 +263,7 @@ class MemcachedBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        protected function setUpBackend(array $backendOptions = array(), $accessible = FALSE) {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                if ($backendOptions == array()) {
                        $backendOptions = array('servers' => array('localhost:11211'));
                }
index 6be767c..3d745a0 100644 (file)
@@ -183,11 +183,11 @@ class PdoBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushRemovesOnlyOwnEntries() {
-               $thisCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
                $thisBackend = $this->setUpBackend();
                $thisBackend->setCache($thisCache);
-               $thatCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
                $thatBackend = $this->setUpBackend();
                $thatBackend->setCache($thatCache);
@@ -241,7 +241,7 @@ class PdoBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return \TYPO3\CMS\Core\Cache\Backend\PdoBackend
         */
        protected function setUpBackend() {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('TestCache'));
                $backend = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Backend\PdoBackend::class, 'Testing');
                $backend->setCache($mockCache);
index e040d39..891fbf4 100644 (file)
@@ -67,7 +67,7 @@ class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @param array $backendOptions Options for the redis backend
         */
        protected function setUpBackend(array $backendOptions = array()) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('TestCache'));
                $this->backend = new \TYPO3\CMS\Core\Cache\Backend\RedisBackend('Testing', $backendOptions);
                $this->backend->setCache($mockCache);
index 8f1ce9e..0504b05 100644 (file)
@@ -38,7 +38,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function itIsPossibleToSetAndCheckExistenceInCache() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'Some data';
@@ -52,7 +52,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function itIsPossibleToSetAndGetEntry() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'Some data';
@@ -66,7 +66,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function itIsPossibleToRemoveEntryFromCache() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'Some data';
@@ -81,7 +81,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function itIsPossibleToOverwriteAnEntryInTheCache() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'Some data';
@@ -97,7 +97,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'Some data';
@@ -113,7 +113,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasReturnsFalseIfTheEntryDoesntExist() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $identifier = 'NonExistingIdentifier';
@@ -125,7 +125,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function removeReturnsFalseIfTheEntryDoesntExist() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $identifier = 'NonExistingIdentifier';
@@ -137,7 +137,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushByTagRemovesCacheEntriesWithSpecifiedTag() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'some data' . microtime();
@@ -154,7 +154,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function flushRemovesAllCacheEntries() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
                $backend->setCache($cache);
                $data = 'some data' . microtime();
index 799139b..c12b304 100644 (file)
@@ -27,7 +27,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface Mock frontend
         */
        protected function setUpMockFrontendOfBackend(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend $backend) {
-               $mockCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array(), array(), '', FALSE);
+               $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', FALSE);
                $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('Testing'));
                $backend->setCache($mockCache);
                return $mockCache;
@@ -38,7 +38,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCacheCalculatesCacheTableName() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
                $this->assertEquals('cf_Testing', $backend->getCacheTable());
        }
@@ -48,7 +48,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCacheCalculatesTagsTableName() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
                $this->assertEquals('cf_Testing_tags', $backend->getTagsTable());
        }
@@ -59,7 +59,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->set('identifier', 'data');
        }
 
@@ -69,7 +69,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setThrowsExceptionIfDataIsNotAString() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
                $data = array('Some data');
                $entryIdentifier = 'BackendDbTest';
@@ -81,9 +81,9 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setInsertsEntryInTable() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_INSERTquery')
@@ -104,9 +104,9 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setRemovesAnAlreadyExistingCacheEntryForTheSameIdentifier() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('remove'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('remove'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
 
                $backend->expects($this->once())->method('remove');
                $data = uniqid('someData');
@@ -119,9 +119,9 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setReallySavesSpecifiedTags() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_INSERTmultipleRows')
@@ -155,13 +155,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
                $backend = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend',
+                       \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
                        array('dummy'),
                        array('Testing', $backendOptions)
                );
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_INSERTquery')
@@ -183,10 +183,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setWithUnlimitedLifetimeWritesCorrectEntry() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_INSERTquery')
@@ -210,7 +210,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->get('identifier');
        }
 
@@ -219,10 +219,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getReturnsContentOfTheCorrectCacheEntry() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_SELECTgetSingleRow')
@@ -238,10 +238,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getSetsExceededLifetimeQueryPart() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_SELECTgetSingleRow')
@@ -260,7 +260,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function hasThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->has('identifier');
        }
 
@@ -269,10 +269,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function hasReturnsTrueForExistingEntry() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_SELECTcountRows')
@@ -287,10 +287,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function hasSetsExceededLifetimeQueryPart() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_SELECTcountRows')
@@ -309,7 +309,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function removeThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->remove('identifier');
        }
 
@@ -318,10 +318,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function removeReallyRemovesACacheEntry() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(0))
                        ->method('fullQuoteStr')
@@ -348,7 +348,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function collectGarbageThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->collectGarbage();
        }
 
@@ -357,10 +357,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function collectGarbageSelectsExpiredCacheEntries() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->once())
                        ->method('exec_SELECTquery')
@@ -373,10 +373,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function collectGarbageDeletesTagsFromExpiredEntries() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(1))
                        ->method('sql_fetch_assoc')
@@ -402,10 +402,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function collectGarbageDeletesExpiredEntry() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(1))
                        ->method('sql_fetch_assoc')
@@ -424,7 +424,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function findIdentifiersByTagThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->findIdentifiersByTag('identifier');
        }
 
@@ -433,10 +433,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(0))
                        ->method('fullQuoteStr')
@@ -460,7 +460,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->flush();
        }
 
@@ -469,10 +469,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushRemovesAllCacheEntries() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(0))
                        ->method('exec_TRUNCATEquery')
@@ -491,7 +491,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushByTagThrowsExceptionIfFrontendWasNotSet() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $backend->flushByTag(array());
        }
 
@@ -500,10 +500,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushByTagRemovesCacheEntriesWithSpecifiedTag() {
                /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', array('dummy'), array('Testing'));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
                $this->setUpMockFrontendOfBackend($backend);
 
-               $GLOBALS['TYPO3_DB'] = $this->getMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array(), array(), '', FALSE);
+               $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', FALSE);
                $GLOBALS['TYPO3_DB']
                        ->expects($this->at(0))
                        ->method('fullQuoteStr')
index 5792ae3..893b127 100644 (file)
@@ -178,13 +178,13 @@ class WincacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushRemovesOnlyOwnEntries() {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-               $thisCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
                $thisBackend = new WincacheBackend('Testing');
                $thisBackend->setCache($thisCache);
 
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-               $thatCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
                $thatBackend = new WincacheBackend('Testing');
                $thatBackend->setCache($thatCache);
@@ -238,7 +238,7 @@ class WincacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        protected function setUpBackend($accessible = FALSE) {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                if ($accessible) {
                        $accessibleClassName = $this->buildAccessibleProxy('\\TYPO3\\CMS\\Core\\Cache\\Backend\\WincacheBackend');
                        $backend = new $accessibleClassName('Testing');
index 79fce70..c313b8c 100644 (file)
@@ -181,13 +181,13 @@ class XcacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushRemovesOnlyOwnEntries() {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-               $thisCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
                $thisBackend = new XcacheBackend('Testing');
                $thisBackend->setCache($thisCache);
 
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-               $thatCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
                $thatBackend = new XcacheBackend('Testing');
                $thatBackend->setCache($thatCache);
@@ -241,7 +241,7 @@ class XcacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        protected function setUpBackend($accessible = FALSE) {
                /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\FrontendInterface', array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', FALSE);
                if ($accessible) {
                        $accessibleClassName = $this->buildAccessibleProxy('\\TYPO3\\CMS\\Core\\Cache\\Backend\\XcacheBackend');
                        $backend = new $accessibleClassName('Testing');
index 3ba289e..4e866d0 100644 (file)
@@ -29,9 +29,9 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function managerThrowsExceptionOnCacheRegistrationWithAlreadyExistingIdentifier() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache1 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache1 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('test'));
-               $cache2 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache2 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache2->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('test'));
                $manager->registerCache($cache1);
                $manager->registerCache($cache2);
@@ -42,9 +42,9 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function managerReturnsThePreviouslyRegisteredCache() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache1 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache1 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
-               $cache2 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache2 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache2->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache2'));
                $manager->registerCache($cache1);
                $manager->registerCache($cache2);
@@ -57,7 +57,7 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getCacheThrowsExceptionForNonExistingIdentifier() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('someidentifier'));
                $manager->registerCache($cache);
                $manager->getCache('someidentifier');
@@ -69,7 +69,7 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function hasCacheReturnsCorrectResult() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache1 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache1 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
                $manager->registerCache($cache1);
                $this->assertTrue($manager->hasCache('cache1'), 'hasCache() did not return TRUE.');
@@ -81,11 +81,11 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushCachesByTagCallsTheFlushByTagMethodOfAllRegisteredCaches() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache1 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache1 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
                $cache1->expects($this->once())->method('flushByTag')->with($this->equalTo('theTag'));
                $manager->registerCache($cache1);
-               $cache2 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache2 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache2->expects($this->once())->method('flushByTag')->with($this->equalTo('theTag'));
                $manager->registerCache($cache2);
                $manager->flushCachesByTag('theTag');
@@ -96,11 +96,11 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushCachesCallsTheFlushMethodOfAllRegisteredCaches() {
                $manager = new \TYPO3\CMS\Core\Cache\CacheManager();
-               $cache1 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache1 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
                $cache1->expects($this->once())->method('flush');
                $manager->registerCache($cache1);
-               $cache2 = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend', array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
+               $cache2 = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', FALSE);
                $cache2->expects($this->once())->method('flush');
                $manager->registerCache($cache2);
                $manager->flushCaches();
@@ -140,7 +140,7 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'options' => $backendOptions
                        )
                );
-               $factory = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheFactory', array('create'), array(), '', FALSE);
+               $factory = $this->getMock(\TYPO3\CMS\Core\Cache\CacheFactory::class, array('create'), array(), '', FALSE);
                $factory->expects($this->once())->method('create')->with($cacheIdentifier, $cacheObjectName, $backendObjectName, $backendOptions);
                $manager->injectCacheFactory($factory);
                $manager->setCacheConfigurations($configuration);
@@ -161,8 +161,8 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'options' => $backendOptions
                        )
                );
-               $factory = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheFactory', array('create'), array(), '', FALSE);
-               $factory->expects($this->once())->method('create')->with($cacheIdentifier, 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend', $backendObjectName, $backendOptions);
+               $factory = $this->getMock(\TYPO3\CMS\Core\Cache\CacheFactory::class, array('create'), array(), '', FALSE);
+               $factory->expects($this->once())->method('create')->with($cacheIdentifier, \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, $backendObjectName, $backendOptions);
                $manager->injectCacheFactory($factory);
                $manager->setCacheConfigurations($configuration);
                $manager->getCache($cacheIdentifier);
@@ -182,8 +182,8 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'options' => $backendOptions
                        )
                );
-               $factory = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheFactory', array('create'), array(), '', FALSE);
-               $factory->expects($this->once())->method('create')->with($cacheIdentifier, $cacheObjectName, 'TYPO3\\CMS\\Core\\Cache\\Backend\\Typo3DatabaseBackend', $backendOptions);
+               $factory = $this->getMock(\TYPO3\CMS\Core\Cache\CacheFactory::class, array('create'), array(), '', FALSE);
+               $factory->expects($this->once())->method('create')->with($cacheIdentifier, $cacheObjectName, \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, $backendOptions);
                $manager->injectCacheFactory($factory);
                $manager->setCacheConfigurations($configuration);
                $manager->getCache($cacheIdentifier);
@@ -203,7 +203,7 @@ class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'backend' => $backendObjectName
                        )
                );
-               $factory = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheFactory', array('create'), array(), '', FALSE);
+               $factory = $this->getMock(\TYPO3\CMS\Core\Cache\CacheFactory::class, array('create'), array(), '', FALSE);
                $factory->expects($this->once())->method('create')->with($cacheIdentifier, $cacheObjectName, $backendObjectName, array());
                $manager->injectCacheFactory($factory);
                $manager->setCacheConfigurations($configuration);
index 3bbcbb0..90bc529 100644 (file)
@@ -27,30 +27,30 @@ class FactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function createReturnsInstanceOfTheSpecifiedCacheFrontend() {
-               $mockCacheManager = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheManager', array('registerCache'), array(), '', FALSE);
+               $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', FALSE);
                $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
-               $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend', 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend');
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend', $cache);
+               $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\NullBackend::class);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, $cache);
        }
 
        /**
         * @test
         */
        public function createInjectsAnInstanceOfTheSpecifiedBackendIntoTheCacheFrontend() {
-               $mockCacheManager = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheManager', array('registerCache'), array(), '', FALSE);
+               $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', FALSE);
                $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
-               $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend', 'TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend');
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend', $cache->getBackend());
+               $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\FileBackend::class);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, $cache->getBackend());
        }
 
        /**
         * @test
         */
        public function createRegistersTheCacheAtTheCacheManager() {
-               $mockCacheManager = $this->getMock('TYPO3\\CMS\\Core\\Cache\\CacheManager', array('registerCache'), array(), '', FALSE);
+               $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', FALSE);
                $mockCacheManager->expects($this->once())->method('registerCache');
                $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
-               $factory->create('TYPO3_Cache_FactoryTest_Cache', 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend', 'TYPO3\\CMS\\Core\\Cache\\Backend\\FileBackend');
+               $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\FileBackend::class);
        }
 
 }
index 6eade0c..8fda925 100644 (file)
@@ -27,9 +27,9 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function theConstructorAcceptsValidIdentifiers() {
-               $mockBackend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                foreach (array('x', 'someValue', '123fivesixseveneight', 'some&', 'ab_cd%', rawurlencode('resource://some/äöü$&% sadf'), str_repeat('x', 250)) as $identifier) {
-                       $abstractCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
+                       $abstractCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
                }
        }
 
@@ -37,10 +37,10 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function theConstructorRejectsInvalidIdentifiers() {
-               $mockBackend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $identifier) {
                        try {
-                               $abstractCache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
+                               $abstractCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
                                $this->fail('Identifier "' . $identifier . '" was not rejected.');
                        } catch (\InvalidArgumentException $exception) {
 
@@ -53,9 +53,9 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushCallsBackend() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('flush');
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                $cache->flush();
        }
 
@@ -65,9 +65,9 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function flushByTagRejectsInvalidTags() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\BackendInterface', array(), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\BackendInterface::class, array(), array(), '', FALSE);
                $backend->expects($this->never())->method('flushByTag');
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                $cache->flushByTag('SomeInvalid\\Tag');
        }
 
@@ -77,9 +77,9 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function flushByTagCallsBackendIfItIsATaggableBackend() {
                $tag = 'sometag';
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\TaggableBackendInterface', array('setCache', 'get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class, array('setCache', 'get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('flushByTag')->with($tag);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                $cache->flushByTag($tag);
        }
 
@@ -88,9 +88,9 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function collectGarbageCallsBackend() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('collectGarbage');
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                $cache->collectGarbage();
        }
 
@@ -99,8 +99,8 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getClassTagRendersTagWhichCanBeUsedToTagACacheEntryWithACertainClass() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                $this->assertEquals('%CLASS%F3_Foo_Bar_Baz', \TYPO3\CMS\Core\Cache\CacheManager::getClassTag('F3\\Foo\\Bar\\Baz'));
        }
 
@@ -109,8 +109,8 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function invalidEntryIdentifiersAreRecognizedAsInvalid() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array(), array(), '', FALSE);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $entryIdentifier) {
                        $this->assertFalse($cache->isValidEntryIdentifier($entryIdentifier), 'Invalid identifier "' . $entryIdentifier . '" was not rejected.');
                }
@@ -121,8 +121,8 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function validEntryIdentifiersAreRecognizedAsValid() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array(), array(), '', FALSE);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                foreach (array('_', 'abcdef', 'foo', 'bar123', '3some', '_bl_a', 'some&', 'one%TWO', str_repeat('x', 250)) as $entryIdentifier) {
                        $this->assertTrue($cache->isValidEntryIdentifier($entryIdentifier), 'Valid identifier "' . $entryIdentifier . '" was not accepted.');
                }
@@ -133,8 +133,8 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function invalidTagsAreRecognizedAsInvalid() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array(), array(), '', FALSE);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $tag) {
                        $this->assertFalse($cache->isValidTag($tag), 'Invalid tag "' . $tag . '" was not rejected.');
                }
@@ -145,8 +145,8 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function validTagsAreRecognizedAsValid() {
                $identifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array(), array(), '', FALSE);
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
                foreach (array('abcdef', 'foo-bar', 'foo_baar', 'bar123', '3some', 'file%Thing', 'some&', '%x%', str_repeat('x', 250)) as $tag) {
                        $this->assertTrue($cache->isValidTag($tag), 'Valid tag "' . $tag . '" was not accepted.');
                }
index c928515..a3c972d 100644 (file)
@@ -28,7 +28,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function setChecksIfTheIdentifierIsValid() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('isValidEntryIdentifier'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', FALSE);
                $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(FALSE));
                $cache->set('foo', 'bar');
        }
@@ -39,7 +39,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function setPassesPhpSourceCodeTagsAndLifetimeToBackend() {
                $originalSourceCode = 'return "hello world!";';
                $modifiedSourceCode = '<?php' . chr(10) . $originalSourceCode . chr(10) . '#';
-               $mockBackend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\PhpCapableBackendInterface', array(), array(), '', FALSE);
+               $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class, array(), array(), '', FALSE);
                $mockBackend->expects($this->once())->method('set')->with('Foo-Bar', $modifiedSourceCode, array('tags'), 1234);
                $cache = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, 'PhpFrontend', $mockBackend);
                $cache->set('Foo-Bar', $originalSourceCode, array('tags'), 1234);
@@ -50,7 +50,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
         */
        public function setThrowsInvalidDataExceptionOnNonStringValues() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\PhpFrontend', array('dummy'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array('dummy'), array(), '', FALSE);
                $cache->set('Foo-Bar', array());
        }
 
@@ -58,7 +58,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function requireOnceCallsTheBackendsRequireOnceMethod() {
-               $mockBackend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\PhpCapableBackendInterface', array(), array(), '', FALSE);
+               $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class, array(), array(), '', FALSE);
                $mockBackend->expects($this->once())->method('requireOnce')->with('Foo-Bar')->will($this->returnValue('hello world!'));
                $cache = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, 'PhpFrontend', $mockBackend);
                $result = $cache->requireOnce('Foo-Bar');
index 8a18796..311bf96 100644 (file)
@@ -28,7 +28,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setChecksIfTheIdentifierIsValid() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('isValidEntryIdentifier'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', FALSE);
                $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(FALSE));
                $cache->set('foo', 'bar');
        }
@@ -38,7 +38,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPassesStringToBackend() {
                $theString = 'Just some value';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $cache->set('StringCacheTest', $theString);
@@ -50,7 +50,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function setPassesLifetimeToBackend() {
                $theString = 'Just some value';
                $theLifetime = 1234;
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString), $this->equalTo(array()), $this->equalTo($theLifetime));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $cache->set('StringCacheTest', $theString, array(), $theLifetime);
@@ -61,7 +61,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
         */
        public function setThrowsInvalidDataExceptionOnNonStringValues() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $cache->set('StringCacheTest', array());
        }
@@ -70,7 +70,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getFetchesStringValueFromBackend() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('get')->will($this->returnValue('Just some value'));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $this->assertEquals('Just some value', $cache->get('StringCacheTest'), 'The returned value was not the expected string.');
@@ -80,7 +80,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasReturnsResultFromBackend() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('has')->with($this->equalTo('StringCacheTest'))->will($this->returnValue(TRUE));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $this->assertTrue($cache->has('StringCacheTest'), 'has() did not return TRUE.');
@@ -91,7 +91,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function removeCallsBackend() {
                $cacheIdentifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('remove')->with($this->equalTo($cacheIdentifier))->will($this->returnValue(TRUE));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $this->assertTrue($cache->remove($cacheIdentifier), 'remove() did not return TRUE');
@@ -102,7 +102,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function getByTagRejectsInvalidTags() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\BackendInterface', array(), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\BackendInterface::class, array(), array(), '', FALSE);
                $backend->expects($this->never())->method('getByTag');
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
                $cache->getByTag('SomeInvalid\\Tag');
@@ -115,7 +115,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $tag = 'sometag';
                $identifiers = array('one', 'two');
                $entries = array('one value', 'two value');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('findIdentifiersByTag')->with($this->equalTo($tag))->will($this->returnValue($identifiers));
                $backend->expects($this->exactly(2))->method('get')->will($this->onConsecutiveCalls('one value', 'two value'));
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
index 087bdb9..156df12 100644 (file)
@@ -28,7 +28,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setChecksIfTheIdentifierIsValid() {
-               $cache = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend', array('isValidEntryIdentifier'), array(), '', FALSE);
+               $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', FALSE);
                $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(FALSE));
                $cache->set('foo', 'bar');
        }
@@ -38,7 +38,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPassesSerializedStringToBackend() {
                $theString = 'Just some value';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theString)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -50,7 +50,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPassesSerializedArrayToBackend() {
                $theArray = array('Just some value', 'and another one.');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theArray)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -63,7 +63,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function setPassesLifetimeToBackend() {
                $theString = 'Just some value';
                $theLifetime = 1234;
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theString)), $this->equalTo(array()), $this->equalTo($theLifetime));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -79,7 +79,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
 
                $theString = 'Just some value';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(igbinary_serialize($theString)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -91,7 +91,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getFetchesStringValueFromBackend() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('get')->will($this->returnValue(serialize('Just some value')));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -103,7 +103,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getFetchesArrayValueFromBackend() {
                $theArray = array('Just some value', 'and another one.');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('get')->will($this->returnValue(serialize($theArray)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -114,7 +114,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getFetchesFalseBooleanValueFromBackend() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('get')->will($this->returnValue(serialize(FALSE)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -130,7 +130,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
 
                $theArray = array('Just some value', 'and another one.');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('get')->will($this->returnValue(igbinary_serialize($theArray)));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -143,7 +143,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasReturnsResultFromBackend() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
                $backend->expects($this->once())->method('has')->with($this->equalTo('VariableCacheTest'))->will($this->returnValue(TRUE));
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -155,7 +155,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function removeCallsBackend() {
                $cacheIdentifier = 'someCacheIdentifier';
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
 
                $backend->expects($this->once())->method('remove')->with($this->equalTo($cacheIdentifier))->will($this->returnValue(TRUE));
 
@@ -168,7 +168,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function getByTagRejectsInvalidTags() {
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\BackendInterface', array(), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\BackendInterface::class, array(), array(), '', FALSE);
                $backend->expects($this->never())->method('getByTag');
 
                $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -182,7 +182,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $tag = 'sometag';
                $identifiers = array('one', 'two');
                $entries = array('one value', 'two value');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
 
                $backend->expects($this->once())->method('findIdentifiersByTag')->with($this->equalTo($tag))->will($this->returnValue($identifiers));
                $backend->expects($this->exactly(2))->method('get')->will($this->onConsecutiveCalls(serialize('one value'), serialize('two value')));
@@ -202,7 +202,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $tag = 'sometag';
                $identifiers = array('one', 'two');
                $entries = array('one value', 'two value');
-               $backend = $this->getMock('TYPO3\\CMS\\Core\\Cache\\Backend\\AbstractBackend', array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
+               $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', FALSE);
 
                $backend->expects($this->once())->method('findIdentifiersByTag')->with($this->equalTo($tag))->will($this->returnValue($identifiers));
                $backend->expects($this->exactly(2))->method('get')->will($this->onConsecutiveCalls(igbinary_serialize('one value'), igbinary_serialize('two value')));
index c23b940..eafa03e 100644 (file)
@@ -51,10 +51,10 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         */
        protected function setUp() {
                $this->databaseMock = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Database\\DatabaseConnection',
+                       \TYPO3\CMS\Core\Database\DatabaseConnection::class,
                        array('exec_UPDATEquery', 'exec_SELECTgetSingleRow', 'exec_SELECTgetRows', 'fullQuoteStr')
                );
-               $this->fixture = $this->getMock('TYPO3\\CMS\\Core\\Collection\\RecordCollectionRepository', array('getDatabaseConnection'));
+               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Collection\RecordCollectionRepository::class, array('getDatabaseConnection'));
                $this->fixture->expects($this->any())->method('getDatabaseConnection')->will($this->returnValue($this->databaseMock));
                $this->testTableName = uniqid('tx_testtable');
        }
@@ -82,7 +82,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        'table_name' => $this->testTableName
                );
                $object = $this->fixture->findByUid($testUid);
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $object);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $object);
        }
 
        /**
@@ -123,8 +123,8 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                );
                $objects = $this->fixture->findByType($type);
                $this->assertEquals(2, count($objects));
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[0]);
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[1]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
        }
 
        /**
@@ -152,8 +152,8 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                );
                $objects = $this->fixture->findByTableName($testTable);
                $this->assertEquals(2, count($objects));
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[0]);
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[1]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
        }
 
        /**
@@ -182,8 +182,8 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                );
                $objects = $this->fixture->findByTypeAndTableName($type, $testTable);
                $this->assertEquals(2, count($objects));
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[0]);
-               $this->assertInstanceOf('TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection', $objects[1]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
        }
 
        /**
index db9d2d8..c0b1df5 100644 (file)
@@ -40,7 +40,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        protected function createFixtureWithMockedMethods(array $methods) {
                $this->fixture = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager',
+                       \TYPO3\CMS\Core\Configuration\ConfigurationManager::class,
                        $methods
                );
        }
@@ -355,7 +355,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Not available on Windows');
                }
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $directory = 'typo3temp/' . uniqid('test_');
                $absoluteDirectory = PATH_site . $directory;
@@ -383,7 +383,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Not available on Windows');
                }
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $file = 'typo3temp/' . uniqid('test_');
                $absoluteFile = PATH_site . $file;
@@ -406,7 +406,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function canWriteConfigurationReturnsTrueIfDirectoryAndFilesAreWritable() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $directory = 'typo3temp/' . uniqid('test_');
                $absoluteDirectory = PATH_site . $directory;
@@ -477,7 +477,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createLocalConfigurationFromFactoryConfigurationThrowsExceptionIfFileExists() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $file = 'typo3temp/' . uniqid('test_');
                $absoluteFile = PATH_site . $file;
@@ -493,7 +493,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createLocalConfigurationFromFactoryConfigurationWritesContentFromFactoryFile() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('writeLocalConfiguration'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
                $fixture->_set('localConfigurationFile', 'typo3temp/' . uniqid('dummy_'));
 
                $factoryConfigurationFile = 'typo3temp/' . uniqid('test_') . '.php';
@@ -525,7 +525,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createLocalConfigurationFromFactoryConfigurationMergesConfigurationWithAdditionalFactoryFile() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('writeLocalConfiguration'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
                $fixture->_set('localConfigurationFile', 'typo3temp/' . uniqid('dummy_'));
 
                $factoryConfigurationFile = 'typo3temp/' . uniqid('test_') . '.php';
@@ -569,7 +569,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isValidLocalConfigurationPathAcceptsWhitelistedPath() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
                $fixture->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
                $this->assertTrue($fixture->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
        }
@@ -579,7 +579,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isValidLocalConfigurationPathDeniesNotWhitelistedPath() {
                /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager', array('dummy'));
+               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
                $fixture->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
                $this->assertFalse($fixture->_call('isValidLocalConfigurationPath', 'bar/baz'));
        }
index c8ac10f..1f5bd9d 100644 (file)
@@ -71,7 +71,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        array(),
                        '',
                        TRUE,
@@ -81,7 +81,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
 
                $method = new \ReflectionMethod(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        'evaluateConditionCommon'
                );
                $method->setAccessible(TRUE);
@@ -118,7 +118,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        array(),
                        '',
                        TRUE,
@@ -128,7 +128,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
 
                $method = new \ReflectionMethod(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        'evaluateConditionCommon'
                );
                $method->setAccessible(TRUE);
@@ -198,7 +198,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function evaluateConditionCommonEvaluatesIpAddressesCorrectly($devIpMask, $actualIp, $expectedResult) {
                /** @var \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractConditionMatcherMock */
                $abstractConditionMatcherMock = $this->getMockForAbstractClass(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        array(),
                        '',
                        TRUE,
@@ -207,7 +207,7 @@ class AbstractConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        array('evaluateConditionCommon')
                );
                $method = new \ReflectionMethod(
-                       'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
+                       \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher::class,
                        'evaluateConditionCommon'
                );
                $method->setAccessible(TRUE);
index 1f7a8a2..a91f098 100644 (file)
@@ -31,21 +31,21 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function loadCachedTcaRequiresCacheFileIfCacheEntryExists() {
                /** @var $bootstrapInstance \TYPO3\CMS\Core\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
                $bootstrapInstance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Core\\Core\\Bootstrap',
+                       \TYPO3\CMS\Core\Core\Bootstrap::class,
                        array('dummy'),
                        array(),
                        '',
                        FALSE
                );
                $mockCache = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend',
+                       \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class,
                        array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
                        array(),
                        '',
                        FALSE
                );
                $mockCacheManager = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\CacheManager',
+                       \TYPO3\CMS\Core\Cache\CacheManager::class,
                        array('getCache')
                );
                $mockCacheManager
@@ -59,7 +59,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $mockCache
                        ->expects($this->once())
                        ->method('get');
-               $bootstrapInstance->setEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager', $mockCacheManager);
+               $bootstrapInstance->setEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $mockCacheManager);
                $bootstrapInstance->loadCachedTca();
        }
 
@@ -69,21 +69,21 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function loadCachedTcaSetsCacheEntryIfNoCacheEntryExists() {
                /** @var $bootstrapInstance \TYPO3\CMS\Core\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
                $bootstrapInstance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Core\\Core\\Bootstrap',
+                       \TYPO3\CMS\Core\Core\Bootstrap::class,
                        array('loadExtensionTables'),
                        array(),
                        '',
                        FALSE
                );
                $mockCache = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\Frontend\\AbstractFrontend',
+                       \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class,
                        array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
                        array(),
                        '',
                        FALSE
                );
                $mockCacheManager = $this->getMock(
-                       'TYPO3\\CMS\\Core\\Cache\\CacheManager',
+                       \TYPO3\CMS\Core\Cache\CacheManager::class,
                        array('getCache')
                );
                $mockCacheManager
@@ -97,7 +97,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $mockCache
                        ->expects($this->once())
                        ->method('set');
-               $bootstrapInstance->setEarlyInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager', $mockCacheManager);
+               $bootstrapInstance->setEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $mockCacheManager);
                $bootstrapInstance->loadCachedTca();
        }
 
@@ -122,7 +122,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function transferDeprecatedCurlSettings($curlProxyServer, $proxyHost, $proxyPort) {
                /** @var $bootstrapInstance \TYPO3\CMS\Core\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
                $bootstrapInstance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Core\\Core\\Bootstrap',
+                       \TYPO3\CMS\Core\Core\Bootstrap::class,
                        array('dummy'),
                        array(),
                        '',
@@ -140,7 +140,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function curlProxyServerDoesNotOverwriteHttpSettings() {
                /** @var $bootstrapInstance \TYPO3\CMS\Core\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
                $bootstrapInstance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Core\\Core\\Bootstrap',
+                       \TYPO3\CMS\Core\Core\Bootstrap::class,
                        array('dummy'),
                        array(),
                        '',
@@ -169,7 +169,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function curlAdapterUsedIfCurlUse() {
                /** @var $bootstrapInstance \TYPO3\CMS\Core\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
                $bootstrapInstance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Core\\Core\\Bootstrap',
+                       \TYPO3\CMS\Core\Core\Bootstrap::class,
                        array('dummy'),
                        array(),
                        '',
index 7407efd..4eb297a 100644 (file)
@@ -60,16 +60,16 @@ class ClassLoaderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                mkdir('vfs://Test/Packages/Application/Acme.MyApp/Classes/', 0770, TRUE);
                file_put_contents('vfs://Test/Packages/Application/Acme.MyApp/composer.json', '{"name": "acme/myapp", "type": "flow-test"}');
-               $package1 = new \TYPO3\Flow\Package\Package($this->getMock('TYPO3\Flow\Package\PackageManager'), 'Acme.MyApp', 'vfs://Test/Packages/Application/Acme.MyApp/', 'Classes');
+               $package1 = new \TYPO3\Flow\Package\Package($this->getMock(\TYPO3\Flow\Package\PackageManager::class), 'Acme.MyApp', 'vfs://Test/Packages/Application/Acme.MyApp/', 'Classes');
 
                mkdir('vfs://Test/Packages/Application/Acme.MyAppAddon/Classes/', 0770, TRUE);
                file_put_contents('vfs://Test/Packages/Application/Acme.MyAppAddon/composer.json', '{"name": "acme/myappaddon", "type": "flow-test"}');
-               $package2 = new \TYPO3\Flow\Package\Package($this->getMock('TYPO3\Flow\Package\PackageManager'), 'Acme.MyAppAddon', 'vfs://Test/Packages/Application/Acme.MyAppAddon/', 'Classes');
+               $package2 = new \TYPO3\Flow\Package\Package($this->getMock(\TYPO3\Flow\Package\PackageManager::class), 'Acme.MyAppAddon', 'vfs://Test/Packages/Application/Acme.MyAppAddon/', 'Classes');
 
-               $mockClassAliasMap = $this->getMock('TYPO3\\CMS\\Core\\Core\\ClassAliasMap', array('setPackagesButDontBuildMappingFilesReturnClassNameToAliasMappingInstead', 'buildMappingFiles'), array(), '', FALSE);
+               $mockClassAliasMap = $this->getMock(\TYPO3\CMS\Core\Core\ClassAliasMap::class, array('setPackagesButDontBuildMappingFilesReturnClassNameToAliasMappingInstead', 'buildMappingFiles'), array(), '', FALSE);
                $mockClassAliasMap->expects($this->any())->method('setPackagesButDontBuildMappingFilesReturnClassNameToAliasMappingInstead')->will($this->returnValue(array()));
 
-               $this->orinalClassAliasMap = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance('TYPO3\\CMS\\Core\\Core\\ClassAliasMap');
+               $this->orinalClassAliasMap = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance(\TYPO3\CMS\Core\Core\ClassAliasMap::class);
                $this->classLoader = new \TYPO3\CMS\Core\Core\ClassLoader(\TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getApplicationContext());
                $this->classLoader->injectClassAliasMap($mockClassAliasMap);
                $this->classLoader->setPackages(array('Acme.MyApp' => $package1, 'Acme.MyAppAddon' => $package2));
index 51cf155..93baea4 100644 (file)
@@ -31,7 +31,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        public function setUp() {
-               $this->fixture = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Core\\SystemEnvironmentBuilder', array('dummy'));
+               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::class, array('dummy'));
        }
 
        /**
index dc1e898..70ffc82 100644 (file)
@@ -216,7 +216,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function doesCheckModifyAccessListHookGetsCalled() {
                $hookClass = uniqid('tx_coretest');
-               $hookMock = $this->getMock('TYPO3\\CMS\\Core\\DataHandling\\DataHandlerCheckModifyAccessListHookInterface', array('checkModifyAccessList'), array(), $hookClass);
+               $hookMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandlerCheckModifyAccessListHookInterface::class, array('checkModifyAccessList'), array(), $hookClass);
                $hookMock->expects($this->once())->method('checkModifyAccessList');
                $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList'][] = $hookClass;
                $GLOBALS['T3_VAR']['getUserObj'][$hookClass] = $hookMock;
@@ -287,7 +287,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $subject->expects($this->once())->method('checkRecordUpdateAccess')->will($this->returnValue(TRUE));
 
                /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $backEndUser */
-               $backEndUser = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication');
+               $backEndUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
                $backEndUser->workspace = 1;
                $backEndUser->workspaceRec = array('freeze' => FALSE);
                $backEndUser->expects($this->once())->method('workspaceAllowAutoCreation')->will($this->returnValue(TRUE));
@@ -331,7 +331,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function logCallsWriteLogOfBackendUserIfLoggingIsEnabled() {
-               $backendUser = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication');
+               $backendUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
                $backendUser->expects($this->once())->method('writelog');
                $this->subject->enableLogging = TRUE;
                $this->subject->BE_USER = $backendUser;
@@ -342,7 +342,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function logDoesNotCallWriteLogOfBackendUserIfLoggingIsDisabled() {
-               $backendUser = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication');
+               $backendUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
                $backendUser->expects($this->never())->method('writelog');
                $this->subject->enableLogging = FALSE;
                $this->subject->BE_USER = $backendUser;
@@ -353,7 +353,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function logAddsEntryToLocalErrorLogArray() {
-               $backendUser = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication');
+               $backendUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
                $this->subject->BE_USER = $backendUser;
                $this->subject->enableLogging = TRUE;
                $this->subject->errorLog = array();
@@ -366,7 +366,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function logFormatsDetailMessageWithAdditionalDataInLocalErrorArray() {
-               $backendUser = $this->getMock('TYPO3\\CMS\\Core\\Authentication\\BackendUserAuthentication');
+               $backendUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
                $this->subject->BE_USER = $backendUser;
                $this->subject->enableLogging = TRUE;
                $this->subject->errorLog = array();
@@ -645,7 +645,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
 
                /** @var \TYPO3\CMS\Core\Database\RelationHandler $mockRelationHandler */
-               $mockRelationHandler = $this->getMock('TYPO3\\CMS\\Core\\Database\\RelationHandler', array(), array(), '', FALSE);
+               $mockRelationHandler = $this->getMock(\TYPO3\CMS\Core\Database\RelationHandler::class, array(), array(), '', FALSE);
                $mockRelationHandler->itemArray = array(
                        '1' => array('table' => uniqid('bar_'), 'id' => 67)
                );
index 16f3496..2577bf9 100644 (file)
@@ -34,7 +34,7 @@ class DatabaseConnectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
 
                /** @var \TYPO3\CMS\Core\Database\DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $subject */
-               $subject = $this->getAccessibleMock('TYPO3\\CMS\\Core\\Database\\DatabaseConnection', array('fullQuoteStr'), array(), '', FALSE);
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('fullQuoteStr'), array(), '', FALSE);
                $subject->_set('isConnected', TRUE);
                $subject
                        ->expects($this->any())
@@ -59,7