Merge pull request #90 from PHPCSStandards/php-8.3/generic-unconditio…

…nalifstatement-tokenizer-php-bugs PHP 8.3 | Tokenizer/PHP + Generic/UnconditionalIfStatement: bug fix
PHPCSStandards · Dec 4, 2023 · 11ea94d · 11ea94d
2 parents 0cea0cc + 6b1c30b
commit 11ea94d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php b/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
@@ -64,7 +64,7 @@ public function process(File $phpcsFile, $stackPtr)
         $token  = $tokens[$stackPtr];
 
         // Skip if statement without body.
-        if (isset($token['parenthesis_opener']) === false) {
+        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
             return;
         }
 

diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc b/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc
@@ -10,4 +10,8 @@ if (true) {
 
 if (file_exists(__FILE__) === true) {
 
-}
+}
+
+// Intentional parse error/live coding.
+// This needs to be the last test in the file.
+if(true
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -3131,14 +3131,16 @@ protected function processAdditional()
                 || $this->tokens[$i]['code'] === T_FALSE
                 || $this->tokens[$i]['code'] === T_NULL
             ) {
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
+                for ($x = ($i + 1); $x < $numTokens; $x++) {
                     if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
                         // Non-whitespace content.
                         break;
                     }
                 }
 
-                if (isset($this->tstringContexts[$this->tokens[$x]['code']]) === true) {
+                if ($x !== $numTokens
+                    && isset($this->tstringContexts[$this->tokens[$x]['code']]) === true
+                ) {
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $line = $this->tokens[$i]['line'];
                         $type = $this->tokens[$i]['type'];