[TASK] Use name-resolution instead of strings where possible: 9

(part for EXT:saltedpasswords)

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: I750f438f681263d222d6e806c39b128c7dbe4ba6
Resolves: #63477
Releases: master
Reviewed-on: http://review.typo3.org/34864
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>

diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
index bce5529..9044358 100644 (file)
--- a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
@@ -61,9 +61,9 @@ class SaltFactory {
         */
        static protected function getDefaultSaltMethods() {
                return array(
-                       'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt',
-                       'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt',
-                       'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt'
+                       \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class => \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class,
+                       \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class => \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class,
+                       \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class
                );
        }
 
@@ -134,13 +134,13 @@ class SaltFactory {
        /**
         * Method sets a custom salting hashing method class.
         *
-        * @param string $resource Object resource to use (e.g. 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt')
+        * @param string $resource Object resource to use (e.g. \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class)
         * @return \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt An instance of salting hashing method object
         */
        static public function setPreferredHashingMethod($resource) {
                self::$instance = NULL;
                $objectInstance = \TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($resource);
-               if (is_object($objectInstance) && is_subclass_of($objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\AbstractSalt')) {
+               if (is_object($objectInstance) && is_subclass_of($objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt::class)) {
                        self::$instance = $objectInstance;
                }
                return self::$instance;

diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
index ccbf204..51f004d 100644 (file)
--- a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
@@ -89,7 +89,7 @@ class SaltedPasswordsUtility {
                        'onlyAuthService' => '0',
                        'forceSalted' => '0',
                        'updatePasswd' => '1',
-                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                       'saltedPWHashingMethod' => \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class,
                        'enabled' => '1'
                );
        }
@@ -103,7 +103,7 @@ class SaltedPasswordsUtility {
         */
        static public function getDefaultSaltingHashingMethod($mode = TYPO3_MODE) {
                $extConf = self::returnExtConf($mode);
-               $classNameToUse = 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt';
+               $classNameToUse = \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class;
                if (in_array($extConf['saltedPWHashingMethod'], array_keys(\TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getRegisteredSaltedHashingMethods()))) {
                        $classNameToUse = $extConf['saltedPWHashingMethod'];
                }

diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
index 9b9ea84..ec69f1f 100644 (file)
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
@@ -27,7 +27,7 @@ class EvaluatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        protected $fixture;
 
        public function setUp() {
-               $this->fixture = $this->getMock('TYPO3\\CMS\\Saltedpasswords\\Evaluation\\Evaluator', array('dummy'));
+               $this->fixture = $this->getMock(\TYPO3\CMS\Saltedpasswords\Evaluation\Evaluator::class, array('dummy'));
 
                // Make sure SaltedPasswordsUtility::isUsageEnabled() returns TRUE
                unset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['saltedpasswords']);

diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index de3a1a1..b724594 100644 (file)
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
@@ -34,7 +34,7 @@ class BlowfishSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        public function setUp() {
-               $this->objectInstance = $this->getMock('TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt', array('dummy'));
+               $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class, array('dummy'));
        }
 
        /**
@@ -52,10 +52,10 @@ class BlowfishSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasCorrectBaseClass() {
-               $hasCorrectBaseClass = get_class($this->objectInstance) === 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt';
+               $hasCorrectBaseClass = get_class($this->objectInstance) === \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class;
                // XCLASS ?
                if (!$hasCorrectBaseClass && FALSE != get_parent_class($this->objectInstance)) {
-                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt');
+                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class);
                }
                $this->assertTrue($hasCorrectBaseClass);
        }

diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
index 99f39c4..cadaff6 100644 (file)
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
@@ -34,7 +34,7 @@ class Md5SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        public function setUp() {
-               $this->objectInstance = $this->getMock('TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt', array('dummy'));
+               $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class, array('dummy'));
        }
 
        /**
@@ -54,10 +54,10 @@ class Md5SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function hasCorrectBaseClass() {
-               $hasCorrectBaseClass = get_class($this->objectInstance) === 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt';
+               $hasCorrectBaseClass = get_class($this->objectInstance) === \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class;
                // XCLASS ?
                if (!$hasCorrectBaseClass && FALSE != get_parent_class($this->objectInstance)) {
-                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt');
+                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class);
                }
                $this->assertTrue($hasCorrectBaseClass);
        }

diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
index 68a0d50..0486ffa 100644 (file)
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
@@ -34,17 +34,17 @@ class PhpassSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        public function setUp() {
-               $this->objectInstance = $this->getMock('TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt', array('dummy'));
+               $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class, array('dummy'));
        }
 
        /**
         * @test
         */
        public function hasCorrectBaseClass() {
-               $hasCorrectBaseClass = get_class($this->objectInstance) === 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt';
+               $hasCorrectBaseClass = get_class($this->objectInstance) === \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class;
                // XCLASS ?
                if (!$hasCorrectBaseClass && FALSE != get_parent_class($this->objectInstance)) {
-                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt');
+                       $hasCorrectBaseClass = is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class);
                }
                $this->assertTrue($hasCorrectBaseClass);
        }

diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
index 813b733..0170f6a 100644 (file)
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
@@ -49,19 +49,19 @@ class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function objectInstanceExtendsAbstractClass() {
-               $this->assertTrue(is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\AbstractSalt'));
+               $this->assertTrue(is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt::class));
        }
 
        /**
         * @test
         */
        public function objectInstanceImplementsInterface() {
-               $this->assertTrue(method_exists($this->objectInstance, 'checkPassword'), 'Missing method checkPassword() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
-               $this->assertTrue(method_exists($this->objectInstance, 'isHashUpdateNeeded'), 'Missing method isHashUpdateNeeded() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
-               $this->assertTrue(method_exists($this->objectInstance, 'isValidSalt'), 'Missing method isValidSalt() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
-               $this->assertTrue(method_exists($this->objectInstance, 'isValidSaltedPW'), 'Missing method isValidSaltedPW() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
-               $this->assertTrue(method_exists($this->objectInstance, 'getHashedPassword'), 'Missing method getHashedPassword() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
-               $this->assertTrue(method_exists($this->objectInstance, 'getSaltLength'), 'Missing method getSaltLength() from interface TYPO3\\CMS\\Saltedpasswords\\Salt\\SaltInterface.');
+               $this->assertTrue(method_exists($this->objectInstance, 'checkPassword'), 'Missing method checkPassword() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
+               $this->assertTrue(method_exists($this->objectInstance, 'isHashUpdateNeeded'), 'Missing method isHashUpdateNeeded() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
+               $this->assertTrue(method_exists($this->objectInstance, 'isValidSalt'), 'Missing method isValidSalt() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
+               $this->assertTrue(method_exists($this->objectInstance, 'isValidSaltedPW'), 'Missing method isValidSaltedPW() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
+               $this->assertTrue(method_exists($this->objectInstance, 'getHashedPassword'), 'Missing method getHashedPassword() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
+               $this->assertTrue(method_exists($this->objectInstance, 'getSaltLength'), 'Missing method getSaltLength() from interface ' . \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface::class . '.');
        }
 
        /**
@@ -88,7 +88,7 @@ class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function objectInstanceForMD5Salts() {
                $saltMD5 = '$1$rasmusle$rISCgZzpwk3UhDidwXvin0';
                $this->objectInstance = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance($saltMD5);
-               $this->assertTrue(get_class($this->objectInstance) == 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt' || is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt'));
+               $this->assertTrue(get_class($this->objectInstance) == \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class || is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class));
        }
 
        /**
@@ -97,7 +97,7 @@ class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function objectInstanceForBlowfishSalts() {
                $saltBlowfish = '$2a$07$abcdefghijklmnopqrstuuIdQV69PAxWYTgmnoGpe0Sk47GNS/9ZW';
                $this->objectInstance = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance($saltBlowfish);
-               $this->assertTrue(get_class($this->objectInstance) == 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt' || is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\BlowfishSalt'));
+               $this->assertTrue(get_class($this->objectInstance) == \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class || is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class));
        }
 
        /**
@@ -106,7 +106,7 @@ class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function objectInstanceForPhpassSalts() {
                $saltPhpass = '$P$CWF13LlG/0UcAQFUjnnS4LOqyRW43c.';
                $this->objectInstance = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance($saltPhpass);
-               $this->assertTrue(get_class($this->objectInstance) == 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt' || is_subclass_of($this->objectInstance, 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt'));
+               $this->assertTrue(get_class($this->objectInstance) == \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class || is_subclass_of($this->objectInstance, \TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class));
        }
 
        /**
@@ -114,7 +114,7 @@ class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function resettingFactoryInstanceSucceeds() {
                $defaultClassNameToUse = \TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility::getDefaultSaltingHashingMethod();
-               if ($defaultClassNameToUse == 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Md5Salt') {
+               if ($defaultClassNameToUse == \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class) {
                        $saltedPW = '$P$CWF13LlG/0UcAQFUjnnS4LOqyRW43c.';
                } else {
                        $saltedPW = '$1$rasmusle$rISCgZzpwk3UhDidwXvin0';

diff --git a/typo3/sysext/saltedpasswords/ext_localconf.php b/typo3/sysext/saltedpasswords/ext_localconf.php
index 9d48176..5c4bf7b 100644 (file)
--- a/typo3/sysext/saltedpasswords/ext_localconf.php
+++ b/typo3/sysext/saltedpasswords/ext_localconf.php
@@ -7,12 +7,12 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tce']['formevals']['tx_saltedpassword
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tce']['formevals']['tx_saltedpasswords_eval_be'] = 'EXT:saltedpasswords/Classes/Evaluation/BackendEvaluator.php';
 
 // Hook for processing "forgotPassword" in felogin
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['password_changed'][] = 'TYPO3\\CMS\\Saltedpasswords\\Utility\\SaltedPasswordsUtility->feloginForgotPasswordHook';
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['password_changed'][] = \TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility::class . '->feloginForgotPasswordHook';
 
 // Extension may register additional salted hashing methods in this array
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/saltedpasswords']['saltMethods'] = array();
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService('saltedpasswords', 'auth', 'TYPO3\\CMS\\Saltedpasswords\\SaltedPasswordService', array(
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService('saltedpasswords', 'auth', \TYPO3\CMS\Saltedpasswords\SaltedPasswordService::class, array(
        'title' => 'FE/BE Authentification salted',
        'description' => 'Salting of passwords for Frontend and Backend',
        'subtype' => 'authUserFE,authUserBE',
@@ -22,13 +22,13 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/saltedpasswords']['saltMethods']
        'quality' => 70,
        'os' => '',
        'exec' => '',
-       'className' => 'TYPO3\\CMS\\Saltedpasswords\\SaltedPasswordService'
+       'className' => \TYPO3\CMS\Saltedpasswords\SaltedPasswordService::class
 ));
 
 // Register bulk update task
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Saltedpasswords\\Task\\BulkUpdateTask'] = array(
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Saltedpasswords\Task\BulkUpdateTask::class] = array(
        'extension' => $_EXTKEY,
        'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.name',
        'description' => 'LLL:EXT:' . $_EXTKEY . '/locallang.xlf:ext.saltedpasswords.tasks.bulkupdate.description',
-       'additionalFields' => 'TYPO3\\CMS\\Saltedpasswords\\Task\\BulkUpdateFieldProvider'
+       'additionalFields' => \TYPO3\CMS\Saltedpasswords\Task\BulkUpdateFieldProvider::class
 );