Had to make a special exception for braceless IF/ELSEIF/ELSE as fix f…

…or bug #879 broke tokenizing for some case statements (bug #893)
squizlabs · Feb 15, 2016 · 63c9e3a · 63c9e3a
1 parent 858934b
commit 63c9e3a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/CodeSniffer/File.php b/CodeSniffer/File.php
@@ -2129,10 +2129,27 @@ private static function _recurseScopeMap(
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $type = $tokens[$stackPtr]['type'];
                         echo str_repeat("\t", $depth);
-                        echo "=> Found new opening condition before scope opener for $stackPtr:$type, bailing".PHP_EOL;
+                        echo "=> Found new opening condition before scope opener for $stackPtr:$type, ";
                     }
 
-                    return ($i - 1);
+                    if (($tokens[$stackPtr]['code'] === T_IF
+                        || $tokens[$stackPtr]['code'] === T_ELSEIF
+                        || $tokens[$stackPtr]['code'] === T_ELSE)
+                        && ($tokens[$i]['code'] === T_ELSE
+                        || $tokens[$i]['code'] === T_ELSEIF)
+                    ) {
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo "continuing".PHP_EOL;
+                        }
+
+                        return ($i - 1);
+                    } else {
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo "backtracking".PHP_EOL;
+                        }
+
+                        return $stackPtr;
+                    }
                 }//end if
 
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {

diff --git a/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc b/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
@@ -126,3 +126,17 @@ endif;
         <li><?php echo $value ?></li>
             <?php endforeach ?>
 </ul>
+<?php
+switch ( $a ) {
+    case 'foo':
+        do {
+            $a = 'b';
+        } while ( $a );
+    return 5;
+
+    case 'bar':
+        foreach ( $a as $b ) {
+            $e = 'b';
+        }
+    return 5;
+}
diff --git a/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed b/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc.fixed
@@ -129,3 +129,17 @@ endif;
         <li><?php echo $value ?></li>
     <?php endforeach ?>
 </ul>
+<?php
+switch ( $a ) {
+    case 'foo':
+        do {
+            $a = 'b';
+        } while ( $a );
+        return 5;
+
+    case 'bar':
+        foreach ( $a as $b ) {
+            $e = 'b';
+        }
+        return 5;
+}
diff --git a/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
@@ -54,6 +54,8 @@ public function getErrorList()
                 98  => 1,
                 122 => 1,
                 127 => 1,
+                135 => 1,
+                141 => 1,
                );
 
     }//end getErrorList()