wip

Author: BenMorel

tests/Util/RemoteWorker.php

@@ -9,8 +9,11 @@
 use PHPUnit\Framework\Assert;
 use Symfony\Component\Process\InputStream;
 use Symfony\Component\Process\Process;
+use Throwable;
 
+use function dirname;
 use function explode;
+use function extension_loaded;
 use function implode;
 use function json_encode;
 use function microtime;
@@ -36,7 +39,18 @@ final class RemoteWorker
 
     public function __construct()
     {
-        $this->process = new Process(['php', 'worker.php'], __DIR__);
+        $command = ['php'];
+
+        if (extension_loaded('pcov')) {
+            // pcov.directory defaults to the process CWD (tests/Util/), which excludes src/.
+            // Set it explicitly so pcov tracks the library source files.
+            $command[] = '-d';
+            $command[] = 'pcov.directory=' . dirname(__DIR__, 2) . '/src';
+        }
+
+        $command[] = 'worker.php';
+
+        $this->process = new Process($command, __DIR__);
         $this->input = new InputStream();
 
         $this->process->setInput($this->input);
@@ -235,14 +249,14 @@ private function parseDuration(string $duration): float
 
     public function __destruct()
     {
-        if (!$this->isKilled && $this->process->isRunning()) {
+        if (! $this->isKilled && $this->process->isRunning()) {
             try {
                 $this->sendCommand(new Command\Shutdown());
                 $deadline = microtime(true) + 1.0;
                 while ($this->process->isRunning() && microtime(true) < $deadline) {
                     usleep(10_000);
                 }
-            } catch (\Throwable) {
+            } catch (Throwable) {
                 // Best effort; fall through to stop().
             }
         }

tests/Util/worker.php

@@ -14,15 +14,19 @@
 use Brick\Lock\Tests\Util\LockDriverFactoryException;
 
 use function Opis\Closure\unserialize;
+use function pcov\collect;
+use function pcov\start;
+use function pcov\stop;
+
+use const pcov\all;
 
 require __DIR__ . '/../../vendor/autoload.php';
 
 if (extension_loaded('pcov')) {
-    \pcov\start();
-    $pcovSrcDir = dirname(__DIR__, 2) . '/src';
-    register_shutdown_function(function () use ($pcovSrcDir): void {
-        \pcov\stop();
-        $coverage = \pcov\collect(\pcov\inclusive, [$pcovSrcDir]);
+    start();
+    register_shutdown_function(function (): void {
+        stop();
+        $coverage = collect(all);
         file_put_contents(
             sys_get_temp_dir() . '/brick-lock-worker-coverage-' . getmypid() . '.bin',
             serialize($coverage),

tools/merge-coverage.php

@@ -35,7 +35,7 @@
     }
 
     $rawData = RawCodeCoverageData::fromXdebugWithoutPathCoverage($workerData);
-    $coverage->append($rawData, basename($file, '.bin'), linesToBeCovered: false);
+    $coverage->append($rawData, basename($file, '.bin'));
 
     unlink($file);
 }