Generic/InlineControlStructure: bail early for control structures without body

The sniff now consistently handles all supported control structures
without a body, in both PHP and JS, by bailing early. Extending the
existing behavior for `while` and `for` to also include `do
while`, `else`, `elseif`, `if`, and `foreach` (PHP only).

Previously, the sniff would incorrectly flag these empty control
structures as inline control structures that needed curly braces.

Author: rodrigoprimo

src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php

@@ -80,21 +80,25 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        if ($tokens[$stackPtr]['code'] === T_WHILE || $tokens[$stackPtr]['code'] === T_FOR) {
-            // This could be from a DO WHILE, which doesn't have an opening brace or a while/for without body.
-            if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
-                $afterParensCloser = $phpcsFile->findNext(Tokens::$emptyTokens, ($tokens[$stackPtr]['parenthesis_closer'] + 1), null, true);
-                if ($afterParensCloser === false) {
-                    // Live coding.
-                    return;
-                }
+        if (isset($tokens[$stackPtr]['parenthesis_closer']) === true) {
+            $nextTokenIndex = ($tokens[$stackPtr]['parenthesis_closer'] + 1);
+        } else if (in_array($tokens[$stackPtr]['code'], [T_ELSE, T_DO], true) === true) {
+            $nextTokenIndex = ($stackPtr + 1);
+        }
 
-                if ($tokens[$afterParensCloser]['code'] === T_SEMICOLON) {
-                    $phpcsFile->recordMetric($stackPtr, 'Control structure defined inline', 'no');
-                    return;
-                }
+        if (isset($nextTokenIndex) === true) {
+            $firstNonEmptyToken = $phpcsFile->findNext(Tokens::$emptyTokens, $nextTokenIndex, null, true);
+            if ($firstNonEmptyToken === false) {
+                // Live coding.
+                return;
             }
-        }//end if
+
+            if ($tokens[$firstNonEmptyToken]['code'] === T_SEMICOLON) {
+                // This is a control structure without a body. Bow out.
+                $phpcsFile->recordMetric($stackPtr, 'Control structure defined inline', 'no');
+                return;
+            }
+        }
 
         if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false
             && $tokens[$stackPtr]['code'] !== T_ELSE

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

@@ -276,3 +276,24 @@ function testFinally()
 if ($something) {
     echo 'hello';
 } else /* comment */ if ($somethingElse) echo 'hi';
+
+if ($sniffShouldBailEarly);
+
+if (false) {
+} elseif ($sniffShouldBailEarly);
+
+if (false) {
+} else if ($sniffShouldBailEarly);
+
+if (false) {
+} else ($sniffShouldGenerateError);
+
+if (false) {
+} else; // Sniff should bail early.
+
+foreach ($array as $sniffShouldBailEarly);
+
+foreach ($array as $sniffShouldBailEarly)
+	/* some comment */;
+
+do ; while ($sniffShouldBailEarly > 5);

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

@@ -314,3 +314,25 @@ if ($something) {
     echo 'hello';
 } else /* comment */ if ($somethingElse) { echo 'hi';
 }
+
+if ($sniffShouldBailEarly);
+
+if (false) {
+} elseif ($sniffShouldBailEarly);
+
+if (false) {
+} else if ($sniffShouldBailEarly);
+
+if (false) {
+} else { ($sniffShouldGenerateError);
+}
+
+if (false) {
+} else; // Sniff should bail early.
+
+foreach ($array as $sniffShouldBailEarly);
+
+foreach ($array as $sniffShouldBailEarly)
+	/* some comment */;
+
+do ; while ($sniffShouldBailEarly > 5);

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

@@ -33,3 +33,20 @@ if ($("#myid").rotationDegrees()=='90')
 if (something) {
     alert('hello');
 } else /* comment */ if (somethingElse) alert('hi');
+
+if (sniffShouldBailEarly);
+
+if (false) {
+} else if (sniffShouldBailEarly);
+
+if (false) {
+} else (sniffShouldGenerateError);
+
+if (false) {
+} else; // Sniff should bail early.
+
+while (sniffShouldBailEarly);
+
+for (sniffShouldBailEarly; sniffShouldBailEarly > 0; sniffShouldBailEarly--);
+
+do ; while ($sniffShouldBailEarly > 5);

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

@@ -42,3 +42,21 @@ if (something) {
     alert('hello');
 } else /* comment */ if (somethingElse) { alert('hi');
 }
+
+if (sniffShouldBailEarly);
+
+if (false) {
+} else if (sniffShouldBailEarly);
+
+if (false) {
+} else { (sniffShouldGenerateError);
+}
+
+if (false) {
+} else; // Sniff should bail early.
+
+while (sniffShouldBailEarly);
+
+for (sniffShouldBailEarly; sniffShouldBailEarly > 0; sniffShouldBailEarly--);
+
+do ; while ($sniffShouldBailEarly > 5);

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

@@ -81,6 +81,7 @@ public function getErrorList($testFile='')
                 260 => 1,
                 269 => 1,
                 278 => 1,
+                289 => 1,
             ];
 
         case 'InlineControlStructureUnitTest.1.js':
@@ -94,6 +95,7 @@ public function getErrorList($testFile='')
                 27 => 1,
                 30 => 1,
                 35 => 1,
+                43 => 1,
             ];
 
         default: