Merge branch 'php-8.0/tokenizer-php-match-efficiency-tweaks' of https…

…://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Mar 29, 2021 · fe68f36 · fe68f36
2 parents fc4970b + b4ad1ad
commit fe68f36
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 26 deletions.
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -1288,33 +1288,22 @@ protected function tokenize($string)
                         break;
                     }
 
-                    // Next was an open parenthesis, now check what is before the match keyword.
-                    for ($y = ($stackPtr - 1); $y >= 0; $y--) {
-                        if (is_array($tokens[$y]) === true
-                            && isset(Util\Tokens::$emptyTokens[$tokens[$y][0]]) === true
-                        ) {
-                            continue;
-                        }
+                    $notMatchContext = [
+                        T_PAAMAYIM_NEKUDOTAYIM     => true,
+                        T_OBJECT_OPERATOR          => true,
+                        T_NULLSAFE_OBJECT_OPERATOR => true,
+                        T_NS_SEPARATOR             => true,
+                        T_NEW                      => true,
+                        T_FUNCTION                 => true,
+                    ];
 
-                        if (is_array($tokens[$y]) === true
-                            && ($tokens[$y][0] === T_PAAMAYIM_NEKUDOTAYIM
-                            || $tokens[$y][0] === T_OBJECT_OPERATOR
-                            || $tokens[$y][0] === T_NS_SEPARATOR
-                            || $tokens[$y][0] === T_NEW
-                            || $tokens[$y][0] === T_FUNCTION
-                            || $tokens[$y][0] === T_CLASS
-                            || $tokens[$y][0] === T_INTERFACE
-                            || $tokens[$y][0] === T_TRAIT
-                            || $tokens[$y][0] === T_NAMESPACE
-                            || $tokens[$y][0] === T_CONST)
-                        ) {
-                            // This is not a match expression.
-                            break 2;
-                        }
+                    if (isset($notMatchContext[$finalTokens[$lastNotEmptyToken]['code']]) === true) {
+                        // Also not a match expression.
+                        break;
+                    }
 
-                        $isMatch = true;
-                        break 2;
-                    }//end for
+                    $isMatch = true;
+                    break;
                 }//end for
 
                 if ($isMatch === true && $token[0] === T_STRING) {

diff --git a/tests/Core/Tokenizer/BackfillMatchTokenTest.inc b/tests/Core/Tokenizer/BackfillMatchTokenTest.inc
@@ -220,7 +220,7 @@ $a = MyClass::Match[$a];
 $a = $obj->match($param);
 
 /* testNoMatchMethodCallUpper */
-$a = $obj->MATCH()->chain($param);
+$a = $obj??->MATCH()->chain($param);
 
 /* testNoMatchPropertyAccess */
 $a = $obj->match;
@@ -282,6 +282,18 @@ function match() {}
 // Intentional fatal error. Match is now a reserved keyword.
 namespace Match {}
 
+/* testNoMatchExtendedClassDeclaration */
+// Intentional fatal error. Match is now a reserved keyword.
+class Foo extends Match {}
+
+/* testNoMatchImplementedClassDeclaration */
+// Intentional fatal error. Match is now a reserved keyword.
+class Bar implements Match {}
+
+/* testNoMatchInUseStatement */
+// Intentional fatal error in PHP < 8. Match is now a reserved keyword.
+use Match\me;
+
 function brokenMatchNoCurlies($x) {
     /* testNoMatchMissingCurlies */
     // Intentional fatal error. New control structure is not supported without curly braces.

diff --git a/tests/Core/Tokenizer/BackfillMatchTokenTest.php b/tests/Core/Tokenizer/BackfillMatchTokenTest.php
@@ -296,6 +296,18 @@ public function dataNotAMatchStructure()
                 '/* testNoMatchNamespaceDeclaration */',
                 'Match',
             ],
+            'class_extends_declaration'            => [
+                '/* testNoMatchExtendedClassDeclaration */',
+                'Match',
+            ],
+            'class_implements_declaration'         => [
+                '/* testNoMatchImplementedClassDeclaration */',
+                'Match',
+            ],
+            'use_statement'                        => [
+                '/* testNoMatchInUseStatement */',
+                'Match',
+            ],
             'unsupported_inline_control_structure' => ['/* testNoMatchMissingCurlies */'],
             'unsupported_alternative_syntax'       => ['/* testNoMatchAlternativeSyntax */'],
             'live_coding'                          => ['/* testLiveCoding */'],