Skip to content

Commit 1f13366

Browse files
Update dependencies
1 parent 43361e4 commit 1f13366

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

composer.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cli/MergeCommand.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
namespace SebastianBergmann\PHPCOV;
1111

12-
use const DIRECTORY_SEPARATOR;
1312
use const PHP_EOL;
1413
use function is_dir;
1514
use function printf;
@@ -81,17 +80,11 @@ public function run(Arguments $arguments): int
8180
print 'done' . PHP_EOL;
8281
}
8382

84-
$basePath = $arguments->source() ?? $merged['basePath'];
85-
86-
if ($basePath !== '') {
87-
foreach ($merged['codeCoverage']->coveredFiles() as $relPath) {
88-
$merged['codeCoverage']->renameFile($relPath, $basePath . DIRECTORY_SEPARATOR . $relPath);
89-
}
90-
91-
$merged['basePath'] = '';
83+
if ($arguments->source() !== null) {
84+
$merged['basePath'] = $arguments->source();
9285
}
9386

94-
$reportFacade = new ReportFacade($merged);
87+
$reportFacade = ReportFacade::fromSerializedData($merged);
9588

9689
if ($arguments->clover() !== null) {
9790
print 'Generating code coverage report in Clover XML format ... ';

0 commit comments

Comments
 (0)