Ingest coverage data only for the files in the filter that actually h…

…ave some. Fixes sebastianbergmann#876
dvdoug · Oct 28, 2021 · 1ae01b6 · 1ae01b6
1 parent 3ca2f86
commit 1ae01b6
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Driver/PcovDriver.php b/src/Driver/PcovDriver.php
@@ -45,14 +45,19 @@ public function stop(): RawCodeCoverageData
     {
         \pcov\stop();
 
-        $collect = \pcov\collect(
-            \pcov\inclusive,
-            !$this->filter->isEmpty() ? $this->filter->files() : \pcov\waiting()
-        );
+        $filesToCollectCoverageFor = \pcov\waiting();
+        $collected                 = [];
 
-        \pcov\clear();
+        if ($filesToCollectCoverageFor) {
+            if (!$this->filter->isEmpty()) {
+                $filesToCollectCoverageFor = array_intersect($filesToCollectCoverageFor, $this->filter->files());
+            }
+            $collected = \pcov\collect(\pcov\inclusive, $filesToCollectCoverageFor);
 
-        return RawCodeCoverageData::fromXdebugWithoutPathCoverage($collect);
+            \pcov\clear();
+        }
+
+        return RawCodeCoverageData::fromXdebugWithoutPathCoverage($collected);
     }
 
     public function nameAndVersion(): string