Executable lines differ a lot between standard and path coverage: filter lines only for standard one

Author: Slamdunk

src/CodeCoverage.php

@@ -468,7 +468,8 @@ private function applyCoversAnnotationFilter(RawCodeCoverageData $rawData, $line
 
         if (is_array($linesToBeCovered)) {
             foreach ($linesToBeCovered as $fileToBeCovered => $includedLines) {
-                $rawData->keepCoverageDataOnlyForLines($fileToBeCovered, $includedLines);
+                $rawData->keepLineCoverageDataOnlyForLines($fileToBeCovered, $includedLines);
+                $rawData->keepFunctionCoverageDataOnlyForLines($fileToBeCovered, $includedLines);
             }
         }
     }
@@ -489,7 +490,7 @@ private function applyFilter(RawCodeCoverageData $data): void
     private function applyExecutableLinesFilter(RawCodeCoverageData $data): void
     {
         foreach (array_keys($data->lineCoverage()) as $filename) {
-            $data->keepCoverageDataOnlyForLines(
+            $data->keepLineCoverageDataOnlyForLines(
                 $filename,
                 $this->uncoveredFileAnalyser()->executableLinesIn($filename)
             );

src/RawCodeCoverageData.php

@@ -126,7 +126,7 @@ public function removeCoverageDataForFile(string $filename): void
     /**
      * @param int[] $lines
      */
-    public function keepCoverageDataOnlyForLines(string $filename, array $lines): void
+    public function keepLineCoverageDataOnlyForLines(string $filename, array $lines): void
     {
         if (!isset($this->lineCoverage[$filename])) {
             return;
@@ -136,17 +136,25 @@ public function keepCoverageDataOnlyForLines(string $filename, array $lines): vo
             $this->lineCoverage[$filename],
             array_flip($lines)
         );
+    }
 
-        if (isset($this->functionCoverage[$filename])) {
-            foreach ($this->functionCoverage[$filename] as $functionName => $functionData) {
-                foreach ($functionData['branches'] as $branchId => $branch) {
-                    if (count(array_diff(range($branch['line_start'], $branch['line_end']), $lines)) > 0) {
-                        unset($this->functionCoverage[$filename][$functionName]['branches'][$branchId]);
+    /**
+     * @param int[] $lines
+     */
+    public function keepFunctionCoverageDataOnlyForLines(string $filename, array $lines): void
+    {
+        if (!isset($this->functionCoverage[$filename])) {
+            return;
+        }
 
-                        foreach ($functionData['paths'] as $pathId => $path) {
-                            if (in_array($branchId, $path['path'], true)) {
-                                unset($this->functionCoverage[$filename][$functionName]['paths'][$pathId]);
-                            }
+        foreach ($this->functionCoverage[$filename] as $functionName => $functionData) {
+            foreach ($functionData['branches'] as $branchId => $branch) {
+                if (count(array_diff(range($branch['line_start'], $branch['line_end']), $lines)) > 0) {
+                    unset($this->functionCoverage[$filename][$functionName]['branches'][$branchId]);
+
+                    foreach ($functionData['paths'] as $pathId => $path) {
+                        if (in_array($branchId, $path['path'], true)) {
+                            unset($this->functionCoverage[$filename][$functionName]['paths'][$pathId]);
                         }
                     }
                 }

tests/tests/RawCodeCoverageDataTest.php

@@ -211,9 +211,9 @@ public function testKeepCoverageDataOnlyForLines(): void
 
         $dataObject = RawCodeCoverageData::fromXdebugWithoutPathCoverage($lineDataFromDriver);
 
-        $dataObject->keepCoverageDataOnlyForLines('/some/path/SomeClass.php', [9, 13]);
-        $dataObject->keepCoverageDataOnlyForLines('/some/path/SomeOtherClass.php', [999]);
-        $dataObject->keepCoverageDataOnlyForLines('/some/path/AnotherClass.php', [28]);
+        $dataObject->keepLineCoverageDataOnlyForLines('/some/path/SomeClass.php', [9, 13]);
+        $dataObject->keepLineCoverageDataOnlyForLines('/some/path/SomeOtherClass.php', [999]);
+        $dataObject->keepLineCoverageDataOnlyForLines('/some/path/AnotherClass.php', [28]);
 
         $this->assertEquals($expectedFilterResult, $dataObject->lineCoverage());
     }