Merge branch '9.2'

Author: sebastianbergmann

ChangeLog.md

@@ -19,6 +19,8 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
 ### Fixed
 
 * [#866](https://github.com/sebastianbergmann/php-code-coverage/issues/866): `CodeUnitFindingVisitor` does not handle `enum` type introduced in PHP 8.1
+* [#868](https://github.com/sebastianbergmann/php-code-coverage/pull/868): Uncovered files should be ignored unless requested
+* [#876](https://github.com/sebastianbergmann/php-code-coverage/issues/876): PCOV driver causes 2x slowdown after upgrade to PHPUnit 9.5
 
 ## [9.2.7] - 2021-09-17
 

src/Driver/PcovDriver.php

@@ -9,7 +9,14 @@
  */
 namespace SebastianBergmann\CodeCoverage\Driver;
 
+use const pcov\inclusive;
+use function array_intersect;
 use function extension_loaded;
+use function pcov\clear;
+use function pcov\collect;
+use function pcov\start;
+use function pcov\stop;
+use function pcov\waiting;
 use function phpversion;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
@@ -33,21 +40,27 @@ public function __construct(Filter $filter)
 
     public function start(): void
     {
-        \pcov\start();
+        start();
     }
 
     public function stop(): RawCodeCoverageData
     {
-        \pcov\stop();
+        stop();
 
-        $collect = \pcov\collect(
-            \pcov\inclusive,
-            !$this->filter->isEmpty() ? $this->filter->files() : \pcov\waiting()
-        );
+        $filesToCollectCoverageFor = waiting();
+        $collected                 = [];
 
-        \pcov\clear();
+        if ($filesToCollectCoverageFor) {
+            if (!$this->filter->isEmpty()) {
+                $filesToCollectCoverageFor = array_intersect($filesToCollectCoverageFor, $this->filter->files());
+            }
 
-        return RawCodeCoverageData::fromXdebugWithoutPathCoverage($collect);
+            $collected = collect(inclusive, $filesToCollectCoverageFor);
+
+            clear();
+        }
+
+        return RawCodeCoverageData::fromXdebugWithoutPathCoverage($collected);
     }
 
     public function nameAndVersion(): string