fix switch with default case

Author: mvorisek

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -42,7 +42,6 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\Return_;
-use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\Node\Stmt\Unset_;
 use PhpParser\Node\Stmt\While_;
@@ -240,7 +239,12 @@ private function getLines(NodeAbstract $node, bool $fromReturns): array
         if ($node instanceof If_ ||
             $node instanceof ElseIf_ ||
             $node instanceof While_ ||
-            $node instanceof Do_) {
+            $node instanceof Do_ ||
+            $node instanceof Case_) {
+            if ($node instanceof Case_ && null === $node->cond) {
+                return [];
+            }
+
             return [$this->getNodeStartLine($node->cond)];
         }
 
@@ -325,7 +329,6 @@ private function isExecutable(Node $node): bool
                $node instanceof PropertyFetch ||
                $node instanceof Return_ ||
                $node instanceof StaticPropertyFetch ||
-               $node instanceof Switch_ ||
                $node instanceof Ternary ||
                $node instanceof Throw_ ||
                $node instanceof Unset_ ||

tests/_files/source_with_heavy_indentation.php

@@ -180,6 +180,33 @@ public function noTryNoFinally(): int
         return $res;
     }
 
+    public function switch(): int
+    {
+        switch (
+            'x'
+            .
+            mt_rand()
+            . 'x'
+        ) {
+            case
+                <<<EOF
+                    x1x
+                    EOF:
+                $res = 'a';
+
+                break;
+            case 'x2x':
+            case 'x3x':
+                $res = 'a';
+
+                break;
+            default:
+                $res = 'c';
+        }
+
+        return $res;
+    }
+
     private static $staticState = 1;
     private const CONST_STATE = 1.1;
 }

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -330,7 +330,7 @@ public function testInlineCommentsKeepTheLine(): void
     public function testHeavyIndentationIsHandledCorrectly(): void
     {
         $file = TEST_FILES_PATH . 'source_with_heavy_indentation.php';
-
+        $n    = 27;
         $this->assertEquals(
             [
                 14,
@@ -385,25 +385,36 @@ public function testHeavyIndentationIsHandledCorrectly(): void
                 // line 176 is finally statement, not in xdebug output (only catch condition is covered)
                 177,
                 180,
-                189,
-                191,
+                188,
                 193,
                 195,
                 197,
+                198,
                 199,
-                201,
-                203,
-                205,
+                200,
+                202,
+                // line 203 is default case, not in xdebug output (only cases with condition are covered)
+                204,
                 207,
-                229,
-                234,
-                238,
-                241,
-                245,
-                249,
-                255,
-                259,
-                265,
+                189 + $n,
+                191 + $n,
+                193 + $n,
+                195 + $n,
+                197 + $n,
+                199 + $n,
+                201 + $n,
+                203 + $n,
+                205 + $n,
+                207 + $n,
+                229 + $n,
+                234 + $n,
+                238 + $n,
+                241 + $n,
+                245 + $n,
+                249 + $n,
+                255 + $n,
+                259 + $n,
+                265 + $n,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );