Tokenizer/PHP: namespaced names as single token, mirroring PHP 8.0+

src/Files/File.php

@@ -1415,7 +1415,10 @@ public function getMethodParameters($stackPtr)
                 }
                 break;
             case T_STRING:
-                // This is a string, so it may be a type hint, but it could
+            case T_NAME_QUALIFIED:
+            case T_NAME_FULLY_QUALIFIED:
+            case T_NAME_RELATIVE:
+                // This is an identifier name, so it may be a type declaration, but it could
                 // also be a constant used as a default value.
                 $prevComma = false;
                 for ($t = $i; $t >= $opener; $t--) {
@@ -1673,17 +1676,15 @@ public function getMethodProperties($stackPtr)
                 $scopeOpener = $this->tokens[$stackPtr]['scope_opener'];
             }
 
-            $valid = [
-                T_STRING                 => T_STRING,
+            $valid  = Tokens::$nameTokens;
+            $valid += [
                 T_CALLABLE               => T_CALLABLE,
                 T_SELF                   => T_SELF,
                 T_PARENT                 => T_PARENT,
                 T_STATIC                 => T_STATIC,
                 T_FALSE                  => T_FALSE,
                 T_TRUE                   => T_TRUE,
                 T_NULL                   => T_NULL,
-                T_NAMESPACE              => T_NAMESPACE,
-                T_NS_SEPARATOR           => T_NS_SEPARATOR,
                 T_TYPE_UNION             => T_TYPE_UNION,
                 T_TYPE_INTERSECTION      => T_TYPE_INTERSECTION,
                 T_TYPE_OPEN_PARENTHESIS  => T_TYPE_OPEN_PARENTHESIS,
@@ -1876,16 +1877,14 @@ public function getMemberProperties($stackPtr)
 
         if ($i < $stackPtr) {
             // We've found a type.
-            $valid = [
-                T_STRING                 => T_STRING,
+            $valid  = Tokens::$nameTokens;
+            $valid += [
                 T_CALLABLE               => T_CALLABLE,
                 T_SELF                   => T_SELF,
                 T_PARENT                 => T_PARENT,
                 T_FALSE                  => T_FALSE,
                 T_TRUE                   => T_TRUE,
                 T_NULL                   => T_NULL,
-                T_NAMESPACE              => T_NAMESPACE,
-                T_NS_SEPARATOR           => T_NS_SEPARATOR,
                 T_TYPE_UNION             => T_TYPE_UNION,
                 T_TYPE_INTERSECTION      => T_TYPE_INTERSECTION,
                 T_TYPE_OPEN_PARENTHESIS  => T_TYPE_OPEN_PARENTHESIS,
@@ -2086,12 +2085,10 @@ public function isReference($stackPtr)
                 return true;
             } else {
                 $skip   = Tokens::$emptyTokens;
-                $skip[] = T_NS_SEPARATOR;
+                $skip  += Tokens::$nameTokens;
                 $skip[] = T_SELF;
                 $skip[] = T_PARENT;
                 $skip[] = T_STATIC;
-                $skip[] = T_STRING;
-                $skip[] = T_NAMESPACE;
                 $skip[] = T_DOUBLE_COLON;
 
                 $nextSignificantAfter = $this->findNext(
@@ -2781,11 +2778,8 @@ public function findExtendedClassName($stackPtr)
             return false;
         }
 
-        $find = [
-            T_NS_SEPARATOR,
-            T_STRING,
-            T_WHITESPACE,
-        ];
+        $find   = Tokens::$nameTokens;
+        $find[] = T_WHITESPACE;
 
         $end  = $this->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
         $name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
@@ -2833,12 +2827,9 @@ public function findImplementedInterfaceNames($stackPtr)
             return false;
         }
 
-        $find = [
-            T_NS_SEPARATOR,
-            T_STRING,
-            T_WHITESPACE,
-            T_COMMA,
-        ];
+        $find   = Tokens::$nameTokens;
+        $find[] = T_WHITESPACE;
+        $find[] = T_COMMA;
 
         $end  = $this->findNext($find, ($implementsIndex + 1), ($classOpenerIndex + 1), true);
         $name = $this->getTokensAsString(($implementsIndex + 1), ($end - $implementsIndex - 1));

src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php

@@ -63,24 +63,16 @@ public function process(File $phpcsFile, $stackPtr)
             // Keep track of what namespace we are in.
             if ($tokens[$stackPtr]['code'] === T_NAMESPACE) {
                 $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-                if ($nextNonEmpty !== false
-                    // Ignore namespace keyword used as operator.
-                    && $tokens[$nextNonEmpty]['code'] !== T_NS_SEPARATOR
-                ) {
-                    $namespace = '';
-                    for ($i = $nextNonEmpty; $i < $phpcsFile->numTokens; $i++) {
-                        if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
-                            continue;
-                        }
-
-                        if ($tokens[$i]['code'] !== T_STRING && $tokens[$i]['code'] !== T_NS_SEPARATOR) {
-                            break;
-                        }
-
-                        $namespace .= $tokens[$i]['content'];
+                if ($nextNonEmpty !== false) {
+                    if ($tokens[$nextNonEmpty]['code'] === T_STRING
+                        || $tokens[$nextNonEmpty]['code'] === T_NAME_QUALIFIED
+                    ) {
+                        $namespace = $tokens[$nextNonEmpty]['content'];
+                    } else if ($tokens[$nextNonEmpty]['code'] === T_OPEN_CURLY_BRACKET) {
+                        $namespace = '';
                     }
 
-                    $stackPtr = $i;
+                    $stackPtr = $nextNonEmpty;
                 }
             } else {
                 $name = $phpcsFile->getDeclarationName($stackPtr);

src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php

@@ -80,7 +80,7 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             } else if ($position > 1) {
                 break;
-            } else if ($code !== T_VARIABLE && $code !== T_STRING) {
+            } else if ($code !== T_VARIABLE && isset(Tokens::$nameTokens[$code]) === false) {
                 continue;
             }
 

src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php

@@ -88,7 +88,7 @@ public function process(File $phpcsFile, $stackPtr)
             );
 
             if ($beforeOpeningParenthesisIndex === false || $tokens[$beforeOpeningParenthesisIndex]['code'] !== T_ARRAY) {
-                if ($tokens[$beforeOpeningParenthesisIndex]['code'] === T_STRING) {
+                if (isset(Tokens::$nameTokens[$tokens[$beforeOpeningParenthesisIndex]['code']]) === true) {
                     return;
                 }
 

src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php

@@ -24,17 +24,17 @@ class FunctionCallArgumentSpacingSniff implements Sniff
      */
     public function register()
     {
-        return[
-            T_STRING,
-            T_ISSET,
-            T_UNSET,
-            T_SELF,
-            T_STATIC,
-            T_PARENT,
-            T_VARIABLE,
-            T_CLOSE_CURLY_BRACKET,
-            T_CLOSE_PARENTHESIS,
-        ];
+        $targets   = Tokens::$nameTokens;
+        $targets[] = T_ISSET;
+        $targets[] = T_UNSET;
+        $targets[] = T_SELF;
+        $targets[] = T_STATIC;
+        $targets[] = T_PARENT;
+        $targets[] = T_VARIABLE;
+        $targets[] = T_CLOSE_CURLY_BRACKET;
+        $targets[] = T_CLOSE_PARENTHESIS;
+
+        return $targets;
 
     }//end register()
 

src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php

@@ -26,6 +26,7 @@ public function register()
     {
         return [
             T_STRING,
+            T_NAME_FULLY_QUALIFIED,
             T_CONST,
         ];
 
@@ -83,7 +84,7 @@ public function process(File $phpcsFile, $stackPtr)
         }//end if
 
         // Only interested in define statements now.
-        if (strtolower($tokens[$stackPtr]['content']) !== 'define') {
+        if (strtolower(ltrim($tokens[$stackPtr]['content'], '\\')) !== 'define') {
             return;
         }
 

src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php

@@ -70,7 +70,10 @@ public function register()
                 $this->forbiddenFunctionNames[$i] = '/'.$name.'/i';
             }
 
-            return [T_STRING];
+            return [
+                T_STRING,
+                T_NAME_FULLY_QUALIFIED,
+            ];
         }
 
         // If we are not pattern matching, we need to work out what
@@ -102,7 +105,10 @@ public function register()
         $this->forbiddenFunctionNames = array_map('strtolower', $this->forbiddenFunctionNames);
         $this->forbiddenFunctions     = array_combine($this->forbiddenFunctionNames, $this->forbiddenFunctions);
 
-        return array_unique($register);
+        $targets   = array_unique($register);
+        $targets[] = T_NAME_FULLY_QUALIFIED;
+
+        return $targets;
 
     }//end register()
 
@@ -132,22 +138,11 @@ public function process(File $phpcsFile, $stackPtr)
             T_AS                       => true,
             T_NEW                      => true,
             T_INSTEADOF                => true,
-            T_NS_SEPARATOR             => true,
             T_IMPLEMENTS               => true,
         ];
 
         $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
 
-        // If function call is directly preceded by a NS_SEPARATOR it points to the
-        // global namespace, so we should still catch it.
-        if ($tokens[$prevToken]['code'] === T_NS_SEPARATOR) {
-            $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true);
-            if ($tokens[$prevToken]['code'] === T_STRING) {
-                // Not in the global namespace.
-                return;
-            }
-        }
-
         if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
             // Not a call to a PHP function.
             return;
@@ -159,7 +154,9 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        if ($tokens[$stackPtr]['code'] === T_STRING && $tokens[$nextToken]['code'] !== T_OPEN_PARENTHESIS) {
+        if (($tokens[$stackPtr]['code'] === T_STRING || $tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED)
+            && $tokens[$nextToken]['code'] !== T_OPEN_PARENTHESIS
+        ) {
             // Not a call to a PHP function.
             return;
         }
@@ -170,8 +167,11 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $function = strtolower($tokens[$stackPtr]['content']);
-        $pattern  = null;
+        if ($tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED) {
+            $function = ltrim($function, '\\');
+        }
 
+        $pattern = null;
         if ($this->patternMatch === true) {
             $count   = 0;
             $pattern = preg_replace(
@@ -194,7 +194,7 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }//end if
 
-        $this->addError($phpcsFile, $stackPtr, $tokens[$stackPtr]['content'], $pattern);
+        $this->addError($phpcsFile, $stackPtr, $function, $pattern);
 
     }//end process()
 

src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php

@@ -23,7 +23,10 @@ class SAPIUsageSniff implements Sniff
      */
     public function register()
     {
-        return [T_STRING];
+        return [
+            T_STRING,
+            T_NAME_FULLY_QUALIFIED,
+        ];
 
     }//end register()
 
@@ -41,6 +44,11 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        $function = strtolower(ltrim($tokens[$stackPtr]['content'], '\\'));
+        if ($function !== 'php_sapi_name') {
+            return;
+        }
+
         $ignore = [
             T_DOUBLE_COLON             => true,
             T_OBJECT_OPERATOR          => true,
@@ -55,11 +63,8 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $function = strtolower($tokens[$stackPtr]['content']);
-        if ($function === 'php_sapi_name') {
-            $error = 'Use the PHP_SAPI constant instead of calling php_sapi_name()';
-            $phpcsFile->addError($error, $stackPtr, 'FunctionFound');
-        }
+        $error = 'Use the PHP_SAPI constant instead of calling php_sapi_name()';
+        $phpcsFile->addError($error, $stackPtr, 'FunctionFound');
 
     }//end process()
 

src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php

@@ -53,7 +53,8 @@ public function process(File $phpcsFile, $stackPtr)
         // Is this a pre-increment/decrement ?
         $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== false
-            && ($tokens[$nextNonEmpty]['code'] === T_VARIABLE || $tokens[$nextNonEmpty]['code'] === T_STRING)
+            && ($tokens[$nextNonEmpty]['code'] === T_VARIABLE
+            || isset(Tokens::$nameTokens[$tokens[$nextNonEmpty]['code']]) === true)
         ) {
             if ($nextNonEmpty === ($stackPtr + 1)) {
                 $phpcsFile->recordMetric($stackPtr, 'Spacing between in/decrementor and variable', 0);
@@ -106,7 +107,7 @@ public function process(File $phpcsFile, $stackPtr)
         $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($prevNonEmpty !== false
             && ($tokens[$prevNonEmpty]['code'] === T_VARIABLE
-            || $tokens[$prevNonEmpty]['code'] === T_STRING
+            || isset(Tokens::$nameTokens[$tokens[$prevNonEmpty]['code']]) === true
             || $tokens[$prevNonEmpty]['code'] === T_CLOSE_SQUARE_BRACKET)
         ) {
             if ($prevNonEmpty === ($stackPtr - 1)) {

src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php

@@ -73,8 +73,9 @@ public function process(File $phpcsFile, $stackPtr)
         $content = $tokens[$stackPtr]['content'];
         if ($tokens[$stackPtr]['code'] === T_NAMESPACE) {
             $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-            if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === T_NS_SEPARATOR) {
+            if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === T_NAME_FULLY_QUALIFIED) {
                 // Namespace keyword used as operator, not as the language construct.
+                // Note: in PHP >= 8 namespaced names no longer allow for whitespace/comments between the parts (parse error).
                 return;
             }
         }

src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.8.inc

@@ -3,6 +3,6 @@ namespace Foo\Bar;
 class MyClass {}
 interface YourInterface {}
 
-namespace Foo /*comment*/ \ /*comment*/ Bar;
+namespace /*comment*/ Foo\Bar;
 class MyClass {}
 interface YourInterface {}

src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.1.inc

@@ -93,3 +93,7 @@ endfor;
 for ($i = 0; $i < 10; $i = increment($i)) {}
 
 for ($i = initialValue(); $i < 10; $i = increment($i)) {}
+
+for ($i = 0; \Fully\qualified($value); $i++) {}
+for ($i = 0; Partially\qualified($value); $i++) {}
+for ($i = 0; namespace\relatived($value); $i++) {}

src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php

@@ -64,6 +64,9 @@ public function getWarningList($testFile='')
                 66 => 1,
                 72 => 1,
                 81 => 1,
+                97 => 1,
+                98 => 1,
+                99 => 1,
             ];
         default:
             return [];

src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc

@@ -185,3 +185,10 @@ echo match ($text) {
 1 >= $value;
 1 <= $value;
 1 <=> $value;
+
+if(\Fully\qualified('foo') === false){}
+if(true === \Fully\qualified(10)){}
+if(Partially\qualified('foo') === 10){}
+if(1.5 === Partially\qualified(true)){}
+if(namespace\relative(false) === null){}
+if('string' === namespace\relative(null)){}

src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php

@@ -72,6 +72,9 @@ public function getErrorList()
             185 => 1,
             186 => 1,
             187 => 1,
+            190 => 1,
+            192 => 1,
+            194 => 1,
         ];
 
     }//end getErrorList()

src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.1.inc

@@ -197,3 +197,7 @@ $foobar = functionCallMatchParam(
     }  , // But check the spacing again once the match expression has finished.
     $args
 );
+
+$result = \Fully\qualified($arg1,$arg2);
+$result = Partially\qualified($arg1 , $arg2);
+$result = namespace\relative($arg1 ,  $arg2);