[TASK] Use name-resolution instead of strings where possible: 8 63/34863/4
authorStefan Neufeind <typo3.neufeind@speedpartner.de>
Thu, 4 Dec 2014 16:00:22 +0000 (17:00 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Sat, 6 Dec 2014 01:09:03 +0000 (02:09 +0100)
(part for EXT:install)

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: I929357c1d64de02eddb17a579ab5f48dac91d491
Resolves: #63477
Releases: master
Reviewed-on: http://review.typo3.org/34863
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>
32 files changed:
typo3/sysext/install/Classes/Configuration/Charset/CharsetFeature.php
typo3/sysext/install/Classes/Configuration/Context/ContextFeature.php
typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ExtbaseObjectCacheFeature.php
typo3/sysext/install/Classes/Configuration/FeatureManager.php
typo3/sysext/install/Classes/Configuration/Image/ImageFeature.php
typo3/sysext/install/Classes/Controller/AbstractController.php
typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php
typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php
typo3/sysext/install/Classes/Controller/Action/Tool/ImportantActions.php
typo3/sysext/install/Classes/Controller/Action/Tool/UpgradeWizard.php
typo3/sysext/install/Classes/Controller/StepController.php
typo3/sysext/install/Classes/Controller/ToolController.php
typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
typo3/sysext/install/Classes/Service/ClearCacheService.php
typo3/sysext/install/Start/Install.php
typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
typo3/sysext/install/ext_localconf.php
typo3/sysext/install/ext_tables.php

index d450491..eed0849 100644 (file)
@@ -30,9 +30,9 @@ class CharsetFeature extends Configuration\AbstractFeature implements Configurat
         * @var array List of preset classes
         */
        protected $presetRegistry = array(
-               'TYPO3\\CMS\\Install\\Configuration\\Charset\\MbstringPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Charset\\IconvPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Charset\\CoreInternalPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Charset\\CustomPreset',
+               \TYPO3\CMS\Install\Configuration\Charset\MbstringPreset::class,
+               \TYPO3\CMS\Install\Configuration\Charset\IconvPreset::class,
+               \TYPO3\CMS\Install\Configuration\Charset\CoreInternalPreset::class,
+               \TYPO3\CMS\Install\Configuration\Charset\CustomPreset::class,
        );
 }
index f759c61..efe297a 100644 (file)
@@ -30,8 +30,8 @@ class ContextFeature extends Configuration\AbstractFeature implements Configurat
         * @var array List of preset classes
         */
        protected $presetRegistry = array(
-               'TYPO3\\CMS\\Install\\Configuration\\Context\\ProductionPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Context\\DevelopmentPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Context\\CustomPreset',
+               \TYPO3\CMS\Install\Configuration\Context\ProductionPreset::class,
+               \TYPO3\CMS\Install\Configuration\Context\DevelopmentPreset::class,
+               \TYPO3\CMS\Install\Configuration\Context\CustomPreset::class,
        );
 }
index 079f6c5..62bc7bb 100644 (file)
@@ -36,8 +36,8 @@ class ApcPreset extends Configuration\AbstractPreset {
         */
        protected $configurationValues = array(
                'SYS/caching/cacheConfigurations/extbase_object' => array(
-                       'frontend' => 'TYPO3\CMS\Core\Cache\Frontend\VariableFrontend',
-                       'backend' => 'TYPO3\CMS\Core\Cache\Backend\ApcBackend',
+                       'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+                       'backend' => \TYPO3\CMS\Core\Cache\Backend\ApcBackend::class,
                        'options' => array(
                                'defaultLifetime' => 0,
                        ),
index 886aadb..aad8bf1 100644 (file)
@@ -36,8 +36,8 @@ class DatabasePreset extends Configuration\AbstractPreset {
         */
        protected $configurationValues = array(
                'SYS/caching/cacheConfigurations/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,
                        ),
index 320685b..b2cf9b0 100644 (file)
@@ -30,7 +30,7 @@ class ExtbaseObjectCacheFeature extends Configuration\AbstractFeature implements
         * @var array List of preset classes
         */
        protected $presetRegistry = array(
-               'TYPO3\\CMS\\Install\\Configuration\\ExtbaseObjectCache\\DatabasePreset',
-               'TYPO3\\CMS\\Install\\Configuration\\ExtbaseObjectCache\\ApcPreset',
+               \TYPO3\CMS\Install\Configuration\ExtbaseObjectCache\DatabasePreset::class,
+               \TYPO3\CMS\Install\Configuration\ExtbaseObjectCache\ApcPreset::class,
        );
 }
index 58d308d..903b204 100644 (file)
@@ -29,10 +29,10 @@ class FeatureManager {
         * @var array List of feature class names
         */
        protected $featureRegistry = array(
-               'TYPO3\\CMS\\Install\\Configuration\\Charset\\CharsetFeature',
-               'TYPO3\\CMS\\Install\\Configuration\\Context\\ContextFeature',
-               'TYPO3\\CMS\\Install\\Configuration\\Image\\ImageFeature',
-               'TYPO3\\CMS\\Install\\Configuration\\ExtbaseObjectCache\\ExtbaseObjectCacheFeature',
+               \TYPO3\CMS\Install\Configuration\Charset\CharsetFeature::class,
+               \TYPO3\CMS\Install\Configuration\Context\ContextFeature::class,
+               \TYPO3\CMS\Install\Configuration\Image\ImageFeature::class,
+               \TYPO3\CMS\Install\Configuration\ExtbaseObjectCache\ExtbaseObjectCacheFeature::class,
        );
 
        /**
@@ -49,7 +49,7 @@ class FeatureManager {
                        $featureInstance = $this->objectManager->get($featureClass);
                        if (!($featureInstance instanceof FeatureInterface)) {
                                throw new Exception(
-                                       'Feature ' . $featureClass . ' doen not implement FeatureInterface',
+                                       'Feature ' . $featureClass . ' does not implement FeatureInterface',
                                        1378644593
                                );
                        }
index 1211343..34754e6 100644 (file)
@@ -30,9 +30,9 @@ class ImageFeature extends Configuration\AbstractFeature implements Configuratio
         * @var array List of preset classes
         */
        protected $presetRegistry = array(
-               'TYPO3\\CMS\\Install\\Configuration\\Image\\GraphicsMagickPreset',
-               'TYPO3\\CMS\\Install\\Configuration\\Image\\ImageMagick6Preset',
-               'TYPO3\\CMS\\Install\\Configuration\\Image\\CustomPreset',
+               \TYPO3\CMS\Install\Configuration\Image\GraphicsMagickPreset::class,
+               \TYPO3\CMS\Install\Configuration\Image\ImageMagick6Preset::class,
+               \TYPO3\CMS\Install\Configuration\Image\CustomPreset::class,
        );
 
        /**
index 2c381ae..1fa7da0 100644 (file)
@@ -106,7 +106,7 @@ class AbstractController {
                        if (isset($postValues['token'])) {
                                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                                $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
-                                       'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection'
+                                       \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class
                                );
                                $action = $this->getAction();
                                if ($action === '') {
@@ -335,7 +335,7 @@ class AbstractController {
                }
                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
-                       'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection'
+                       \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class
                );
                return $formProtection->generateToken('installTool', $action);
        }
@@ -410,7 +410,7 @@ class AbstractController {
                if ($this->isDbalEnabled()) {
                        require(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('dbal') . 'ext_localconf.php');
                        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['dbal']['backend']
-                               = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                               = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                        $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['dbal']['options'] = array();
                }
 
@@ -418,19 +418,19 @@ class AbstractController {
                require(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('fluid') . 'ext_localconf.php');
 
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['options'] = array();
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_object']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_object']['options'] = array();
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_reflection']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_reflection']['options'] = array();
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_tablecolumns']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_tablecolumns']['options'] = array();
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['fluid_template']['backend']
-                       = 'TYPO3\\CMS\\Core\\Cache\\Backend\\NullBackend';
+                       = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['fluid_template']['options'] = array();
 
                /** @var $cacheManager \TYPO3\CMS\Core\Cache\CacheManager */
index 26345b3..8361ba4 100644 (file)
@@ -57,7 +57,7 @@ class DefaultConfiguration extends AbstractStepAction {
 
                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
-                       'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection'
+                       \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class
                );
                $formProtection->clean();
 
index 2fb9761..fd35fbe 100644 (file)
@@ -48,7 +48,7 @@ class EnvironmentAndFolders extends AbstractStepAction {
                        // Create a PackageStates.php with all packages activated marked as "part of factory default"
                        if (!file_exists(PATH_typo3conf . 'PackageStates.php')) {
                                /** @var \TYPO3\CMS\Core\Package\FailsafePackageManager $packageManager */
-                               $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance('TYPO3\\Flow\\Package\\PackageManager');
+                               $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance(\TYPO3\Flow\Package\PackageManager::class);
                                $packages = $packageManager->getAvailablePackages();
                                foreach ($packages as $package) {
                                        /** @var $package \TYPO3\CMS\Core\Package\PackageInterface */
index a277d9f..ecff3aa 100644 (file)
@@ -180,7 +180,7 @@ class ImportantActions extends Action\AbstractAction {
                $configurationManager->setLocalConfigurationValueByPath('SYS/encryptionKey', $newKey);
                /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
-                       'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection'
+                       \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class
                );
                $formProtection->clean();
                /** @var \TYPO3\CMS\Install\Service\SessionService $session */
index 4a5c934..ccd4eab 100644 (file)
@@ -41,19 +41,19 @@ class UpgradeWizard extends Action\AbstractAction {
                $this->loadExtLocalconfDatabaseAndExtTables();
 
                // To make sure initialUpdateDatabaseSchema is first wizard, it is added here instead of ext_localconf.php
-               $initialUpdateDatabaseSchemaUpdateObject = $this->getUpdateObjectInstance('TYPO3\\CMS\\Install\\Updates\\InitialDatabaseSchemaUpdate', 'initialUpdateDatabaseSchema');
+               $initialUpdateDatabaseSchemaUpdateObject = $this->getUpdateObjectInstance(\TYPO3\CMS\Install\Updates\InitialDatabaseSchemaUpdate::class, 'initialUpdateDatabaseSchema');
                if ($initialUpdateDatabaseSchemaUpdateObject->shouldRenderWizard()) {
                        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update'] = array_merge(
-                               array('initialUpdateDatabaseSchema' => 'TYPO3\\CMS\\Install\\Updates\\InitialDatabaseSchemaUpdate'),
+                               array('initialUpdateDatabaseSchema' => \TYPO3\CMS\Install\Updates\InitialDatabaseSchemaUpdate::class),
                                $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']
                        );
                        $this->needsInitialUpdateDatabaseSchema = TRUE;
                }
 
                // To make sure finalUpdateDatabaseSchema is last wizard, it is added here instead of ext_localconf.php
-               $finalUpdateDatabaseSchemaUpdateObject = $this->getUpdateObjectInstance('TYPO3\\CMS\\Install\\Updates\\FinalDatabaseSchemaUpdate', 'finalUpdateDatabaseSchema');
+               $finalUpdateDatabaseSchemaUpdateObject = $this->getUpdateObjectInstance(\TYPO3\CMS\Install\Updates\FinalDatabaseSchemaUpdate::class, 'finalUpdateDatabaseSchema');
                if ($finalUpdateDatabaseSchemaUpdateObject->shouldRenderWizard()) {
-                       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['finalUpdateDatabaseSchema'] = 'TYPO3\\CMS\\Install\\Updates\\FinalDatabaseSchemaUpdate';
+                       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['finalUpdateDatabaseSchema'] = \TYPO3\CMS\Install\Updates\FinalDatabaseSchemaUpdate::class;
                }
 
                // Perform silent cache framework table upgrade
index f8deb9e..bddaaa4 100644 (file)
@@ -295,7 +295,7 @@ class StepController extends AbstractController {
 
                try {
                        /** @var \TYPO3\CMS\Core\Package\FailsafePackageManager $packageManager */
-                       $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance('TYPO3\\Flow\\Package\\PackageManager');
+                       $packageManager = \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->getEarlyInstance(\TYPO3\Flow\Package\PackageManager::class);
 
                        // Activate all packages required for a minimal usable system
                        $packages = $packageManager->getAvailablePackages();
index 1e4770d..5ace77d 100644 (file)
@@ -77,7 +77,7 @@ class ToolController extends AbstractController {
 
                        /** @var $formProtection \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection */
                        $formProtection = \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get(
-                               'TYPO3\\CMS\\Core\\FormProtection\\InstallToolFormProtection'
+                               \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class
                        );
                        $formProtection->clean();
                        $this->session->destroySession();
index bd62738..770dc0d 100644 (file)
@@ -61,112 +61,112 @@ class DefaultFactory {
                        'children' => array(
                                array(
                                        'name' => 'index.php',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\LinkNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                                        'target' => 'typo3_src/index.php',
                                ),
                                array(
                                        'name' => 'typo3',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\LinkNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                                        'target' => 'typo3_src/typo3',
                                ),
                                array(
                                        'name' => 'typo3_src',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\LinkNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                                ),
                                array(
                                        'name' => 'typo3temp',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'targetPermission' => $directoryPermission,
                                        'children' => array(
                                                array(
                                                        'name' => 'index.html',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                        'targetPermission' => $filePermission,
                                                        'targetContent' => '',
                                                ),
                                                array(
                                                        'name' => 'compressor',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'cs',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'Cache',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'GB',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'llxml',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'locks',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'pics',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'sprites',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'temp',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                        ),
                                ),
                                array(
                                        'name' => 'typo3conf',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'targetPermission' => $directoryPermission,
                                        'children' => array(
                                                array(
                                                        'name' => 'ext',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                                array(
                                                        'name' => 'l10n',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                ),
                                        ),
                                ),
                                array(
                                        'name' => 'uploads',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'targetPermission' => $directoryPermission,
                                        'children' => array(
                                                array(
                                                        'name' => 'index.html',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                        'targetPermission' => $filePermission,
                                                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html',
                                                ),
                                                array(
                                                        'name' => 'media',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                        'children' => array(
                                                                array(
                                                                        'name' => 'index.html',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContent' => '',
                                                                ),
@@ -174,12 +174,12 @@ class DefaultFactory {
                                                ),
                                                array(
                                                        'name' => 'pics',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                        'children' => array(
                                                                array(
                                                                        'name' => 'index.html',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContent' => '',
                                                                ),
@@ -187,12 +187,12 @@ class DefaultFactory {
                                                ),
                                                array(
                                                        'name' => 'tf',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                        'children' => array(
                                                                array(
                                                                        'name' => 'index.html',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContent' => '',
                                                                ),
@@ -202,23 +202,23 @@ class DefaultFactory {
                                ),
                                array(
                                        'name' => !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? rtrim($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') : 'fileadmin',
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'targetPermission' => $directoryPermission,
                                        'children' => array(
                                                array(
                                                        'name' => '_temp_',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                        'children' => array(
                                                                array(
                                                                        'name' => '.htaccess',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-htaccess',
                                                                ),
                                                                array(
                                                                        'name' => 'index.html',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html',
                                                                ),
@@ -226,34 +226,34 @@ class DefaultFactory {
                                                ),
                                                array(
                                                        'name' => 'user_upload',
-                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                        'targetPermission' => $directoryPermission,
                                                        'children' => array(
                                                                array(
                                                                        'name' => '_temp_',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                                        'targetPermission' => $directoryPermission,
                                                                        'children' => array(
                                                                                array(
                                                                                        'name' => 'index.html',
-                                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                                        'targetPermission' => $filePermission,
                                                                                        'targetContent' => '',
                                                                                ),
                                                                                array(
                                                                                        'name' => 'importexport',
-                                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                                                                        'targetPermission' => $directoryPermission,
                                                                                        'children' => array(
                                                                                                array(
                                                                                                        'name' => '.htaccess',
-                                                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                                                        'targetPermission' => $filePermission,
                                                                                                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-user_upload-temp-importexport-htaccess',
                                                                                                ),
                                                                                                array(
                                                                                                        'name' => 'index.html',
-                                                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                                                        'targetPermission' => $filePermission,
                                                                                                        'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html',
                                                                                                ),
@@ -263,7 +263,7 @@ class DefaultFactory {
                                                                ),
                                                                array(
                                                                        'name' => 'index.html',
-                                                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\FileNode',
+                                                                       'type' => \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                                                                        'targetPermission' => $filePermission,
                                                                        'targetContent' => '',
                                                                ),
index 0b33998..f2109a6 100644 (file)
@@ -56,7 +56,7 @@ class ClearCacheService {
                        ->initializeClassLoader()
                        ->initializeCachingFramework()
                        ->initializeClassLoaderCaches()
-                       ->initializePackageManagement('TYPO3\\CMS\\Core\\Package\\PackageManager');
+                       ->initializePackageManagement(\TYPO3\CMS\Core\Package\PackageManager::class);
 
                // Get all table names starting with 'cf_' and truncate them
                $database = $this->getDatabaseConnection();
index 39d86bb..c41f53d 100644 (file)
@@ -105,18 +105,18 @@ require __DIR__ . '/../../core/Classes/Core/Bootstrap.php';
 \TYPO3\CMS\Core\Core\Bootstrap::getInstance()
        ->baseSetup('typo3/sysext/install/Start/')
        ->startOutputBuffering()
-       ->loadConfigurationAndInitialize(FALSE, 'TYPO3\\CMS\\Core\\Package\\FailsafePackageManager');
+       ->loadConfigurationAndInitialize(FALSE, \TYPO3\CMS\Core\Package\FailsafePackageManager::class);
 
 // Execute 'tool' or 'step' controller depending on install[controller] GET/POST parameter
 $getPost = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('install');
-$controllerClassName = 'TYPO3\\CMS\\Install\\Controller\\StepController';
+$controllerClassName = \TYPO3\CMS\Install\Controller\StepController::class;
 if (isset($getPost['controller'])) {
        switch ($getPost['controller']) {
                case 'tool':
-                       $controllerClassName = 'TYPO3\\CMS\\Install\\Controller\\ToolController';
+                       $controllerClassName = \TYPO3\CMS\Install\Controller\ToolController::class;
                        break;
                case 'ajax':
-                       $controllerClassName = 'TYPO3\\CMS\\Install\\Controller\\AjaxController';
+                       $controllerClassName = \TYPO3\CMS\Install\Controller\AjaxController::class;
                        break;
        }
 }
index c7d4ed2..78bad57 100644 (file)
@@ -60,7 +60,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                        'news' => '',
                        'info' => ''
                );
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('getExtensionsToExclude'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('getExtensionsToExclude'), array());
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToExclude')->will($this->returnValue(array('cms', 'info')));
                $result = $extensionCompatibilityTesterMock->_call('getExtensionsToLoad');
                $this->assertEquals(array('news' => ''), $result);
@@ -70,7 +70,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function executeActionReturnsStringOkIfAllIsWell() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('getExtensionsToLoad', 'tryToLoadExtLocalconfAndExtTablesOfExtensions', 'deleteProtocolFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('getExtensionsToLoad', 'tryToLoadExtLocalconfAndExtTablesOfExtensions', 'deleteProtocolFile'), array());
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToLoad')->will($this->returnValue(array()));
                $result = $extensionCompatibilityTesterMock->_call('executeAction');
                $this->assertEquals('OK', $result);
@@ -80,7 +80,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function executeActionCallsGetExtensionsToLoad() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('getExtensionsToLoad', 'deleteProtocolFile', 'tryToLoadExtLocalconfAndExtTablesOfExtensions'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('getExtensionsToLoad', 'deleteProtocolFile', 'tryToLoadExtLocalconfAndExtTablesOfExtensions'), array());
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToLoad')->will($this->returnValue(array()));
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToLoad');
                $extensionCompatibilityTesterMock->_call('executeAction');
@@ -90,7 +90,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function executeActionCallsLoadExtensions() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('tryToLoadExtLocalconfAndExtTablesOfExtensions', 'getExtensionsToLoad', 'deleteProtocolFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('tryToLoadExtLocalconfAndExtTablesOfExtensions', 'getExtensionsToLoad', 'deleteProtocolFile'), array());
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToLoad')->will($this->returnValue(array()));
                $extensionCompatibilityTesterMock->expects($this->once())->method('tryToLoadExtLocalconfAndExtTablesOfExtensions');
                $extensionCompatibilityTesterMock->_call('executeAction');
@@ -100,7 +100,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function executeActionCallsDeleteProtocolFileIfForceCheckIsSet() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('tryToLoadExtLocalconfAndExtTablesOfExtensions', 'getExtensionsToLoad', 'deleteProtocolFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('tryToLoadExtLocalconfAndExtTablesOfExtensions', 'getExtensionsToLoad', 'deleteProtocolFile'), array());
                $extensionCompatibilityTesterMock->expects($this->once())->method('getExtensionsToLoad')->will($this->returnValue(array()));
                $_GET['install']['extensionCompatibilityTester']['forceCheck'] = 1;
                $extensionCompatibilityTesterMock->expects($this->once())->method('deleteProtocolFile');
@@ -112,7 +112,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function deleteProtocolFileDeletesFile() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('dummy'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('dummy'), array());
                Utility\GeneralUtility::writeFile(PATH_site . 'typo3temp/ExtensionCompatibilityTester.txt', 'foobar');
                $extensionCompatibilityTesterMock->_call('deleteProtocolFile');
                $this->assertFalse(file_exists(PATH_site . 'typo3temp/ExtensionCompatibilityTester.txt'));
@@ -127,7 +127,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
                // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
                // not trigger unwanted side effects.
-               $packageManager = $this->getMock('TYPO3\\CMS\\Core\\Package\\PackageManager', array(), array(), '', FALSE);
+               $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', FALSE);
                $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
                Utility\ExtensionManagementUtility::setPackageManager($packageManager);
 
@@ -137,7 +137,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                                'ext_tables.php' => PATH_typo3 . 'sysext/install/Tests/Unit/Controller/Action/Ajax/Fixtures/demo1/ext_tables.php'
                        )
                );
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
                $extensionCompatibilityTesterMock->expects($this->atLeastOnce())->method('loadExtTablesForExtension');
                $extensionCompatibilityTesterMock->_call('tryToLoadExtLocalconfAndExtTablesOfExtensions', $extension);
        }
@@ -149,7 +149,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
                // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
                // not trigger unwanted side effects.
-               $packageManager = $this->getMock('TYPO3\\CMS\\Core\\Package\\PackageManager', array(), array(), '', FALSE);
+               $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', FALSE);
                $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
                Utility\ExtensionManagementUtility::setPackageManager($packageManager);
 
@@ -159,7 +159,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                                'ext_localconf.php' => PATH_typo3 . 'sysext/install/Tests/Unit/Controller/Action/Ajax/Fixtures/demo1/ext_localconf.php'
                        )
                );
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
                $extensionCompatibilityTesterMock->expects($this->atLeastOnce())->method('loadExtLocalconfForExtension');
                $extensionCompatibilityTesterMock->_call('tryToLoadExtLocalconfAndExtTablesOfExtensions', $extension);
        }
@@ -174,7 +174,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                                'ext_localconf.php' => PATH_typo3 . 'sysext/install/Tests/Unit/Controller/Action/Ajax/Fixtures/demo1/ext_localconf.php'
                        )
                );
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('dummy'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('dummy'), array());
                $extensionCompatibilityTesterMock->_call('loadExtLocalconfForExtension', 'demo1', $extension['demo1']);
                $this->assertArrayHasKey('demo1_executed', $GLOBALS);
                $this->assertEquals('foobaz', $GLOBALS['demo1_executed']);
@@ -188,7 +188,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
                // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
                // not trigger unwanted side effects.
-               $packageManager = $this->getMock('TYPO3\\CMS\\Core\\Package\\PackageManager', array(), array(), '', FALSE);
+               $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', FALSE);
                $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
                Utility\ExtensionManagementUtility::setPackageManager($packageManager);
 
@@ -198,7 +198,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                                'ext_tables.php' => PATH_typo3 . 'sysext/install/Tests/Unit/Controller/Action/Ajax/Fixtures/demo1/ext_tables.php'
                        )
                );
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('loadExtLocalconfForExtension', 'writeCurrentExtensionToFile', 'loadExtTablesForExtension', 'removeCurrentExtensionFromFile'), array());
                $extensionCompatibilityTesterMock->expects($this->atLeastOnce())->method('writeCurrentExtensionToFile')->with('demo1');
                $extensionCompatibilityTesterMock->_call('tryToLoadExtLocalconfAndExtTablesOfExtensions', $extension);
        }
@@ -207,7 +207,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function writeCurrentExtensionToFileWritesExtensionKeyToFile() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('dummy'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('dummy'), array());
                $extensionCompatibilityTesterMock->_call('writeCurrentExtensionToFile', 'demo1');
                $fileContent = file_get_contents($extensionCompatibilityTesterMock->_get('protocolFile'));
                $this->assertEquals('demo1', $fileContent);
@@ -217,7 +217,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @test
         */
        public function getExtensionsToExcludeReturnsArray() {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('dummy'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('dummy'), array());
                $returnValue = $extensionCompatibilityTesterMock->_call('getExtensionsToExclude');
                $this->assertInternalType('array', $returnValue);
        }
@@ -252,7 +252,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         * @dataProvider removeCurrentExtensionFromFileRemovesGivenExtensionDataProvider
         */
        public function removeCurrentExtensionFromFileRemovesGivenExtension($extensionToRemove, $extensions, $expectedExtensions) {
-               $extensionCompatibilityTesterMock = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Controller\\Action\\Ajax\\ExtensionCompatibilityTester', array('dummy'), array());
+               $extensionCompatibilityTesterMock = $this->getAccessibleMock(\TYPO3\CMS\Install\Controller\Action\Ajax\ExtensionCompatibilityTester::class, array('dummy'), array());
                Utility\GeneralUtility::writeFile($extensionCompatibilityTesterMock->_get('protocolFile'), $extensions);
                $extensionCompatibilityTesterMock->_call('removeCurrentExtensionFromFile', $extensionToRemove);
 
index dd743a3..67c7b94 100644 (file)
@@ -24,7 +24,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getNameReturnsSetName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $name = uniqid('name_');
                $node->_set('name', $name);
                $this->assertSame($name, $node->getName());
@@ -35,7 +35,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getTargetPermissionReturnsSetTargetPermission() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $permission = '1234';
                $node->_set('targetPermission', $permission);
                $this->assertSame($permission, $node->_call('getTargetPermission'));
@@ -46,7 +46,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getChildrenReturnsSetChildren() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $children = array('1234');
                $node->_set('children', $children);
                $this->assertSame($children, $node->_call('getChildren'));
@@ -57,8 +57,8 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getParentReturnsSetParent() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $node->_set('parent', $parent);
                $this->assertSame($parent, $node->_call('getParent'));
        }
@@ -68,8 +68,8 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getAbsolutePathCallsParentForPathAndAppendsOwnName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $parentPath = '/foo/bar';
                $parent->expects($this->once())->method('getAbsolutePath')->will($this->returnValue($parentPath));
                $name = uniqid('test_');
@@ -83,8 +83,8 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isWritableCallsParentIsWritable() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
-               $parentMock = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
+               $parentMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $parentMock->expects($this->once())->method('isWritable');
                $node->_set('parent', $parentMock);
                $node->isWritable();
@@ -95,8 +95,8 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isWritableReturnsWritableStatusOfParent() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
-               $parentMock = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
+               $parentMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $parentMock->expects($this->once())->method('isWritable')->will($this->returnValue(TRUE));
                $node->_set('parent', $parentMock);
                $this->assertTrue($node->isWritable());
@@ -107,7 +107,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function existsReturnsTrueIfNodeExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
@@ -123,7 +123,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('link_');
                $target = PATH_site . 'typo3temp/' . uniqid('notExists_');
                symlink($target, $path);
@@ -137,7 +137,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function existsReturnsFalseIfNodeNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
                $this->assertFalse($node->_call('exists'));
@@ -150,7 +150,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixPermissionThrowsExceptionIfPermissionAreAlreadyCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode',
+                       \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
                        array('isPermissionCorrect', 'getAbsolutePath'),
                        array(),
                        '',
@@ -173,7 +173,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode',
+                       \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
                        array('isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'),
                        array(),
                        '',
@@ -189,7 +189,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->testFilesToDelete[] = $path;
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($subPath));
                $node->_set('targetPermission', '2770');
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\NoticeStatus', $node->_call('fixPermission'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\NoticeStatus::class, $node->_call('fixPermission'));
                chmod($path, 02770);
        }
 
@@ -205,7 +205,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode',
+                       \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
                        array('isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'),
                        array(),
                        '',
@@ -221,7 +221,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->testFilesToDelete[] = $path;
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($subPath));
                $node->_set('targetPermission', '2770');
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\NoticeStatus', $node->_call('fixPermission'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\NoticeStatus::class, $node->_call('fixPermission'));
                chmod($path, 02770);
        }
 
@@ -234,7 +234,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode',
+                       \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
                        array('isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'),
                        array(),
                        '',
@@ -250,7 +250,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->testFilesToDelete[] = $path;
                $node->_set('targetPermission', '2770');
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($subPath));
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\OkStatus', $node->_call('fixPermission'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\OkStatus::class, $node->_call('fixPermission'));
                $resultDirectoryPermissions = substr(decoct(fileperms($subPath)), 1);
                $this->assertSame('2770', $resultDirectoryPermissions);
        }
@@ -260,7 +260,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isPermissionCorrectReturnsTrueOnWindowsOs() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node->expects($this->once())->method('isWindowsOs')->will($this->returnValue(TRUE));
                $this->assertTrue($node->_call('isPermissionCorrect'));
        }
@@ -270,7 +270,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isPermissionCorrectReturnsFalseIfTargetPermissionAndCurrentPermissionAreNotIdentical() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('isWindowsOs', 'getCurrentPermission'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('isWindowsOs', 'getCurrentPermission'), array(), '', FALSE);
                $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getCurrentPermission')->will($this->returnValue('foo'));
                $node->_set('targetPermission', 'bar');
@@ -285,7 +285,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
@@ -303,7 +303,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $file = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($file);
                $this->testFilesToDelete[] = $file;
@@ -319,7 +319,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getRelativePathBelowSiteRootThrowsExceptionIfGivenPathIsNotBelowPathSiteConstant() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $node->_call('getRelativePathBelowSiteRoot', '/tmp');
        }
 
@@ -329,7 +329,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getRelativePathCallsGetAbsolutePathIfPathIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode',
+                       \TYPO3\CMS\Install\FolderStructure\AbstractNode::class,
                        array('getAbsolutePath'),
                        array(),
                        '',
@@ -344,7 +344,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getRelativePathBelowSiteRootReturnsSingleForwardSlashIfGivenPathEqualsPathSiteConstant() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $result = $node->_call('getRelativePathBelowSiteRoot', PATH_site);
                $this->assertSame('/', $result);
        }
@@ -354,7 +354,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getRelativePathBelowSiteRootReturnsSubPath() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\AbstractNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', FALSE);
                $result = $node->_call('getRelativePathBelowSiteRoot', PATH_site . 'foo/bar');
                $this->assertSame('/foo/bar', $result);
        }
index 8219fe3..1d29d69 100644 (file)
@@ -24,6 +24,6 @@ class DefaultFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getStructureReturnsInstanceOfStructureFacadeInterface() {
                $object = new \TYPO3\CMS\Install\FolderStructure\DefaultFactory();
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\FolderStructure\\StructureFacadeInterface', $object->getStructure());
+               $this->assertInstanceOf(\TYPO3\CMS\Install\FolderStructure\StructureFacadeInterface::class, $object->getStructure());
        }
 }
index 76013a9..9639ef5 100644 (file)
@@ -25,7 +25,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfParentIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $node->__construct(array(), NULL);
        }
 
@@ -34,9 +34,9 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException
         */
        public function constructorThrowsExceptionIfNameContainsForwardSlash() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo/bar',
                );
@@ -47,10 +47,10 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorCallsCreateChildrenIfChildrenAreSet() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('createChildren'),
                        array(),
                        '',
@@ -71,9 +71,9 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorSetsParent() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo',
                );
@@ -85,9 +85,9 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorSetsTargetPermission() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $targetPermission = '2550';
                $structure = array(
                        'name' => 'foo',
@@ -102,8 +102,8 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $name = uniqid('test_');
                $node->__construct(array('name' => $name), $parent);
                $this->assertSame($name, $node->getName());
@@ -115,7 +115,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArray() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -136,7 +136,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithWarningStatusIfDirectoryNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -160,7 +160,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotADirectory() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -186,7 +186,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithErrorStatusIfDirectoryExistsButIsNotWritable() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -212,7 +212,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithNoticeStatusIfDirectoryExistsButPermissionAreNotCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -238,7 +238,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithOkStatusIfDirectoryExistsAndPermissionAreCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -264,7 +264,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusCallsGetStatusOnChildren() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'),
                        array(),
                        '',
@@ -274,9 +274,9 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('isDirectory')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isWritable')->will($this->returnValue(TRUE));
-               $childMock1 = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $childMock1 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $childMock1->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
-               $childMock2 = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $childMock2 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $childMock2->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
                $node->_set('children', array($childMock1, $childMock2));
                $node->getStatus();
@@ -288,7 +288,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithOwnStatusAndStatusOfChild() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'),
                        array(),
                        '',
@@ -298,8 +298,8 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('isDirectory')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isWritable')->will($this->returnValue(TRUE));
-               $childMock = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
-               $childStatusMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\ErrorStatus', array(), array(), '', FALSE);
+               $childMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
+               $childStatusMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', FALSE);
                $childMock->expects($this->once())->method('getStatus')->will($this->returnValue(array($childStatusMock)));
                $node->_set('children', array($childMock));
                $status = $node->getStatus();
@@ -315,7 +315,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixCallsFixSelfAndReturnsItsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('fixSelf'),
                        array(),
                        '',
@@ -331,15 +331,15 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function fixCallsFixOnChildrenAndReturnsMergedResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('fixSelf'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('fixSelf'), array(), '', FALSE);
                $uniqueReturnSelf = uniqid('foo_');
                $node->expects($this->once())->method('fixSelf')->will($this->returnValue(array($uniqueReturnSelf)));
 
-               $childMock1 = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $childMock1 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $uniqueReturnChild1 = uniqid('foo_');
                $childMock1->expects($this->once())->method('fix')->will($this->returnValue(array($uniqueReturnChild1)));
 
-               $childMock2 = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\NodeInterface', array(), array(), '', FALSE);
+               $childMock2 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $uniqueReturnChild2 = uniqid('foo_');
                $childMock2->expects($this->once())->method('fix')->will($this->returnValue(array($uniqueReturnChild2)));
 
@@ -354,7 +354,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfCallsCreateDirectoryIfDirectoryDoesNotExistAndReturnsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('exists', 'createDirectory', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -373,7 +373,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotADirectoryAndReturnsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('exists', 'isWritable', 'getRelativePathBelowSiteRoot', 'isDirectory', 'getAbsolutePath'),
                        array(),
                        '',
@@ -385,7 +385,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('getRelativePathBelowSiteRoot')->will($this->returnValue(''));
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue(''));
                $result = $node->_call('fixSelf');
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\ErrorStatus', $result[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\ErrorStatus::class, $result[0]);
        }
 
        /**
@@ -394,7 +394,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfCallsFixPermissionIfDirectoryExistsButIsNotWritable() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode',
+                       \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        array('exists', 'isWritable', 'fixPermission'),
                        array(),
                        '',
@@ -412,7 +412,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createDirectoryThrowsExceptionIfNodeExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $node->expects($this->once())->method('getAbsolutePath')->will($this->returnValue(''));
                $node->expects($this->once())->method('exists')->will($this->returnValue(TRUE));
                $node->_call('createDirectory');
@@ -423,7 +423,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createDirectoryCreatesDirectory() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
@@ -437,12 +437,12 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createDirectoryReturnsOkStatusIfDirectoryWasCreated() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
-               $this->assertInstanceOf('TYPO3\\CMS\Install\\Status\\StatusInterface', $node->_call('createDirectory'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\StatusInterface::class, $node->_call('createDirectory'));
        }
 
        /**
@@ -453,7 +453,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                mkdir($path);
                chmod($path, 02550);
@@ -461,7 +461,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($subPath));
-               $this->assertInstanceOf('TYPO3\\CMS\Install\\Status\\StatusInterface', $node->_call('createDirectory'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\StatusInterface::class, $node->_call('createDirectory'));
        }
 
        /**
@@ -470,7 +470,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createChildrenThrowsExceptionIfAChildTypeIsNotSet() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $brokenStructure = array(
                        array(
                                'name' => 'foo',
@@ -485,7 +485,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createChildrenThrowsExceptionIfAChildNameIsNotSet() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $brokenStructure = array(
                        array(
                                'type' => 'foo',
@@ -500,14 +500,14 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createChildrenThrowsExceptionForMultipleChildrenWithSameName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
                $brokenStructure = array(
                        array(
-                               'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                               'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                'name' => 'foo',
                        ),
                        array(
-                               'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                               'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                'name' => 'foo',
                        ),
                );
@@ -519,15 +519,15 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getChildrenReturnsCreatedChild() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                $childName = uniqid('test_');
                $structure = array(
                        'name' => 'foo',
-                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                        'children' => array(
                                array(
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'name' => $childName,
                                ),
                        ),
@@ -536,7 +536,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $children = $node->_call('getChildren');
                /** @var $child \TYPO3\CMS\Install\FolderStructure\NodeInterface */
                $child = $children[0];
-               $this->assertInstanceOf('TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode', $children[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, $children[0]);
                $this->assertSame($childName, $child->getName());
        }
 
@@ -545,7 +545,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isWritableReturnsFalseIfNodeDoesNotExist() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
                $this->assertFalse($node->isWritable());
@@ -556,7 +556,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isWritableReturnsTrueIfNodeExistsAndFileCanBeCreated() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
@@ -575,7 +575,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test skipped if run on linux as root');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
@@ -589,7 +589,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isDirectoryReturnsTrueIfNameIsADirectory() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
@@ -605,7 +605,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\DirectoryNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
index eae711a..85b657d 100644 (file)
@@ -25,7 +25,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfParentIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
                $node->__construct(array(), NULL);
        }
 
@@ -34,9 +34,9 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException
         */
        public function constructorThrowsExceptionIfNameContainsForwardSlash() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo/bar',
                );
@@ -47,9 +47,9 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorSetsParent() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo',
                );
@@ -61,9 +61,9 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorSetsTargetPermission() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
                $targetPermission = '0660';
                $structure = array(
                        'name' => 'foo',
@@ -78,8 +78,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $name = uniqid('test_');
                $node->__construct(array('name' => $name), $parent);
                $this->assertSame($name, $node->getName());
@@ -91,8 +91,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfBothTargetContentAndTargetContentFileAreSet() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo',
                        'targetContent' => 'foo',
@@ -106,8 +106,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsTargetContent() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $targetContent = uniqid('content_');
                $structure = array(
                        'name' => 'foo',
@@ -122,8 +122,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsTargetContentToContentOfTargetContentFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $targetFile = PATH_site . 'typo3temp/' . uniqid('test_');
                $targetContent = uniqid('content_');
                file_put_contents($targetFile, $targetContent);
@@ -142,8 +142,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfTargetContentFileDoesNotExist() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $targetFile = PATH_site . 'typo3temp/' . uniqid('test_');
                $structure = array(
                        'name' => 'foo',
@@ -157,8 +157,8 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function targetContentIsNullIfNotGiven() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo',
                );
@@ -172,7 +172,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArray() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -194,7 +194,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithWarningStatusIFileNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -219,7 +219,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotAFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -246,7 +246,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayNoticeStatusIfFileExistsButIsNotWritable() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -273,7 +273,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButPermissionAreNotCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -300,7 +300,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButContentIsNotCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -327,7 +327,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithOkStatusIfFileExistsAndPermissionAreCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'),
                        array(),
                        '',
@@ -354,7 +354,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixCallsFixSelfAndReturnsItsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('fixSelf'),
                        array(),
                        '',
@@ -371,7 +371,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfCallsCreateFileIfFileDoesNotExistAndReturnsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -393,7 +393,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfCallsSetsContentIfFileCreationWasSuccessfulAndTargetContentIsNotNullAndReturnsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -403,7 +403,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('isFile')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
                $uniqueReturn = uniqid();
-               $createFileStatus = $this->getMock('TYPO3\\CMS\\Install\\Status\\OkStatus', array(), array(), '', FALSE);
+               $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array(), array(), '', FALSE);
                $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
                $node->_set('targetContent', 'foo');
                $node->expects($this->once())->method('setContent')->will($this->returnValue($uniqueReturn));
@@ -418,7 +418,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfDoesNotCallSetContentIfFileCreationFailed() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -427,7 +427,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('isFile')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
-               $createFileStatus = $this->getMock('TYPO3\\CMS\\Install\\Status\\ErrorStatus', array(), array(), '', FALSE);
+               $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', FALSE);
                $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
                $node->_set('targetContent', 'foo');
                $node->expects($this->never())->method('setContent');
@@ -440,7 +440,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfDoesNotCallSetContentIfFileTargetContentIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -449,7 +449,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('isFile')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
-               $createFileStatus = $this->getMock('TYPO3\\CMS\\Install\\Status\\OkStatus', array(), array(), '', FALSE);
+               $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array(), array(), '', FALSE);
                $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
                $node->_set('targetContent', NULL);
                $node->expects($this->never())->method('setContent');
@@ -462,7 +462,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotAFileAndReturnsResult() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'fixPermission'),
                        array(),
                        '',
@@ -482,7 +482,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixSelfCallsFixPermissionIfFileExistsButPermissionAreWrong() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot'),
                        array(),
                        '',
@@ -492,7 +492,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->once())->method('isFile')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
                $resultArray = $node->_call('fixSelf');
-               $this->assertInstanceOf('TYPO3\\CMS\Install\\Status\\StatusInterface', $resultArray[0]);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\StatusInterface::class, $resultArray[0]);
        }
 
        /**
@@ -500,7 +500,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function fixSelfReturnsArrayOfStatusMessages() {
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\FileNode',
+                       \TYPO3\CMS\Install\FolderStructure\FileNode::class,
                        array('exists', 'isFile', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -518,7 +518,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createFileThrowsExceptionIfNodeExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $node->expects($this->once())->method('getAbsolutePath')->will($this->returnValue(''));
                $node->expects($this->once())->method('exists')->will($this->returnValue(TRUE));
                $node->_call('createFile');
@@ -529,12 +529,12 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createFileReturnsOkStatusIfFileWasCreated() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
-               $this->assertInstanceOf('TYPO3\\CMS\Install\\Status\\StatusInterface', $node->_call('createFile'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\StatusInterface::class, $node->_call('createFile'));
        }
 
        /**
@@ -542,7 +542,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function createFileCreatesFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
@@ -559,7 +559,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                mkdir($path);
                chmod($path, 02550);
@@ -567,7 +567,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->testFilesToDelete[] = $path;
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($subPath));
-               $this->assertInstanceOf('TYPO3\\CMS\Install\\Status\\StatusInterface', $node->_call('createFile'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\StatusInterface::class, $node->_call('createFile'));
        }
 
        /**
@@ -576,7 +576,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isContentCorrectThrowsExceptionIfTargetIsNotAFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                mkdir($path);
                $this->testFilesToDelete[] = $path;
@@ -589,7 +589,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isContentCorrectReturnsTrueIfTargetContentPropertyIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
@@ -603,7 +603,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isContentCorrectReturnsTrueIfTargetContentEqualsCurrentContent() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                $content = uniqid('content_');
                file_put_contents($path, $content);
@@ -618,7 +618,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isContentCorrectReturnsFalseIfTargetContentNotEqualsCurrentContent() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                $content = uniqid('content1_');
                $targetContent = uniqid('content2_');
@@ -633,9 +633,9 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function isPermissionCorrectReturnsTrueIfTargetPermissionAndCurrentPermissionAreIdentical() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getCurrentPermission', 'isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getCurrentPermission', 'isWindowsOs'), array(), '', FALSE);
                $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(FALSE));
                $node->expects($this->any())->method('getCurrentPermission')->will($this->returnValue('0664'));
                $targetPermission = '0664';
@@ -653,7 +653,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setContentThrowsExceptionIfTargetIsNotAFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('dir_');
                mkdir($path);
                $this->testFilesToDelete[] = $path;
@@ -668,7 +668,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setContentThrowsExceptionIfTargetContentIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
@@ -682,7 +682,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setContentSetsContentToFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
@@ -699,14 +699,14 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setContentReturnsOkStatusIfContentWasSuccessfullySet() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($path));
                $targetContent = uniqid('content_');
                $node->_set('targetContent', $targetContent);
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\OkStatus', $node->_call('setContent'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\OkStatus::class, $node->_call('setContent'));
        }
 
        /**
@@ -720,7 +720,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test skipped if run on linux as root');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath', 'getRelativePathBelowSiteRoot'), array(), '', FALSE);
                $dir = PATH_site . 'typo3temp/' . uniqid('dir_');
                mkdir($dir);
                $file = $dir . '/' . uniqid('file_');
@@ -730,7 +730,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('getAbsolutePath')->will($this->returnValue($file));
                $targetContent = uniqid('content_');
                $node->_set('targetContent', $targetContent);
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\ErrorStatus', $node->_call('setContent'));
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\ErrorStatus::class, $node->_call('setContent'));
        }
 
        /**
@@ -738,7 +738,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isFileReturnsTrueIfNameIsFile() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
@@ -754,7 +754,7 @@ class FileNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\FileNode', array('getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('root_');
                \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
                $this->testFilesToDelete[] = $path;
index 3c0e7f6..c817154 100644 (file)
@@ -25,7 +25,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfParentIsNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', FALSE);
                $node->__construct(array(), NULL);
        }
 
@@ -34,9 +34,9 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException
         */
        public function constructorThrowsExceptionIfNameContainsForwardSlash() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo/bar',
                );
@@ -47,9 +47,9 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function constructorSetsParent() {
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\NodeInterface', array(), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', FALSE);
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('dummy'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', FALSE);
                $structure = array(
                        'name' => 'foo',
                );
@@ -62,8 +62,8 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $name = uniqid('test_');
                $node->__construct(array('name' => $name), $parent);
                $this->assertSame($name, $node->getName());
@@ -74,8 +74,8 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsTarget() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('dummy'), array(), '', FALSE);
-               $parent = $this->getMock('TYPO3\CMS\Install\FolderStructure\RootNodeInterface', array(), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', FALSE);
+               $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', FALSE);
                $target = '../' . uniqid('test_');
                $node->__construct(array('target' => $target), $parent);
                $this->assertSame($target, $node->_call('getTarget'));
@@ -87,7 +87,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArray() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists'),
                        array(),
                        '',
@@ -104,7 +104,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithInformationStatusIfRunningOnWindows() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists'),
                        array(),
                        '',
@@ -116,7 +116,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $statusArray = $node->getStatus();
                /** @var $status \TYPO3\CMS\Install\Status\StatusInterface */
                $status = $statusArray[0];
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\InfoStatus', $status);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\InfoStatus::class, $status);
        }
 
        /**
@@ -125,7 +125,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithErrorStatusIfLinkNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists'),
                        array(),
                        '',
@@ -138,7 +138,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $statusArray = $node->getStatus();
                /** @var $status \TYPO3\CMS\Install\Status\StatusInterface */
                $status = $statusArray[0];
-               $this->assertInstanceOf('TYPO3\\CMS\\Install\\Status\\ErrorStatus', $status);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\Status\ErrorStatus::class, $status);
        }
 
        /**
@@ -147,7 +147,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithWarningStatusIfNodeIsNotALink() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'getRelativePathBelowSiteRoot'),
                        array(),
                        '',
@@ -168,7 +168,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsErrorStatusIfLinkTargetIsNotCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getCurrentTarget', 'getRelativePathBelowSiteRoot'),
                        array(),
                        '',
@@ -191,7 +191,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsOkStatusIfLinkExistsAndTargetIsCorrect() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getRelativePathBelowSiteRoot'),
                        array(),
                        '',
@@ -213,7 +213,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function fixReturnsEmptyArray() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+                       \TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('getRelativePathBelowSiteRoot'),
                        array(),
                        '',
@@ -229,7 +229,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isLinkThrowsExceptionIfLinkNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists'), array(), '', FALSE);
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $this->assertFalse($node->_call('isLink'));
        }
@@ -242,7 +242,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('link_');
                $target = PATH_site . uniqid('linkTarget_');
                symlink($target, $path);
@@ -260,7 +260,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $this->markTestSkipped('Test not available on Windows OS.');
                }
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists', 'getAbsolutePath'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'getAbsolutePath'), array(), '', FALSE);
                $path = PATH_site . 'typo3temp/' . uniqid('file_');
                touch($path);
                $this->testFilesToDelete[] = $path;
@@ -275,7 +275,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isTargetCorrectThrowsExceptionIfLinkNotExists() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists'), array(), '', FALSE);
                $node->expects($this->once())->method('exists')->will($this->returnValue(FALSE));
                $this->assertFalse($node->_call('isTargetCorrect'));
        }
@@ -286,7 +286,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isTargetCorrectThrowsExceptionIfNodeIsNotALink() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists', 'isLink', 'getTarget'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'isLink', 'getTarget'), array(), '', FALSE);
                $node->expects($this->any())->method('exists')->will($this->returnValue(TRUE));
                $node->expects($this->once())->method('isLink')->will($this->returnValue(FALSE));
                $this->assertTrue($node->_call('isTargetCorrect'));
@@ -297,7 +297,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isTargetCorrectReturnsTrueIfNoExpectedLinkTargetIsSpecified() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists', 'isLink', 'getTarget'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'isLink', 'getTarget'), array(), '', FALSE);
                $node->expects($this->any())->method('exists')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isLink')->will($this->returnValue(TRUE));
                $node->expects($this->once())->method('getTarget')->will($this->returnValue(''));
@@ -309,7 +309,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isTargetCorrectAcceptsATargetWithATrailingSlash() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode', array('exists', 'isLink', 'getCurrentTarget', 'getTarget'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('exists', 'isLink', 'getCurrentTarget', 'getTarget'), array(), '', FALSE);
                $node->expects($this->any())->method('exists')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isLink')->will($this->returnValue(TRUE));
                $node->expects($this->once())->method('getCurrentTarget')->will($this->returnValue('someLinkTarget'));
@@ -329,7 +329,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                symlink($target, $path);
                $this->testFilesToDelete[] = $path;
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('exists', 'isLink', 'getTarget', 'getAbsolutePath'),
                        array(),
                        '',
@@ -354,7 +354,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                symlink($target, $path);
                $this->testFilesToDelete[] = $path;
                /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\LinkNode',
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class,
                        array('exists', 'isLink', 'getTarget', 'getAbsolutePath'),
                        array(),
                        '',
index 10785a8..5fa077c 100644 (file)
@@ -25,9 +25,9 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfParentIsNotNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $falseParent = $this->getMock(
-                       'TYPO3\CMS\Install\FolderStructure\RootNodeInterface',
+                       \TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class,
                        array(),
                        array(),
                        '',
@@ -42,7 +42,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfAbsolutePathIsNotSet() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $structure = array(
                        'type' => 'root',
                );
@@ -55,7 +55,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfAbsolutePathIsNotAbsoluteOnWindows() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -72,7 +72,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorThrowsExceptionIfAbsolutePathIsNotAbsoluteOnUnix() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -88,7 +88,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsParentToNull() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -105,7 +105,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getChildrenReturnsChildCreatedByConstructor() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -115,7 +115,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'name' => '/foo',
                        'children' => array(
                                array(
-                                       'type' => 'TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode',
+                                       'type' => \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
                                        'name' => $childName,
                                ),
                        ),
@@ -124,7 +124,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $children = $node->_call('getChildren');
                /** @var $child \TYPO3\CMS\install\FolderStructure\NodeInterface */
                $child = $children[0];
-               $this->assertInstanceOf('TYPO3\\CMS\\install\\FolderStructure\\DirectoryNode', $child);
+               $this->assertInstanceOf(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, $child);
                $this->assertSame($childName, $child->getName());
        }
 
@@ -133,7 +133,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsTargetPermission() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -152,7 +152,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function constructorSetsName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
@@ -168,7 +168,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusReturnsArrayWithOkStatusAndCallsOwnStatusMethods() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\RootNode',
+                       \TYPO3\CMS\Install\FolderStructure\RootNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'),
                        array(),
                        '',
@@ -194,7 +194,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getStatusCallsGetChildrenStatusForStatus() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $node = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\FolderStructure\\RootNode',
+                       \TYPO3\CMS\Install\FolderStructure\RootNode::class,
                        array('getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect', 'getChildrenStatus'),
                        array(),
                        '',
@@ -208,7 +208,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $node->expects($this->any())->method('isDirectory')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(TRUE));
                $node->expects($this->any())->method('isWritable')->will($this->returnValue(TRUE));
-               $childStatusMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\ErrorStatus', array(), array(), '', FALSE);
+               $childStatusMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', FALSE);
                $node->expects($this->once())->method('getChildrenStatus')->will($this->returnValue(array($childStatusMock)));
                $statusArray = $node->getStatus();
                /** @var $status \TYPO3\CMS\Install\Status\StatusInterface */
@@ -223,7 +223,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getAbsolutePathReturnsGivenName() {
                /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $node = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array('isWindowsOs'), array(), '', FALSE);
+               $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', FALSE);
                $node
                        ->expects($this->any())
                        ->method('isWindowsOs')
index 75e9e67..b6b131f 100644 (file)
@@ -24,8 +24,8 @@ class StructureFacadeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getStatusReturnsStatusOfStructureAndReturnsItsResult() {
                /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $facade = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\StructureFacade', array('dummy'), array(), '', FALSE);
-               $root = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array(), array(), '', FALSE);
+               $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, array('dummy'), array(), '', FALSE);
+               $root = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array(), array(), '', FALSE);
                $root->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
                $facade->_set('structure', $root);
                $status = $facade->getStatus();
@@ -37,8 +37,8 @@ class StructureFacadeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function fixCallsFixOfStructureAndReturnsItsResult() {
                /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $facade = $this->getAccessibleMock('TYPO3\\CMS\\Install\\FolderStructure\\StructureFacade', array('dummy'), array(), '', FALSE);
-               $root = $this->getMock('TYPO3\\CMS\\Install\\FolderStructure\\RootNode', array(), array(), '', FALSE);
+               $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, array('dummy'), array(), '', FALSE);
+               $root = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array(), array(), '', FALSE);
                $root->expects($this->once())->method('fix')->will($this->returnValue(array()));
                $facade->_set('structure', $root);
                $status = $facade->fix();
index ddb252f..ffe6600 100644 (file)
@@ -24,7 +24,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getMessagesReturnsPreviouslySetMessage() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreUpdateService', array('dummy'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, array('dummy'), array(), '', FALSE);
                $aMessage = uniqid('message_');
                $instance->_set('messages', $aMessage);
                $this->assertSame($aMessage, $instance->getMessages());
@@ -35,7 +35,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isCoreUpdateEnabledReturnsTrueForEnvironmentVariableNotSet() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreUpdateService', array('dummy'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, array('dummy'), array(), '', FALSE);
                putenv('TYPO3_DISABLE_CORE_UPDATER');
                putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
                $this->assertTrue($instance->isCoreUpdateEnabled());
@@ -46,7 +46,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isCoreUpdateEnabledReturnsFalseFor_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreUpdateService', array('dummy'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, array('dummy'), array(), '', FALSE);
                putenv('TYPO3_DISABLE_CORE_UPDATER=1');
                putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
                $this->assertFalse($instance->isCoreUpdateEnabled());
@@ -57,7 +57,7 @@ class CoreUpdateServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isCoreUpdateEnabledReturnsFalseFor_REDIRECT_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreUpdateService', array('dummy'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, array('dummy'), array(), '', FALSE);
                putenv('TYPO3_DISABLE_CORE_UPDATER');
                putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER=1');
                $this->assertFalse($instance->isCoreUpdateEnabled());
index e746de6..f737684 100644 (file)
@@ -24,8 +24,8 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function updateVersionMatrixStoresVersionMatrixInRegistry() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
-               $registry = $this->getMock('TYPO3\CMS\Core\Registry');
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
+               $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class);
                $versionArray = array(uniqId());
                $registry->expects($this->once())->method('set')->with('TYPO3.CMS.Install', 'coreVersionMatrix', $versionArray);
                $instance->_set('registry', $registry);
@@ -38,8 +38,8 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function updateVersionMatrixRemovesOldReleasesFromMatrix() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
-               $registry = $this->getMock('TYPO3\CMS\Core\Registry');
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
+               $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class);
                $versionArray = array(
                        '6.2' => array(),
                        '6.1' => array(),
@@ -58,7 +58,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isInstalledVersionAReleasedVersionReturnsTrueForNonDevelopmentVersion() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('getInstalledVersion'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('getInstalledVersion'), array(), '', FALSE);
                $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('6.2.0'));
                $this->assertTrue($instance->isInstalledVersionAReleasedVersion());
        }
@@ -68,7 +68,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isInstalledVersionAReleasedVersionReturnsFalseForDevelopmentVersion() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('getInstalledVersion'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('getInstalledVersion'), array(), '', FALSE);
                $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('6.2-dev'));
                $this->assertFalse($instance->isInstalledVersionAReleasedVersion());
        }
@@ -80,7 +80,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getTarGzSha1OfVersionThrowsExceptionIfSha1DoesNotExistInMatrix() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion', 'ensureVersionExistsInMatrix'),
                        array(),
                        '',
@@ -105,7 +105,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion', 'ensureVersionExistsInMatrix'),
                        array(),
                        '',
@@ -124,7 +124,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isYoungerPatchReleaseAvailableReturnsTrueIfYoungerReleaseIsAvailable() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -157,7 +157,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isYoungerReleaseAvailableReturnsFalseIfNoYoungerReleaseExists() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -190,7 +190,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isYoungerReleaseAvailableReturnsFalseIfOnlyADevelopmentReleaseIsYounger() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -223,7 +223,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isYoungerDevelopmentReleaseAvailableReturnsTrueIfADevelopmentReleaseIsYounger() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -256,7 +256,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isUpdateSecurityRelevantReturnsTrueIfAnUpdateIsSecurityRelevant() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -289,7 +289,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function isUpdateSecurityRelevantReturnsFalseIfUpdateIsNotSecurityRelevant() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getInstalledVersion'),
                        array(),
                        '',
@@ -319,7 +319,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getInstalledMinorVersionFetchesInstalledVersionNumber() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('getInstalledVersion'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('getInstalledVersion'), array(), '', FALSE);
                $instance->expects($this->once())->method('getInstalledVersion')->will($this->returnValue('6.2.0'));
                $this->assertSame('6.2', $instance->_call('getInstalledMinorVersion'));
        }
@@ -354,7 +354,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getMinorVersionReturnsCorrectMinorVersion($version, $expectedMajor) {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('dummy'), array(), '', FALSE);
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('dummy'), array(), '', FALSE);
                $this->assertSame($expectedMajor, $instance->_call('getMinorVersion', $version));
        }
 
@@ -364,8 +364,8 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getVersionMatrixThrowsExceptionIfVersionMatrixIsNotYetSetInRegistry() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
-               $registry = $this->getMock('TYPO3\CMS\Core\Registry');
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
+               $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class);
                $registry->expects($this->once())->method('get')->will($this->returnValue(NULL));
                $instance->_set('registry', $registry);
                $instance->_call('getVersionMatrix');
@@ -376,8 +376,8 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getVersionMatrixReturnsMatrixFromRegistry() {
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-               $instance = $this->getAccessibleMock('TYPO3\\CMS\\Install\\Service\\CoreVersionService', array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
-               $registry = $this->getMock('TYPO3\CMS\Core\Registry');
+               $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', FALSE);
+               $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class);
                $versionArray = array(uniqId());
                $registry->expects($this->once())->method('get')->will($this->returnValue($versionArray));
                $instance->_set('registry', $registry);
@@ -398,7 +398,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion', 'ensureVersionExistsInMatrix'),
                        array(),
                        '',
@@ -416,7 +416,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion', 'ensureVersionExistsInMatrix'),
                        array(),
                        '',
@@ -435,7 +435,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion'),
                        array(),
                        '',
@@ -454,7 +454,7 @@ class CoreVersionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $versionMatrixFixtureFile = __DIR__ . '/Fixtures/VersionMatrixFixture.php';
                /** @var $instance \TYPO3\CMS\Install\Service\CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
                $instance = $this->getAccessibleMock(
-                       'TYPO3\\CMS\\Install\\Service\\CoreVersionService',
+                       \TYPO3\CMS\Install\Service\CoreVersionService::class,
                        array('getVersionMatrix', 'getMinorVersion'),
                        array(),
                        '',
index 7836fe8..de54e6d 100644 (file)
@@ -25,11 +25,11 @@ class StatusUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function sortBySeveritySortsGivenStatusObjects() {
-               $errorMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\ErrorStatus', array('dummy'));
-               $warningMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\WarningStatus', array('dummy'));
-               $okMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\OkStatus', array('dummy'));
-               $infoMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\InfoStatus', array('dummy'));
-               $noticeMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\NoticeStatus', array('dummy'));
+               $errorMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array('dummy'));
+               $warningMock = $this->getMock(\TYPO3\CMS\Install\Status\WarningStatus::class, array('dummy'));
+               $okMock = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array('dummy'));
+               $infoMock = $this->getMock(\TYPO3\CMS\Install\Status\InfoStatus::class, array('dummy'));
+               $noticeMock = $this->getMock(\TYPO3\CMS\Install\Status\NoticeStatus::class, array('dummy'));
                $statusUtility = new StatusUtility();
                $return = $statusUtility->sortBySeverity(array($noticeMock, $infoMock, $okMock, $warningMock, $errorMock));
                $this->assertSame(array($errorMock), $return['error']);
@@ -52,8 +52,8 @@ class StatusUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function filterBySeverityReturnsSpecificSeverityOnly() {
-               $errorMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\ErrorStatus', array('dummy'));
-               $warningMock = $this->getMock('TYPO3\\CMS\\Install\\Status\\WarningStatus', array('dummy'));
+               $errorMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array('dummy'));
+               $warningMock = $this->getMock(\TYPO3\CMS\Install\Status\WarningStatus::class, array('dummy'));
                $statusUtility = new StatusUtility();
                $return = $statusUtility->filterBySeverity(array($errorMock, $warningMock), 'error');
                $this->assertSame(array($errorMock), $return);
index 93676e0..349218f 100644 (file)
@@ -24,7 +24,7 @@ class JsonViewTest extends UnitTestCase {
         * @test
         */
        public function transformStatusArrayToArrayReturnsArray() {
-               $jsonView = $this->getAccessibleMock('TYPO3\\CMS\\Install\\View\\JsonView', array('dummy'));
+               $jsonView = $this->getAccessibleMock(\TYPO3\CMS\Install\View\JsonView::class, array('dummy'));
                $this->assertInternalType('array', $jsonView->_call('transformStatusMessagesToArray'));
        }
 
@@ -33,7 +33,7 @@ class JsonViewTest extends UnitTestCase {
         * @expectedException \TYPO3\CMS\Install\Status\Exception
         */
        public function transformStatusArrayToArrayThrowsExceptionIfArrayContainsNotAMessageInterfaceMessage() {
-               $jsonView = $this->getAccessibleMock('TYPO3\\CMS\\Install\\View\\JsonView', array('dummy'));
+               $jsonView = $this->getAccessibleMock(\TYPO3\CMS\Install\View\JsonView::class, array('dummy'));
                $jsonView->_call('transformStatusMessagesToArray', array('foo'));
        }
 
@@ -41,11 +41,11 @@ class JsonViewTest extends UnitTestCase {
         * @test
         */
        public function transformStatusToArrayCreatesArrayFromStatusMessage() {
-               $status = $this->getMock('TYPO3\\CMS\\Install\\Status\\StatusInterface');
+               $status = $this->getMock(\TYPO3\CMS\Install\Status\StatusInterface::class);
                $status->expects($this->once())->method('getSeverity')->will($this->returnValue('aSeverity'));
                $status->expects($this->once())->method('getTitle')->will($this->returnValue('aTitle'));
                $status->expects($this->once())->method('getMessage')->will($this->returnValue('aMessage'));
-               $jsonView = $this->getAccessibleMock('TYPO3\\CMS\\Install\\View\\JsonView', array('dummy'));
+               $jsonView = $this->getAccessibleMock(\TYPO3\CMS\Install\View\JsonView::class, array('dummy'));
                $return = $jsonView->_call('transformStatusToArray', $status);
                $this->assertSame('aSeverity', $return['severity']);
                $this->assertSame('aTitle', $return['title']);
index e3c3bdf..af9db7a 100644 (file)
@@ -28,7 +28,7 @@ class PhpErrorCodeViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * Setup the test case scenario
         */
        public function setUp() {
-               $this->viewHelper = $this->getMock('TYPO3\CMS\Install\ViewHelpers\Format\PhpErrorCodeViewHelper', array('dummy'));
+               $this->viewHelper = $this->getMock(\TYPO3\CMS\Install\ViewHelpers\Format\PhpErrorCodeViewHelper::class, array('dummy'));
        }
 
        /**
index f00f563..ab0371b 100644 (file)
@@ -2,22 +2,22 @@
 defined('TYPO3_MODE') or die();
 
 // All versions
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['changeCompatibilityVersion'] = 'TYPO3\\CMS\\Install\\Updates\\CompatVersionUpdate';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['changeCompatibilityVersion'] = \TYPO3\CMS\Install\Updates\CompatVersionUpdate::class;
 
 // TYPO3 CMS 7
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['backendUserStartModule'] = 'TYPO3\\CMS\\Install\\Updates\\BackendUserStartModuleUpdate';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['languageIsoCode'] = 'TYPO3\\CMS\\Install\\Updates\\LanguageIsoCodeUpdate';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['backendUserStartModule'] = \TYPO3\CMS\Install\Updates\BackendUserStartModuleUpdate::class;
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['languageIsoCode'] = \TYPO3\CMS\Install\Updates\LanguageIsoCodeUpdate::class;
 
 $signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
 $signalSlotDispatcher->connect(
-       'TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService',
+       \TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class,
        'tablesDefinitionIsBeingBuilt',
-       'TYPO3\\CMS\\Install\\Service\\CachingFrameworkDatabaseSchemaService',
+       \TYPO3\CMS\Install\Service\CachingFrameworkDatabaseSchemaService::class,
        'addCachingFrameworkRequiredDatabaseSchemaToTablesDefinition'
 );
 $signalSlotDispatcher->connect(
-       'TYPO3\\CMS\\Install\\Service\\SqlExpectedSchemaService',
+       \TYPO3\CMS\Install\Service\SqlExpectedSchemaService::class,
        'tablesDefinitionIsBeingBuilt',
-       'TYPO3\\CMS\\Core\\Category\\CategoryRegistry',
+       \TYPO3\CMS\Core\Category\CategoryRegistry::class,
        'addCategoryDatabaseSchemaToTablesDefinition'
 );
index 61348cc..5b69432 100644 (file)
@@ -3,8 +3,8 @@ defined('TYPO3_MODE') or die();
 
 if (TYPO3_MODE === 'BE') {
        // Register report module additions
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'][] = 'TYPO3\\CMS\\Install\\Report\\InstallStatusReport';
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'][] = 'TYPO3\\CMS\\Install\\Report\\EnvironmentStatusReport';
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'][] = \TYPO3\CMS\Install\Report\InstallStatusReport::class;
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'][] = \TYPO3\CMS\Install\Report\EnvironmentStatusReport::class;
 
        // Register backend module
        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(