Fix #137

Author: mikeerickson

.gitignore

@@ -12,4 +12,5 @@ NOTES.md
 tickets/*
 vendor/
 sandbox/
-scripts/
+scripts/
+*.taskpaper

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "codedungeon/phpunit-result-printer",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "description": "PHPUnit Pretty Result Printer",
   "keywords": [
     "phpunit",

phpunit.ci.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGLobals="false"
-         colors="true"
+         colors="false"
          bootstrap="vendor/autoload.php"
          failOnRisky="false"
          processIsolation="false"

src/PrinterInit.php

@@ -15,8 +15,9 @@ public function __construct()
     {
     }
 
-    public function init()
+    public function init($use_colors = "never")
     {
+
         $phpunit_xml_file = './phpunit.xml';
         if (!file_exists($phpunit_xml_file)) {
             $phpunit_xml_file = './phpunit.xml.dist';

src/PrinterTrait.php

@@ -95,7 +95,8 @@ public function __construct(
             $this->maxClassNameLength = 32;
         }
 
-        $this->init();
+
+        $this->init($colors);
     }
 
     /**
@@ -151,22 +152,33 @@ public function packageName()
         return '<unknown>';
     }
 
-    protected function init()
+    protected function init($use_color = "always")
     {
         if (!self::$init) {
             $version = $this->version();
             $name    = $this->packageName();
             echo PHP_EOL;
-            echo $this->colorsTool->green() . "${name} ${version} by Codedungeon and contributors." . PHP_EOL;
-            echo $this->colorsTool->reset();
+            if($use_color !== "never") {
+                echo $this->colorsTool->green() . "${name} ${version} by Codedungeon and contributors." . PHP_EOL;
+                echo $this->colorsTool->reset();
+            } else {
+                echo "${name} ${version} by Codedungeon and contributors." . PHP_EOL;
+            }
+
 
             if ($this->showConfig) {
                 $home     = getenv('HOME');
                 $filename = str_replace($home, '~', $this->configFileName);
 
-                echo $this->colorsTool->yellow() . '==> Configuration: ';
-                echo $this->colorsTool->yellow() . $filename;
-                echo $this->colorsTool->reset();
+                if($use_color !== "never")
+                {
+                    echo $this->colorsTool->yellow() . '==> Configuration: ';
+                    echo $this->colorsTool->yellow() . $filename;
+                    echo $this->colorsTool->reset();
+                } else {
+                    echo "'==> Configuration: '";
+                    echo $filename;
+                }
                 echo PHP_EOL . PHP_EOL;
             }
 

src/ResultPrinter71.php

@@ -39,7 +39,6 @@ protected function writeProgressWithColor(string $progress, string $buffer): voi
         protected function printFooter(TestResult $result): void
         {
             parent::printFooter($result);
-
             if ($this->anyBarEnabled) {
                 $phanyBar = new Phanybar();
                 if (sizeof($result->failures())) {
@@ -69,7 +68,6 @@ protected function formatExceptionMsg($exceptionMessage): string
                 $exceptionMessage = $this->setMessageColor('risky', 'This test did not perform any assertions.');
             } else {
                 $marker = $this->markers['fail'];
-
                 if ($this->colors) {
                     $exceptionMessage = preg_replace('/^(Exception.*)$/m', "\033[01;31m$1\033[0m", $exceptionMessage);
                     $exceptionMessage = preg_replace('/(Failed.*)$/m', "\033[01;31m %1\$s$1\033[0m", $exceptionMessage);
@@ -82,7 +80,7 @@ protected function formatExceptionMsg($exceptionMessage): string
 
             $exceptionMessage = '  ' . $exceptionMessage;
 
-            return $exceptionMessage;
+            return "$exceptionMessage";
         }
 
         protected function printDefectTrace(TestFailure $defect):void
@@ -169,13 +167,14 @@ protected function setMessageColor(string $type, $msg): string
                 $marker = 'skipped';
             }
 
-            // if user turned off colors, reset to white
+            // if user turned off colors, return msg as we are down
             if (!$this->colors) {
-                $color = '37';
+                return $msg;
             }
-            $testMarker = $this->markers[$marker] ?? '';
 
-            return "\033[01;{$color}m{$testMarker}{$msg}\033[0m";
+            // otherwise, we have colors enabled and time to make it pretty
+            $testMarker = $this->markers[$marker] ?? '';
+           return "\033[01;{$color}m{$testMarker}{$msg}\033[0m";
         }
     }
 }

src/init.php

@@ -3,4 +3,4 @@
 require_once 'PrinterInit.php';
 
 $init = new PrinterInit();
-$init->init();
+$init->init("always");