Allow comments between body and condition in do while loops.

squizlabs · Aug 3, 2017 · a666b15 · a666b15
1 parent 30cabe0
commit a666b15
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if ($tokens[$stackPtr]['code'] === T_WHILE) {
             // This could be from a DO WHILE, which doesn't have an opening brace.
-            $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+            $lastContent = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
             if ($tokens[$lastContent]['code'] === T_CLOSE_CURLY_BRACKET) {
                 $brace = $tokens[$lastContent];
                 if (isset($brace['scope_condition']) === true) {

diff --git a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc
@@ -200,3 +200,9 @@ if (true)
     }
     catch(Exception $e) {
     }
+
+do {
+	$i++;
+}
+// Comment
+while ($i < 10);
diff --git a/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc.fixed b/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc.fixed
@@ -229,3 +229,9 @@ if (true) {
     catch(Exception $e) {
     }
 }
+
+do {
+	$i++;
+}
+// Comment
+while ($i < 10);