Fixed an issue where the tokenizer was assigning curly braces incorrectly (ref #2596)

Author: gsherwood

package.xml

@@ -44,6 +44,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - JSON reports now end with a newline character
   - The phpcs.xsd schema now validates phpcs-only and phpcbf-only attributes correctly
     -- Thanks to Juliette Reinders Folmer for the patch
+  - The tokenizer now correctly identifies inline control structures in more cases
   - All helper methods inside the File class now throw RuntimeException instead of TokenizerException
     -- Some tokenizer methods were also throwing RuntimeExpection but now correctly throw TokenizerException
     -- Thanks to Juliette Reinders Folmer for the patch

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.1.inc

@@ -238,3 +238,9 @@ if ($bar)
 if (true) $callable = function () {
     return true;
 };
+
+foreach ([] as $a)
+echo 'bar';
+{
+    echo 'baz';
+}

src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.1.inc.fixed

@@ -273,3 +273,10 @@ if (true) { $callable = function () {
     return true;
 };
 }
+
+foreach ([] as $a) {
+echo 'bar';
+}
+{
+    echo 'baz';
+}

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

@@ -75,6 +75,7 @@ public function getErrorList($testFile='InlineControlStructureUnitTest.1.inc')
                 235 => 1,
                 236 => 1,
                 238 => 1,
+                242 => 1,
             ];
 
         case 'InlineControlStructureUnitTest.js':

src/Tokenizers/Tokenizer.php

@@ -1319,6 +1319,20 @@ private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
 
                     $opener = $i;
                 }
+            } else if ($tokenType === T_SEMICOLON
+                && $opener === null
+                && (isset($this->tokens[$stackPtr]['parenthesis_closer']) === false
+                || $i > $this->tokens[$stackPtr]['parenthesis_closer'])
+            ) {
+                // Found the end of a statement but still haven't
+                // found our opener, so we are never going to find one.
+                if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                    $type = $this->tokens[$stackPtr]['type'];
+                    echo str_repeat("\t", $depth);
+                    echo "=> Found end of statement before scope opener for $stackPtr:$type, continuing".PHP_EOL;
+                }
+
+                return ($i - 1);
             } else if ($tokenType === T_OPEN_PARENTHESIS) {
                 if (isset($this->tokens[$i]['parenthesis_owner']) === true) {
                     $owner = $this->tokens[$i]['parenthesis_owner'];
@@ -1328,7 +1342,7 @@ private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
                         // If we get into here, then we opened a parenthesis for
                         // a scope (eg. an if or else if) so we need to update the
                         // start of the line so that when we check to see
-                        // if the closing parenthesis is more than 3 lines away from
+                        // if the closing parenthesis is more than n lines away from
                         // the statement, we check from the closing parenthesis.
                         $startLine = $this->tokens[$this->tokens[$i]['parenthesis_closer']]['line'];
                     }