Merge 3b9adba into 58bb724

PHPCSStandards · Dec 22, 2020 · 5c01bdb · 5c01bdb
2 parents 58bb724 + 3b9adba
commit 5c01bdb
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 20 deletions.
diff --git a/PHPCSUtils/BackCompat/BCTokens.php b/PHPCSUtils/BackCompat/BCTokens.php
@@ -358,6 +358,7 @@ public static function textStringTokens()
      * Changelog for the PHPCS native array:
      * - Introduced in PHPCS 2.3.3.
      * - PHPCS 3.1.0: `T_SELF` and `T_STATIC` added to the array.
+     * - PHPCS 4.0.0: `T_NAME_QUALIFIED`, `T_NAME_FULLY_QUALIFIED` and `T_NAME_RELATIVE` added to the array.
      *
      * @see \PHP_CodeSniffer\Util\Tokens::$functionNameTokens Original array.
      *
@@ -370,6 +371,7 @@ public static function functionNameTokens()
         $tokens            = Tokens::$functionNameTokens;
         $tokens[\T_SELF]   = \T_SELF;
         $tokens[\T_STATIC] = \T_STATIC;
+        $tokens           += Collections::nameTokens();
 
         return $tokens;
     }

diff --git a/PHPCSUtils/TestUtils/UtilityMethodTestCase.php b/PHPCSUtils/TestUtils/UtilityMethodTestCase.php
@@ -330,9 +330,9 @@ public static function resetTestFile()
     public static function usesPhp8NameTokens()
     {
         $version = Helper::getVersion();
-        if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            && (\version_compare($version, '3.5.7', '<') === true
-                || \version_compare($version, '4.0.0', '>=') === true)
+        if ((\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
+            && \version_compare($version, '3.5.7', '<') === true)
+            || \version_compare($version, '4.0.0', '>=') === true
         ) {
             return true;
         }

diff --git a/Tests/BackCompat/BCFile/GetMethodPropertiesTest.php b/Tests/BackCompat/BCFile/GetMethodPropertiesTest.php
@@ -341,12 +341,14 @@ public function testReturnNamespace()
      */
     public function testReturnMultilineNamespace()
     {
+        $php8Names = parent::usesPhp8NameTokens();
+
         $expected = [
             'scope'                 => 'public',
             'scope_specified'       => false,
             'return_type'           => '\MyNamespace\MyClass\Foo',
             'return_type_token'     => 7, // Offset from the T_FUNCTION token.
-            'return_type_end_token' => 23, // Offset from the T_FUNCTION token.
+            'return_type_end_token' => ($php8Names === true) ? 20 : 23, // Offset from the T_FUNCTION token.
             'nullable_return_type'  => false,
             'is_abstract'           => false,
             'is_final'              => false,

diff --git a/Tests/BackCompat/BCTokens/FunctionNameTokensTest.php b/Tests/BackCompat/BCTokens/FunctionNameTokensTest.php
@@ -12,6 +12,7 @@
 
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\BackCompat\BCTokens;
+use PHPCSUtils\BackCompat\Helper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -33,6 +34,7 @@ class FunctionNameTokensTest extends TestCase
      */
     public function testFunctionNameTokens()
     {
+        $version  = Helper::getVersion();
         $expected = [
             \T_STRING       => \T_STRING,
             \T_EVAL         => \T_EVAL,
@@ -48,7 +50,20 @@ public function testFunctionNameTokens()
             \T_STATIC       => \T_STATIC,
         ];
 
-        $this->assertSame($expected, BCTokens::functionNameTokens());
+        if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
+            || \version_compare($version, '3.5.7', '>=') === true
+        ) {
+            $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
+            $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;
+            $expected[\T_NAME_RELATIVE]        = \T_NAME_RELATIVE;
+        }
+
+        \asort($expected);
+
+        $result = BCTokens::functionNameTokens();
+        \asort($result);
+
+        $this->assertSame($expected, $result);
     }
 
     /**

diff --git a/Tests/Tokens/Collections/FunctionCallTokensTest.php b/Tests/Tokens/Collections/FunctionCallTokensTest.php
@@ -39,8 +39,7 @@ public function testFunctionCallTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/NameTokensTest.php b/Tests/Tokens/Collections/NameTokensTest.php
@@ -39,8 +39,7 @@ public function testNameTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/NamespacedNameTokensTest.php b/Tests/Tokens/Collections/NamespacedNameTokensTest.php
@@ -41,8 +41,7 @@ public function testNamespacedNameTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/ParameterPassingTokensTest.php b/Tests/Tokens/Collections/ParameterPassingTokensTest.php
@@ -39,8 +39,7 @@ public function testParameterPassingTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/ParameterTypeTokensTest.php b/Tests/Tokens/Collections/ParameterTypeTokensTest.php
@@ -47,8 +47,7 @@ public function testParameterTypeTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/PropertyTypeTokensTest.php b/Tests/Tokens/Collections/PropertyTypeTokensTest.php
@@ -47,8 +47,7 @@ public function testPropertyTypeTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Tokens/Collections/ReturnTypeTokensTest.php b/Tests/Tokens/Collections/ReturnTypeTokensTest.php
@@ -49,8 +49,7 @@ public function testReturnTypeTokens()
         ];
 
         if (\version_compare(\PHP_VERSION_ID, '80000', '>=') === true
-            || (\version_compare($version, '3.5.7', '>=') === true
-                && \version_compare($version, '4.0.0', '<') === true)
+            || \version_compare($version, '3.5.7', '>=') === true
         ) {
             $expected[\T_NAME_QUALIFIED]       = \T_NAME_QUALIFIED;
             $expected[\T_NAME_FULLY_QUALIFIED] = \T_NAME_FULLY_QUALIFIED;

diff --git a/Tests/Utils/PassedParameters/GetParametersNamedTest.php b/Tests/Utils/PassedParameters/GetParametersNamedTest.php
@@ -109,7 +109,7 @@ public function dataGetParameters()
                     ],
                     3 => [
                         'start' => ($php8Names === true) ? 7 : 8,
-                        'end'   => ($php8Names === true) ? 7 : 11,
+                        'end'   => ($php8Names === true) ? 8 : 11,
                         'raw'   => 'MyNS\VALUE',
                     ],
                 ],