ExecutableLinesFindingVisitor: mirror xDebug/PCOV behavior

Author: Slamdunk

src/StaticAnalysis/ExecutableLinesFindingVisitor.php

@@ -12,6 +12,8 @@
 use function array_unique;
 use function sort;
 use PhpParser\Node;
+use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\CallLike;
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Catch_;
@@ -67,7 +69,9 @@ public function executableLines(): array
 
     private function isExecutable(Node $node): bool
     {
-        return $node instanceof Break_ ||
+        return $node instanceof BinaryOp ||
+               $node instanceof Break_ ||
+               $node instanceof CallLike ||
                $node instanceof Case_ ||
                $node instanceof Catch_ ||
                $node instanceof Continue_ ||

tests/_files/source_with_heavy_indentation.php

@@ -0,0 +1,32 @@
+<?php
+
+class Foo
+{
+    public function isOne(): bool
+    {
+        return
+            AType::A === $this->state
+            or (
+                $this->isBar()
+                and \in_array($this->state, [
+                    AType::A,
+                    AType::B,
+                ], true)
+            )
+            or (\in_array($this->type, [BType::X, BType::Y], true)
+                and \in_array($this->state, [
+                    AType::C,
+                    AType::D,
+                    AType::toOutput($this->state),
+                ], true))
+            ;
+    }
+
+    public function isTwo(): bool
+    {
+        return \in_array($this->state, [
+            AType::A,
+            AType::B,
+        ], true);
+    }
+}

tests/tests/RawCodeCoverageDataTest.php

@@ -321,6 +321,25 @@ public function testInlineCommentsKeepTheLine(): void
         );
     }
 
+    public function testHeavyIndentationIsHandledCorrectly(): void
+    {
+        $file = TEST_FILES_PATH . 'source_with_heavy_indentation.php';
+
+        $this->assertEquals(
+            [
+                7,
+                8,
+                10,
+                11,
+                16,
+                17,
+                20,
+                27,
+            ],
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file, new ParsingUncoveredFileAnalyser)->lineCoverage()[$file])
+        );
+    }
+
     public function testCoverageForFileWithInlineAnnotations(): void
     {
         $filename = TEST_FILES_PATH . 'source_with_oneline_annotations.php';