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

Infer output format from GITHUB_ACTIONS env #9982

Merged
merged 12 commits into from
Jul 2, 2023
Merged

Infer output format from GITHUB_ACTIONS env #9982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ed4f94
Infer output format from GITHUB_ACTIONS env
ro0NL Jun 30, 2023
7cf87b2
Update PsalmRunnerTrait.php
ro0NL Jul 1, 2023
f0e2856
Update PsalmRunnerTrait.php
ro0NL Jul 1, 2023
0617274
Update PsalmRunnerTrait.php
ro0NL Jul 1, 2023
52c629c
infer --debug in GHA
ro0NL Jul 1, 2023
ce9d9db
Update Psalm.php
ro0NL Jul 1, 2023
010306f
Update Psalm.php
ro0NL Jul 1, 2023
33b0693
ugh
ro0NL Jul 1, 2023
039c526
Update PsalmRunnerTrait.php
ro0NL Jul 1, 2023
f07cdfc
Update Psalm.php
ro0NL Jul 1, 2023
bf31ffb
Update Psalm.php
ro0NL Jul 1, 2023
b525f9c
PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
ro0NL Jul 1, 2023
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
13 changes: 13 additions & 0 deletions src/Psalm/Internal/Cli/Psalm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use function array_merge;
use function array_slice;
use function array_sum;
use function array_unshift;
use function array_values;
use function chdir;
use function count;
Expand Down Expand Up @@ -183,6 +184,14 @@ public static function run(array $argv): void
throw new RuntimeException('Failed to parse CLI options');
}

// debug CI environment
if (!in_array('--debug', $options, true)
&& 'true' === getenv('GITHUB_ACTIONS')
&& '1' === getenv('RUNNER_DEBUG')
) {
array_unshift($options, '--debug');
}

self::forwardCliCall($options, $argv);

self::validateCliArguments($args);
Expand Down Expand Up @@ -416,6 +425,10 @@ private static function findDefaultOutputFormat(): string
return Report::TYPE_PHP_STORM;
}

if ('true' === getenv('GITHUB_ACTIONS')) {
return Report::TYPE_GITHUB_ACTIONS;
}

return Report::TYPE_CONSOLE;
}

Expand Down
7 changes: 7 additions & 0 deletions tests/EndToEnd/PsalmRunnerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
use Symfony\Component\Process\Process;

use function array_merge;
use function array_unshift;
use function in_array;

trait PsalmRunnerTrait
{
Expand All @@ -22,6 +24,11 @@ private function runPsalm(
bool $shouldFail = false,
bool $relyOnConfigDir = true
): array {
// Ensure CI agnostic output
if (!in_array('--init', $args, true) && !in_array('--alter', $args, true)) {
array_unshift($args, '--output-format=console');
}

// As config files all contain `resolveFromConfigFile="true"` Psalm
// shouldn't need to be run from the same directory that the code being
// analysed exists in.
Expand Down