Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make GitHub annotation work when Infection is run in subdirectory #1576

Merged
merged 1 commit into from
Sep 14, 2021
Merged

Make GitHub annotation work when Infection is run in subdirectory #1576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Logger/GitHubAnnotationsLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
namespace Infection\Logger;

use Infection\Metrics\ResultsCollector;
use function Safe\getcwd;
use function shell_exec;
use function str_replace;
use function trim;
use Webmozart\PathUtil\Path;

/**
Expand All @@ -57,7 +58,7 @@ public function __construct(ResultsCollector $resultsCollector)
public function getLogLines(): array
{
$lines = [];
$currentWorkingDirectory = getcwd();
$projectRootDirectory = trim((string) shell_exec('git rev-parse --show-toplevel'));

foreach ($this->resultsCollector->getEscapedExecutionResults() as $escapedExecutionResult) {
$error = [
Expand All @@ -71,7 +72,7 @@ public function getLogLines(): array
];

$lines[] = $this->buildAnnotation(
Path::makeRelative($escapedExecutionResult->getOriginalFilePath(), $currentWorkingDirectory),
Path::makeRelative($escapedExecutionResult->getOriginalFilePath(), $projectRootDirectory),
$error,
);
}
Expand Down