Changed internal setting "colors" to enum values

Author: phpjsdev623

src/ErrorFormatter.php

@@ -35,7 +35,7 @@
 
 class ErrorFormatter
 {
-    /** @var bool */
+    /** @var string */
     private $useColors;
 
     /** @var bool */
@@ -44,7 +44,7 @@ class ErrorFormatter
     /** @var bool */
     private $translateTokens;
 
-    public function __construct($useColors = false, $translateTokens = false, $forceColors = false)
+    public function __construct($useColors = Settings::AUTODETECT, $translateTokens = false, $forceColors = false)
     {
         $this->useColors = $useColors;
         $this->forceColors = $forceColors;
@@ -82,7 +82,7 @@ public function formatSyntaxErrorMessage(SyntaxError $error, $withCodeSnipped =
             $string .= ":$onLine" . PHP_EOL;
 
             if ($withCodeSnipped) {
-                if ($this->useColors) {
+                if ($this->useColors !== Settings::DISABLED) {
                     $string .= $this->getColoredCodeSnippet($error->getFilePath(), $onLine);
                 } else {
                     $string .= $this->getCodeSnippet($error->getFilePath(), $onLine);

src/Manager.php

@@ -107,7 +107,7 @@ protected function getDefaultOutput(Settings $settings)
         if ($settings->json) {
             return new JsonOutput($writer);
         } else {
-            return ($settings->colors ? new TextOutputColored($writer, $settings->forceColors) : new TextOutput($writer));
+            return ($settings->colors !== Settings::DISABLED ? new TextOutputColored($writer, $settings->colors) : new TextOutput($writer));
         }
     }
 

src/Output.php

@@ -320,13 +320,13 @@ class TextOutputColored extends TextOutput
     /** @var \JakubOnderka\PhpConsoleColor\ConsoleColor */
     private $colors;
 
-    public function __construct(IWriter $writer, $forceColors = false)
+    public function __construct(IWriter $writer, $colors = Settings::AUTODETECT)
     {
         parent::__construct($writer);
 
         if (class_exists('\JakubOnderka\PhpConsoleColor\ConsoleColor')) {
             $this->colors = new \JakubOnderka\PhpConsoleColor\ConsoleColor();
-            $this->colors->setForceStyle($forceColors);
+            $this->colors->setForceStyle($colors === Settings::FORCED);
         }
     }
 

src/Settings.php

@@ -32,6 +32,14 @@
 
 class Settings
 {
+
+    /**
+     * constants for enum settings
+     */
+    const FORCED = 'FORCED';
+    const DISABLED = 'DISABLED';
+    const AUTODETECT = 'AUTODETECT';
+
     /**
      * Path to PHP executable
      * @var string
@@ -75,16 +83,10 @@ class Settings
     public $excluded = array();
 
     /**
-     * Print to console with colors
-     * @var bool
-     */
-    public $colors = true;
-
-    /**
-     * Do not autodetect if colors are available
-     * @var bool
+     * Mode for color detection. Possible values: self::FORCED, self::DISABLED and self::AUTODETECT
+     * @var string
      */
-    public $forceColors = false;
+    public $colors = self::AUTODETECT;
 
     /**
      * Output results as JSON string
@@ -165,12 +167,11 @@ public static function parseArguments(array $arguments)
                         break;
 
                     case '--colors':
-                        $settings->forceColors = true;
-                        $settings->colors = true;
+                        $settings->colors = self::FORCED;
                         break;
 
                     case '--no-colors':
-                        $settings->colors = false;
+                        $settings->colors = self::DISABLED;
                         break;
 
                     case '--json':