fix do statement

Author: mvorisek

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -35,7 +35,6 @@
 use PhpParser\Node\Stmt\Echo_;
 use PhpParser\Node\Stmt\ElseIf_;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\Node\Stmt\Finally_;
 use PhpParser\Node\Stmt\For_;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\Function_;
@@ -237,11 +236,16 @@ private function getLines(NodeAbstract $node, bool $fromReturns): array
             return [$this->getNodeStartLine($node->body)];
         }
 
-        // TODO this concept should be extended for every statement class like Foreach_
+        // TODO this concept should be extended for every statement class like Foreach_, For_, ...
         if ($node instanceof If_ ||
-            $node instanceof ElseIf_) {
+            $node instanceof ElseIf_ ||
+            $node instanceof While_ ||
+            $node instanceof Do_) {
             return [$this->getNodeStartLine($node->cond)];
         }
+        if ($node instanceof Catch_) {
+            return [$this->getNodeStartLine($node->types[0])];
+        }
 
         if ($node instanceof Function_) {
             if ($node->stmts === []) {
@@ -307,7 +311,6 @@ private function isExecutable(Node $node): bool
                $node instanceof ElseIf_ ||
                $node instanceof Encapsed ||
                $node instanceof Expression ||
-               $node instanceof Finally_ ||
                $node instanceof For_ ||
                $node instanceof Foreach_ ||
                $node instanceof Function_ ||

tests/_files/source_with_heavy_indentation.php

@@ -141,15 +141,40 @@ public function noElse(): int
         return $res;
     }
 
-    public function noTry(): int
+    public function noDo(): int
+    {
+        $res = 0;
+        do {
+            if (mt_rand() !== 0) {
+                $res++;
+            }
+        } while (
+            $res
+            <
+            10
+        );
+
+        return $res;
+    }
+
+    public function noTryNoFinally(): int
     {
         $res = 0;
         try {
             if (mt_rand() === 0) {
                 throw new \Exception();
             }
-        } catch (\Exception $e) {
+        } catch (
+            \x\y
+            |
+            \x\z
+            $e
+        ) {
+            $res = 1;
+        } catch (\Error $e) {
             $res = 1;
+        } finally {
+            $res += 10;
         }
 
         return $res;

tests/tests/Data/RawCodeCoverageDataTest.php

@@ -370,31 +370,40 @@ public function testHeavyIndentationIsHandledCorrectly(): void
                 138,
                 141,
                 146,
-                // line 147 is try statement, not in xdebug output (only catch condition is covered)
                 148,
                 149,
-                151,
-                152,
-                155,
+                154,
+                157,
+                162,
+                // line 163 is try statement, not in xdebug output (only catch condition is covered)
                 164,
-                166,
+                165,
                 168,
-                170,
-                172,
+                173,
                 174,
-                176,
-                178,
+                175,
+                // line 176 is finally statement, not in xdebug output (only catch condition is covered)
+                177,
                 180,
-                182,
-                204,
-                209,
-                213,
-                216,
-                220,
-                224,
-                230,
+                189,
+                191,
+                193,
+                195,
+                197,
+                199,
+                201,
+                203,
+                205,
+                207,
+                229,
                 234,
-                240,
+                238,
+                241,
+                245,
+                249,
+                255,
+                259,
+                265,
             ],
             array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingFileAnalyser(true, true))->lineCoverage()[$file])
         );