Closes #115

Author: sebastianbergmann

ChangeLog.md

@@ -8,6 +8,7 @@ All notable changes in PHPCOV are documented in this file using the [Keep a CHAN
 
 * Added support for PHPUnit 13.1 and phpunit/php-code-coverage 14.0
 * Added `--openclover` CLI option for merging into OpenClover XML format
+* [#115](https://github.com/sebastianbergmann/phpcov/issues/115): Support for merging of serialized code coverage data files generated with different base paths
 
 ### Removed
 

src/PatchCoverageCalculator.php

@@ -11,6 +11,8 @@
 
 use const DIRECTORY_SEPARATOR;
 use function is_array;
+use function str_starts_with;
+use function strlen;
 use function substr;
 use SebastianBergmann\CodeCoverage\Data\ProcessedCodeCoverageData;
 use SebastianBergmann\Diff\Diff;
@@ -27,7 +29,7 @@ final class PatchCoverageCalculator
      *
      * @return array{numChangedLinesThatAreExecutable: non-negative-int, numChangedLinesThatWereExecuted: non-negative-int, changedLinesThatWereNotExecuted: array<non-empty-string, non-empty-list<positive-int>>}
      */
-    public function calculate(array $lineCoverage, array $patch, string $pathPrefix): array
+    public function calculate(array $lineCoverage, array $patch, string $basePath, string $pathPrefix): array
     {
         $result = [
             'numChangedLinesThatAreExecutable' => 0,
@@ -61,7 +63,13 @@ public function calculate(array $lineCoverage, array $patch, string $pathPrefix)
         }
 
         foreach ($changes as $file => $lines) {
-            $key = $pathPrefix . $file;
+            $fullPath = $pathPrefix . $file;
+
+            if ($basePath !== '' && str_starts_with($fullPath, $basePath . DIRECTORY_SEPARATOR)) {
+                $key = substr($fullPath, strlen($basePath) + 1);
+            } else {
+                $key = $fullPath;
+            }
 
             foreach ($lines as $line) {
                 if (isset($lineCoverage[$key][$line]) &&

src/cli/MergeCommand.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\PHPCOV;
 
+use const DIRECTORY_SEPARATOR;
 use const PHP_EOL;
 use function file_put_contents;
 use function is_dir;
@@ -94,17 +95,17 @@ public function run(Arguments $arguments): int
             print 'done' . PHP_EOL;
         }
 
-        $this->handleReports($merged['codeCoverage'], $merged['testResults'], $arguments);
+        $this->handleReports($merged['codeCoverage'], $merged['testResults'], $merged['basePath'], $arguments);
 
         return 0;
     }
 
     /**
      * @param array<string, TestType> $testResults
      */
-    private function handleReports(ProcessedCodeCoverageData $codeCoverage, array $testResults, Arguments $arguments): void
+    private function handleReports(ProcessedCodeCoverageData $codeCoverage, array $testResults, string $basePath, Arguments $arguments): void
     {
-        $report = $this->buildReport($codeCoverage, $testResults);
+        $report = $this->buildReport($codeCoverage, $testResults, $basePath);
 
         if ($arguments->clover() !== null) {
             print 'Generating code coverage report in Clover XML format ... ';
@@ -187,8 +188,16 @@ private function handleReports(ProcessedCodeCoverageData $codeCoverage, array $t
     /**
      * @param array<string, TestType> $testResults
      */
-    private function buildReport(ProcessedCodeCoverageData $codeCoverage, array $testResults): Directory
+    private function buildReport(ProcessedCodeCoverageData $codeCoverage, array $testResults, string $basePath): Directory
     {
+        if ($basePath !== '') {
+            $codeCoverage = clone $codeCoverage;
+
+            foreach ($codeCoverage->coveredFiles() as $relPath) {
+                $codeCoverage->renameFile($relPath, $basePath . DIRECTORY_SEPARATOR . $relPath);
+            }
+        }
+
         return (new Builder(new FileAnalyser(new ParsingSourceAnalyser, false, false)))->build($codeCoverage, $testResults);
     }
 }

src/cli/PatchCoverageCommand.php

@@ -49,9 +49,11 @@ public function run(Arguments $arguments): int
         }
 
         try {
+            $data          = (new Unserializer)->unserialize($arguments->coverage());
             $patchCoverage = (new PatchCoverageCalculator)->calculate(
-                (new Unserializer)->unserialize($arguments->coverage())['codeCoverage']->lineCoverage(),
+                $data['codeCoverage']->lineCoverage(),
                 (new DiffParser)->parse(file_get_contents($arguments->patch())),
+                $data['basePath'],
                 $pathPrefix,
             );
         } catch (FileCouldNotBeReadException|InvalidCoverageDataException|VersionMismatchException $e) {