update ...

Author: inhere

examples/HomeController.php

@@ -107,8 +107,8 @@ public function progressCommand($input)
         if ($input->getOpt('type') === 'bar') {
             $bar = $this->output->progressBar($total, [
                 'msg' => 'Msg Text',
-                'doneChar' => $input->getOpt('done-char', '='),
-                'waitChar' => $input->getOpt('wait-char', '-'),
+                'doneChar' => $input->getOpt('done-char', '='), // ▓
+                'waitChar' => $input->getOpt('wait-char', '-'), // ░
                 'signChar' => $input->getOpt('sign-char', '>'),
             ]);
         } else {

examples/baks/color.php

@@ -0,0 +1,10 @@
+<?php
+
+// $text = 'test message';
+// $setCodes = [32];
+// $unsetCodes = [39];
+// $text = sprintf("\033[%sm%s\033[%sm\n", implode(';', $setCodes), $text, implode(';', $unsetCodes));
+// var_dump(chr(27));
+// echo $text;
+fwrite(STDOUT, "\033[32;40;1;4mfoo\033[39;49;22;24m");
+fflush(STDOUT);

src/style/Color.php

@@ -7,6 +7,8 @@
 
 /**
  * Class Color
+ * - fg unset 39
+ * - bg unset 49
  * @package inhere\console\style
  */
 final class Color
@@ -61,13 +63,13 @@ final class Color
      * @var array
      */
     private static $knownOptions = [
-        'bold' => 1,      // 加粗
+        'bold' => 1,       // 22 加粗
         'fuzzy' => 2,      // 模糊(不是所有的终端仿真器都支持)
         'italic' => 3,      // 斜体(不是所有的终端仿真器都支持)
-        'underscore' => 4,      // 下划线
-        'blink' => 5,      // 闪烁
-        'reverse' => 7,      // 颠倒的 交换背景色与前景色
-        'concealed' => 8,      // 隐匿的
+        'underscore' => 4, // 24 下划线
+        'blink' => 5,      // 25 闪烁
+        'reverse' => 7,    // 27 颠倒的 交换背景色与前景色
+        'concealed' => 8,  // 28 隐匿的
     ];
 
     /**

src/style/Style.php

@@ -181,9 +181,11 @@ public function format($text)
     protected function replaceColor($text, $tag, $match, Color $color): string
     {
         $style = $color->toStyle();
-        $replace = $this->noColor ? $match : "\033[{$style}m{$match}\033[0m";
+        $replace = $this->noColor ? $match : sprintf("\033[%sm%s\033[0m", $style, $match);
+        // $replace = $this->noColor ? $match : sprintf("\033[%sm%s\033[39m", $style, $match);
 
         return str_replace("<$tag>$match</$tag>", $replace, $text);
+        // return sprintf("\033[%sm%s\033[%sm", implode(';', $setCodes), $text, implode(';', $unsetCodes));
     }
 
     /**

src/utils/Helper.php

@@ -35,10 +35,11 @@ public static function isSupportColor()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             return
-                '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
-                || false !== getenv('ANSICON')
-                || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')// || 'cygwin' === getenv('TERM')
+                '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD ||
+                // 0 == strpos(PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . PHP_WINDOWS_VERSION_BUILD, '10.') ||
+                false !== getenv('ANSICON') ||
+                'ON' === getenv('ConEmuANSI') ||
+                'xterm' === getenv('TERM')// || 'cygwin' === getenv('TERM')
                 ;
         }
 

src/utils/Show.php

@@ -782,7 +782,7 @@ public static function write($messages, $nl = true, $quit = false, array $opts =
 
         fwrite($stream, $messages . ($nl ? PHP_EOL : ''));
 
-        if (isset($opts['flush']) && $opts['flush']) {
+        if (!isset($opts['flush']) || $opts['flush']) {
             fflush($stream);
         }