Merge pull request #7620 from weirdan/strip-colors-from-success-message

vimeo · Feb 9, 2022 · ba99e77 · ba99e77
2 parents b06fb93 + 21e6371
commit ba99e77
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php
@@ -691,7 +691,7 @@ function (IssueData $d1, IssueData $d2): int {
                     : $error_count . ' errors'
                 ) . ' found' . "\n";
             } else {
-                self::printSuccessMessage();
+                self::printSuccessMessage($project_analyzer);
             }
 
             $show_info = $project_analyzer->stdout_report_options->show_info;
@@ -782,8 +782,12 @@ function (IssueData $d1, IssueData $d2): int {
         }
     }
 
-    public static function printSuccessMessage(): void
+    public static function printSuccessMessage(ProjectAnalyzer $project_analyzer): void
     {
+        if (!$project_analyzer->stdout_report_options) {
+            throw new UnexpectedValueException('Cannot print success message without stdout report options');
+        }
+
         // this message will be printed
         $message = "No errors found!";
 
@@ -808,9 +812,15 @@ public static function printSuccessMessage(): void
         // text style, 1 = bold
         $style = "1";
 
-        echo "\e[{$background};{$style}m{$paddingTop}\e[0m" . "\n";
-        echo "\e[{$background};{$foreground};{$style}m{$messageWithPadding}\e[0m" . "\n";
-        echo "\e[{$background};{$style}m{$paddingBottom}\e[0m" . "\n";
+        if ($project_analyzer->stdout_report_options->use_color) {
+            echo "\e[{$background};{$style}m{$paddingTop}\e[0m" . "\n";
+            echo "\e[{$background};{$foreground};{$style}m{$messageWithPadding}\e[0m" . "\n";
+            echo "\e[{$background};{$style}m{$paddingBottom}\e[0m" . "\n";
+        } else {
+            echo "\n";
+            echo "$messageWithPadding\n";
+            echo "\n";
+        }
     }
 
     /**

diff --git a/tests/IssueBufferTest.php b/tests/IssueBufferTest.php
@@ -113,8 +113,10 @@ public function testFinishDoesNotCorruptInternalState(): void
 
     public function testPrintSuccessMessageWorks(): void
     {
+        $project_analyzer = $this->createMock(ProjectAnalyzer::class);
+        $project_analyzer->stdout_report_options = new ReportOptions;
         ob_start();
-        IssueBuffer::printSuccessMessage();
+        IssueBuffer::printSuccessMessage($project_analyzer);
         $output = ob_get_clean();
 
         $this->assertStringContainsString('No errors found!', $output);