Merge branch '5.x' into master

vimeo · Aug 25, 2023 · 0c57ad0 · 0c57ad0
2 parents cab2379 + 0160c46
commit 0c57ad0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php
@@ -706,7 +706,7 @@ public static function finish(
 
         if (in_array(
             $project_analyzer->stdout_report_options->format,
-            [Report::TYPE_CONSOLE, Report::TYPE_PHP_STORM],
+            [Report::TYPE_CONSOLE, Report::TYPE_PHP_STORM, Report::TYPE_GITHUB_ACTIONS],
         )) {
             echo str_repeat('-', 30) . "\n";
 

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1786,3 +1786,14 @@ if (defined('GLOB_BRACE')) {
     function glob (string $pattern, int $flags = 0): array|false {}
 }
 
+/**
+ * @psalm-template TOutput of array|null
+ *
+ * @param TOutput $output
+ * @param-out (TOutput is null ? list<string> : array) $output
+ * @param-out int $result_code
+ *
+ * @psalm-taint-specialize
+ * @psalm-taint-sink shell $command
+ */
+function exec(string $command, &$output = null, int &$result_code = null): string|false {}