Fix break/continue variable argument bug with closing tag after break…

…/continue.
PHPCompatibility · Jun 10, 2017 · f27ff80 · f27ff80
1 parent c2bbf8e
commit f27ff80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Sniffs/PHP/ForbiddenBreakContinueVariableArgumentsSniff.php b/Sniffs/PHP/ForbiddenBreakContinueVariableArgumentsSniff.php
@@ -63,7 +63,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         }
 
         $tokens             = $phpcsFile->getTokens();
-        $nextSemicolonToken = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr), null, false);
+        $nextSemicolonToken = $phpcsFile->findNext(array(T_SEMICOLON, T_CLOSE_TAG), ($stackPtr), null, false);
         $errorType          = '';
         for ($curToken = $stackPtr + 1; $curToken < $nextSemicolonToken; $curToken++) {
             if ($tokens[$curToken]['type'] === 'T_STRING') {

diff --git a/Tests/Sniffs/PHP/ForbiddenBreakContinueVariableArgumentsSniffTest.php b/Tests/Sniffs/PHP/ForbiddenBreakContinueVariableArgumentsSniffTest.php
@@ -108,6 +108,7 @@ public function dataNoFalsePositives()
             array(39),
             array(44),
             array(48),
+            array(117),
         );
     }
 

diff --git a/Tests/sniff-examples/forbidden_break_continue_variable_argument.php b/Tests/sniff-examples/forbidden_break_continue_variable_argument.php
@@ -112,3 +112,7 @@
         }
     }
 }
+
+for ($x=0;$x<5;$x++):
+	if ($x) continue ?> <?php
+endfor;