4.0 | Let T_STATIC be T_STATIC

Implementation of the proposal outlined in issue 3115. 1. Removes the Tokenizer/PHP code which made an exception for `instanceof static`. 2. Adds an exception for `instanceof static` to the `Squiz.WhiteSpace.ScopeKeywordSpacing` sniff for which the tokenizer code was originally put in place. The tests for all other sniffs still pass. I've had a quick look through the other sniffs which refer to the `T_STATIC` token, but didn't see any which should be impacted by this change (and didn't have unit tests with `instanceof static`). Fixes 3115
PHPCSStandards · Dec 7, 2023 · 67d9752 · 67d9752
1 parent a949e13
commit 67d9752
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -55,6 +55,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($tokens[$stackPtr]['code'] === T_STATIC) {
             if (($nextToken === false || $tokens[$nextToken]['code'] === T_DOUBLE_COLON)
                 || $tokens[$prevToken]['code'] === T_NEW
+                || $tokens[$prevToken]['code'] === T_INSTANCEOF
             ) {
                 // Late static binding, e.g., static:: OR new static() usage or live coding.
                 return;

diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -2940,24 +2940,6 @@ protected function processAdditional()
                     }
                 }
 
-                continue;
-            } else if ($this->tokens[$i]['code'] === T_STATIC) {
-                for ($x = ($i - 1); $x > 0; $x--) {
-                    if (isset(Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        break;
-                    }
-                }
-
-                if ($this->tokens[$x]['code'] === T_INSTANCEOF) {
-                    $this->tokens[$i]['code'] = T_STRING;
-                    $this->tokens[$i]['type'] = 'T_STRING';
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        Common::printStatusMessage("* token $i on line $line changed from T_STATIC to T_STRING", 1);
-                    }
-                }
-
                 continue;
             } else if ($this->tokens[$i]['code'] === T_TRUE
                 || $this->tokens[$i]['code'] === T_FALSE