match arms depent too much on autoloading runtime behavior, process…

… it as a whole
sebastianbergmann · Dec 14, 2022 · ede00c7 · ede00c7
1 parent 4ad55a2
commit ede00c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/src/StaticAnalysis/ExecutableLinesFindingVisitor.php b/src/StaticAnalysis/ExecutableLinesFindingVisitor.php
@@ -61,6 +61,7 @@ public function enterNode(Node $node): void
             $node instanceof Node\Stmt\TryCatch ||
             $node instanceof Node\Stmt\Use_ ||
             $node instanceof Node\Stmt\UseUse ||
+            $node instanceof Node\Expr\Match_ ||
             $node instanceof Node\Expr\Variable ||
             $node instanceof Node\Const_ ||
             $node instanceof Node\Identifier ||
@@ -241,18 +242,6 @@ public function enterNode(Node $node): void
             return;
         }
 
-        if ($node instanceof Node\Expr\Match_) {
-            foreach ($node->arms as $arm) {
-                $this->setLineBranch(
-                    $arm->body->getStartLine(),
-                    $arm->body->getEndLine(),
-                    ++$this->nextBranch
-                );
-            }
-
-            return;
-        }
-
         if ($node instanceof Node\Stmt\Catch_) {
             assert([] !== $node->types);
             $startLine = $node->types[0]->getStartLine();

diff --git a/tests/_files/source_for_branched_exec_lines.php b/tests/_files/source_for_branched_exec_lines.php
@@ -243,11 +243,11 @@ public function withMatch()
     {
         $var = 1;                           // +1
         $var2 = match ($var) {              // +1
-            0 => ++$var,                    // +1
-            1 => ++$var,                    // +1
-            default => ++$var,              // +1
-        };                                  // -3
-        $var2                               // +4
+            0 => ++$var,                    // 0
+            1 => ++$var,                    // 0
+            default => ++$var,              // 0
+        };                                  // 0
+        $var2                               // +1
             =                               // 0
             match                           // 0
             (                               // 0
@@ -256,23 +256,23 @@ public function withMatch()
             {                               // 0
                 0                           // 0
                 =>                          // 0
-                ++$var                      // +1
-            ,                               // -1
+                ++$var                      // 0
+            ,                               // 0
                 1,                          // 0
                 2                           // 0
                 =>                          // 0
-                ++$var                      // +2
-            ,                               // -2
+                ++$var                      // 0
+            ,                               // 0
                 default                     // 0
                 =>                          // 0
-                ++$var                      // +3
-            ,                               // -3
+                ++$var                      // 0
+            ,                               // 0
         }                                   // 0
         ;                                   // 0
     }
     public function withReturn()
     {
-        $var = 1;                           // +4
+        $var = 1;                           // +1
         if (false) {                        // +1
             ++$var;                         // +1
             return                          // +1
@@ -568,4 +568,4 @@ final class MyFinalClass extends MyAbstractClass
     public function myMethod(): void
     {
     }                                       // +4
-}
+}