Skip to content

Allow gitlab ci to be detected #3670

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

Open
wants to merge 1 commit into
base: 1.12.x
Choose a base branch
from
Open

Allow gitlab ci to be detected #3670

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions src/Command/ErrorFormatter/CiDetectedErrorFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class CiDetectedErrorFormatter implements ErrorFormatter
public function __construct(
private GithubErrorFormatter $githubErrorFormatter,
private TeamcityErrorFormatter $teamcityErrorFormatter,
private GitlabErrorFormatter $gitlabErrorFormatter,
)
{
}
Expand All @@ -31,6 +32,8 @@ public function formatErrors(AnalysisResult $analysisResult, Output $output): in
return $this->githubErrorFormatter->formatErrors($analysisResult, $output);
} elseif ($ci->getCiName() === CiDetector::CI_TEAMCITY) {
return $this->teamcityErrorFormatter->formatErrors($analysisResult, $output);
} elseif ($ci->getCiName() === CiDetector::CI_GITLAB) {
return $this->gitlabErrorFormatter->formatErrors($analysisResult, $output);
}
} catch (CiNotDetectedException) {
// pass
Expand Down
2 changes: 2 additions & 0 deletions tests/PHPStan/Command/AnalyseApplicationIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use PHPStan\Analyser\ResultCache\ResultCacheClearer;
use PHPStan\Command\ErrorFormatter\CiDetectedErrorFormatter;
use PHPStan\Command\ErrorFormatter\GithubErrorFormatter;
use PHPStan\Command\ErrorFormatter\GitlabErrorFormatter;
use PHPStan\Command\ErrorFormatter\TableErrorFormatter;
use PHPStan\Command\ErrorFormatter\TeamcityErrorFormatter;
use PHPStan\Command\Symfony\SymfonyOutput;
Expand Down Expand Up @@ -74,6 +75,7 @@ private function runPath(string $path, int $expectedStatusCode): string
new CiDetectedErrorFormatter(
new GithubErrorFormatter($relativePathHelper),
new TeamcityErrorFormatter($relativePathHelper),
new GitlabErrorFormatter($relativePathHelper),
),
false,
null,
Expand Down
1 change: 1 addition & 0 deletions tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ private function createErrorFormatter(?string $editorUrl, ?string $editorUrlTitl
new CiDetectedErrorFormatter(
new GithubErrorFormatter($relativePathHelper),
new TeamcityErrorFormatter($relativePathHelper),
new GitlabErrorFormatter($relativePathHelper),
),
false,
$editorUrl,
Expand Down
Loading