CodeCoverage: mark as executed all lines of the same branch

Author: Slamdunk

src/CodeCoverage.php

@@ -485,9 +485,14 @@ private function applyExecutableLinesFilter(RawCodeCoverageData $data): void
                 continue;
             }
 
+            $linesToBranchMap = $this->analyser()->executableLinesIn($filename);
             $data->keepLineCoverageDataOnlyForLines(
                 $filename,
-                $this->analyser()->executableLinesIn($filename)
+                array_keys($linesToBranchMap)
+            );
+            $data->markExecutableLineByBranch(
+                $filename,
+                $linesToBranchMap
             );
         }
     }

src/RawCodeCoverageData.php

@@ -91,7 +91,7 @@ public static function fromUncoveredFile(string $filename, FileAnalyser $analyse
     {
         $lineCoverage = [];
 
-        foreach ($analyser->executableLinesIn($filename) as $line) {
+        foreach ($analyser->executableLinesIn($filename) as $line => $branch) {
             $lineCoverage[$line] = Driver::LINE_NOT_EXECUTED;
         }
 
@@ -141,6 +141,42 @@ public function keepLineCoverageDataOnlyForLines(string $filename, array $lines)
         );
     }
 
+    /**
+     * @param int[] $linesToBranchMap
+     */
+    public function markExecutableLineByBranch(string $filename, array $linesToBranchMap): void
+    {
+        if (!isset($this->lineCoverage[$filename])) {
+            return;
+        }
+
+        $linesByBranch = [];
+
+        foreach ($linesToBranchMap as $line => $branch) {
+            $linesByBranch[$branch][] = $line;
+        }
+
+        foreach ($this->lineCoverage[$filename] as $line => $lineStatus) {
+            if (!isset($linesToBranchMap[$line])) {
+                continue;
+            }
+
+            $branch = $linesToBranchMap[$line];
+
+            if (!isset($linesByBranch[$branch])) {
+                continue;
+            }
+
+            foreach ($linesByBranch[$branch] as $lineInBranch) {
+                $this->lineCoverage[$filename][$lineInBranch] = $lineStatus;
+            }
+
+            if (Driver::LINE_EXECUTED === $lineStatus) {
+                unset($linesByBranch[$branch]);
+            }
+        }
+    }
+
     /**
      * @param int[] $lines
      */

src/StaticAnalysis/ParsingFileAnalyser.php

@@ -183,7 +183,7 @@ private function analyse(string $filename): void
         $this->classes[$filename]         = $codeUnitFindingVisitor->classes();
         $this->traits[$filename]          = $codeUnitFindingVisitor->traits();
         $this->functions[$filename]       = $codeUnitFindingVisitor->functions();
-        $this->executableLines[$filename] = $executableLinesFindingVisitor->executableLines();
+        $this->executableLines[$filename] = $executableLinesFindingVisitor->executableLinesGroupedByBranch();
         $this->ignoredLines[$filename]    = [];
 
         $this->findLinesIgnoredByLineBasedAnnotations($filename, $source, $this->useAnnotationsForIgnoringCode);

tests/TestCase.php

@@ -1353,7 +1353,9 @@ protected function getExpectedLineCoverageDataArrayForBankAccount(): array
                 ],
                 13 => [],
                 14 => [],
+                15 => [],
                 16 => [],
+                17 => [],
                 22 => [
                     0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
                     1 => 'BankAccountTest::testDepositWithdrawMoney',
@@ -1383,7 +1385,9 @@ protected function getExpectedLineCoverageDataArrayForBankAccountInReverseOrder(
                 ],
                 13 => [],
                 14 => [],
+                15 => [],
                 16 => [],
+                17 => [],
                 22 => [
                     0 => 'BankAccountTest::testBalanceCannotBecomeNegative2',
                     1 => 'BankAccountTest::testDepositWithdrawMoney',

tests/tests/CodeCoverageTest.php

@@ -109,7 +109,9 @@ public function testExcludeNonExecutableLines(): void
                 8  => [],
                 13 => [],
                 14 => [],
+                15 => [],
                 16 => [],
+                17 => [],
                 22 => [],
                 24 => [],
                 29 => [],
@@ -121,6 +123,29 @@ public function testExcludeNonExecutableLines(): void
         $this->assertEquals($expectedLineCoverage, $this->coverage->getData()->lineCoverage());
     }
 
+    public function testMarkExecutedAllLinesOfTheSameBranch(): void
+    {
+        $this->coverage->filter()->includeFile(TEST_FILES_PATH . 'BankAccount.php');
+
+        $data = RawCodeCoverageData::fromXdebugWithoutPathCoverage([
+            TEST_FILES_PATH . 'BankAccount.php' => [
+                13 => 1,
+            ],
+        ]);
+
+        $this->coverage->append($data, 'ccid', true);
+
+        $expectedLineCoverage = [
+            TEST_FILES_PATH . 'BankAccount.php' => [
+                13 => ['ccid'],
+                15 => ['ccid'],
+                17 => ['ccid'],
+            ],
+        ];
+
+        $this->assertEquals($expectedLineCoverage, $this->coverage->getData()->lineCoverage());
+    }
+
     public function testMerge(): void
     {
         $coverage = $this->getLineCoverageForBankAccountForFirstTwoTests();