Added switch

Author: Slamdunk

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -52,17 +52,22 @@ public function enterNode(Node $node): void
         if ($node instanceof Node\Stmt\If_ ||
             $node instanceof Node\Stmt\ElseIf_ ||
             $node instanceof Node\Stmt\Else_ ||
+            $node instanceof Node\Stmt\Case_ ||
             $node instanceof Node\Stmt\For_ ||
             $node instanceof Node\Stmt\Foreach_ ||
             $node instanceof Node\Stmt\While_) {
+            $incrementNextBranch = false;
+
             if (isset($this->executableLinesGroupedByBranch[$node->getStartLine()])) {
                 $stmtBranch = 1 + $this->executableLinesGroupedByBranch[$node->getStartLine()];
 
                 if (false !== array_search($stmtBranch, $this->executableLinesGroupedByBranch, true)) {
-                    $stmtBranch = ++$this->nextBranch;
+                    $stmtBranch          = 1 + $this->nextBranch;
+                    $incrementNextBranch = true;
                 }
             } else {
-                $stmtBranch = ++$this->nextBranch;
+                $stmtBranch          = 1 + $this->nextBranch;
+                $incrementNextBranch = true;
             }
 
             $endLine = $node->getEndLine();
@@ -89,18 +94,29 @@ public function enterNode(Node $node): void
             );
             $contentEnd = $endLine;
 
+            if ($node instanceof Node\Stmt\Case_) {
+                $contentEnd++;
+            }
+
             end($node->stmts);
             $lastNode = current($node->stmts);
             reset($node->stmts);
 
-            if ($lastNode instanceof Node\Stmt\Nop) {
+            if (
+                $lastNode instanceof Node\Stmt\Nop ||
+                $lastNode instanceof Node\Stmt\Break_
+            ) {
                 $contentEnd = $lastNode->getEndLine() + 1;
             }
 
             if (1 > ($contentEnd - $contentStart)) {
                 return;
             }
 
+            if ($incrementNextBranch) {
+                $this->nextBranch++;
+            }
+
             $this->setLineBranch(
                 $contentStart,
                 $contentEnd - 1,

tests/_files/source_for_branched_exec_lines.php

@@ -189,4 +189,34 @@ public function withDoWhile()           // +5
         )                                   // 0
         ;                                   // 0
     }                                       // 0
+    public function withSwitch()            // +1
+    {                                       // 0
+        $var = 1;                           // 0
+        switch ($var) {                     // 0
+            case 0:                         // 0
+            case 1:                         // 0
+                ++$var;                     // +1
+                break;                      // 0
+            case 2:                         // -1
+                ++$var;                     // +2
+            case 3:                         // -2
+                ++$var;                     // +3
+                break;                      // 0
+            default:                        // -3
+                ++$var;                     // +4
+        }                                   // -4
+        switch ($var):                      // 0
+            case 0:                         // 0
+            case 1:                         // 0
+                ++$var;                     // +5
+                break;                      // 0
+            case 2:                         // -5
+                ++$var;                     // +6
+            case 3:                         // -6
+                ++$var;                     // +7
+                break;                      // 0
+            default:                        // -7
+                ++$var;                     // +8
+        endswitch;                          // -8
+    }                                       // 0
 }