Merge pull request #385 from rodrigoprimo/test-coverage-jumbled-incrementer

Generic/JumbledIncrementer: fix non-problematic bug and improve test coverage

Author: jrfnl

src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php

@@ -108,7 +108,7 @@ public function process(File $phpcsFile, $stackPtr)
     protected function findIncrementers(array $tokens, array $token)
     {
         // Skip invalid statement.
-        if (isset($token['parenthesis_opener']) === false) {
+        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
             return [];
         }
 

src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.1.inc

@@ -0,0 +1,89 @@
+<?php
+
+for ($same = 0; $same < 20; $same++) {
+    for ($j = 0; $j < 5; $same += 2) {
+        for ($k = 0; $k > 3; $same++) {
+            
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) {
+    for ($j = 0; $j < 5; $j += 2) {
+        for ($k = 0; $k > 3; $k++) {
+            
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) {
+    for ($same = 0; $same < 5; $same += 2) {
+        for ($k = 0; $k > 3; $same++) {
+            
+        }
+    }
+}
+
+for (; $i < 10; $i++) {
+    for ($j = 0;; $j++) {
+        if ($j > 5) {
+            break;
+        }
+        for (;; $k++) {
+            if ($k > 5) {
+                break;
+            }
+        }
+    }
+}
+
+for (; $same < 10; $same++) {
+    for ($j = 0;; $same++) {
+        if ($j > 5) {
+            break;
+        }
+        for (;; $same++) {
+            if ($k > 5) {
+                break;
+            }
+        }
+    }
+}
+
+for ($i = 0; $i < 20; $i++) :
+    for ($j = 0; $j < 5; $j += 2) :
+    endfor;
+endfor;
+
+for ($same = 0; $same < 20; $same++) :
+    for ($j = 0; $j < 5; $same += 2) :
+    endfor;
+endfor;
+
+// Sniff bails early when there is no incrementor in the third expression of the outer for loop.
+for ($same = 0; $same < 10;) {
+    ++$same;
+    for ($j = 0; $j < 5; $same++) {}
+}
+
+for ($i = 1, $same = 0; $i <= 10; $i++, $same++) {
+    for ($same = 0, $k = 0; $k < 5; $same++, $k++) {}
+}
+
+for ($i = 20; $i > 0; $i--) {
+    for ($j = 5; $j > 0; $j -= 2) {
+        for ($k = 3; $k > 0; $k--) {}
+    }
+}
+
+for ($same = 20; $same > 0; $same--) {
+    for ($j = 5; $j > 0; $same -= 2) {
+        for ($k = 3; $k > 0; $same--) {}
+    }
+}
+
+for ($i = 0; $i < 20; $i++);
+
+for ($same = 0; $same < 20; $same++) {
+    for ($j = 0; $j < 20; $same++);
+}

src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.2.inc

@@ -0,0 +1,8 @@
+<?php
+
+// Intentional parse error (inner for loop missing closing parenthesis).
+// This should be the only test in this file.
+// Testing that the sniff is *not* triggered.
+for ($i = 0; $i < 20; $i++) {
+    for ($i = 0; $i < 20; $i++
+}

src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.3.inc

@@ -0,0 +1,6 @@
+<?php
+
+// Intentional parse error (missing for conditions).
+// This should be the only test in this file.
+// Testing that the sniff is *not* triggered.
+for

src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.4.inc

@@ -0,0 +1,8 @@
+<?php
+
+// Intentional parse error (inner for loop missing opening parenthesis).
+// This should be the only test in this file.
+// Testing that the sniff is *not* triggered.
+for ($i = 0; $i < 20; $i++) {
+    for
+}

src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc

@@ -41,15 +41,30 @@ public function getErrorList()
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return [
-            3  => 2,
-            4  => 1,
-            20 => 1,
-        ];
+        switch ($testFile) {
+        case 'JumbledIncrementerUnitTest.1.inc':
+            return [
+                3  => 2,
+                4  => 1,
+                20 => 1,
+                40 => 2,
+                41 => 1,
+                58 => 1,
+                69 => 1,
+                79 => 2,
+                80 => 1,
+                87 => 1,
+            ];
+
+        default:
+            return [];
+        }
 
     }//end getWarningList()