Fix up "Fix mis-identification of 'readonly' keyword"

... for changes between PHPCS 3.x vs 4.x.
PHPCSStandards · Nov 9, 2023 · aa9bd2b · aa9bd2b
1 parent 674b27a
commit aa9bd2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -1254,7 +1254,7 @@ protected function tokenize($string)
                 // Get the next non-whitespace token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens[$i]) === false
-                        || isset(Util\Tokens::$emptyTokens[$tokens[$i][0]]) === false
+                        || isset(Tokens::$emptyTokens[$tokens[$i][0]]) === false
                     ) {
                         break;
                     }
@@ -1284,7 +1284,7 @@ protected function tokenize($string)
                             $tokenType = $tokens[$i];
                         }
 
-                        if (isset(Util\Tokens::$emptyTokens[$tokenType]) === true) {
+                        if (isset(Tokens::$emptyTokens[$tokenType]) === true) {
                             continue;
                         }
 
@@ -1338,7 +1338,7 @@ protected function tokenize($string)
                     $newStackPtr++;
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1 && $type !== T_READONLY) {
-                        echo "\t\t* token $stackPtr changed from $type to T_READONLY".PHP_EOL;
+                        Common::printStatusMessage("* token $stackPtr changed from $type to T_READONLY", 2);
                     }
                 } else {
                     $finalTokens[$newStackPtr] = [
@@ -1349,7 +1349,7 @@ protected function tokenize($string)
                     $newStackPtr++;
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1 && $type !== T_STRING) {
-                        echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
+                        Common::printStatusMessage("* token $stackPtr changed from $type to T_STRING", 2);
                     }
                 }//end if
 

diff --git a/tests/Core/Tokenizer/BackfillReadonlyTest.inc b/tests/Core/Tokenizer/BackfillReadonlyTest.inc
@@ -88,8 +88,6 @@ namespace My\Readonly\Collection;
 $var = readonly($a, $b);
 /* testReadonlyAsNamespacedFunctionCall */
 $var = My\NS\readonly($a, $b);
-/* testReadonlyAsNamespaceRelativeFunctionCall */
-$var = namespace\ReadOnly($a, $b);
 /* testReadonlyAsMethodCall */
 $var = $obj->readonly($a, $b);
 /* testReadonlyAsNullsafeMethodCall */

diff --git a/tests/Core/Tokenizer/BackfillReadonlyTest.php b/tests/Core/Tokenizer/BackfillReadonlyTest.php
@@ -264,11 +264,7 @@ public function dataNotReadonly()
             ],
             [
                 '/* testReadonlyAsNamespacedFunctionCall */',
-                'readonly',
-            ],
-            [
-                '/* testReadonlyAsNamespaceRelativeFunctionCall */',
-                'ReadOnly',
+                'My\NS\readonly',
             ],
             [
                 '/* testReadonlyAsMethodCall */',