some modify for cli output

Author: inhere

src/console/ConsoleHelper.php

@@ -18,7 +18,11 @@ class ConsoleHelper
     public static function isSupportColor()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+            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');
         }
 
         if (!defined('STDOUT')) {

src/console/Interact.php

@@ -17,11 +17,6 @@
  */
 class Interact
 {
-    const STAR_LINE = "*************************************%s*************************************\n";
-
-    const NL = "\n";// new line
-    const TAB    = '    ';
-    const NL_TAB = "\n    ";// new line + tab
 
 /////////////////////////////////////////////////////////////////
 /// Interactive method (select/confirm/question/loopAsk)
@@ -631,8 +626,8 @@ public static function getColor()
 
     /**
      * 读取输入信息
-     * @param  string $text  若不为空，则先输出文本
-     * @param  bool   $nl    true 会添加换行符 false 原样输出，不添加换行符
+     * @param  string $message  若不为空，则先输出文本
+     * @param  bool   $nl       true 会添加换行符 false 原样输出，不添加换行符
      * @return string
      */
     public static function readRow($message = null, $nl = false)
@@ -641,27 +636,35 @@ public static function readRow($message = null, $nl = false)
     }
     public static function read($message = null, $nl = false)
     {
-        self::write($message, $nl);
+        if ( $message ) {
+            self::write($message, $nl);
+        }
 
         return trim(fgets(STDIN));
     }
 
     /**
-     * 输出
-     * @param  string      $text
-     * @param  bool        $nl    true 会添加换行符 false 原样输出，不添加换行符
-     * @param  int|boolean $quit  If is int, settin it is exit code.
+     * Write a message to standard output stream.
+     * @param  string|array $messages    Output message
+     * @param  boolean      $nl          true 会添加换行符 false 原样输出，不添加换行符
+     * @param  int|boolean  $quit        If is int, settin it is exit code.
      */
-    public static function write($text, $nl = true, $quit = false)
+    public static function write($messages, $nl = true, $quit = false)
     {
-        $text = static::getColor()->format($text);
+        // if ( is_array($messages) ) {
+        //     $messages = implode( $nl ? PHP_EOL : '', $messages );
+        // }
 
-        fwrite(STDOUT, $text . ($nl ? "\n" : null));
+        $messages = static::getColor()->format($messages);
+
+        fwrite(STDOUT, $messages . ($nl ? PHP_EOL : ''));
 
         if ( is_int($quit) || true === $quit) {
             $code = true === $quit ? 0 : $quit;
             exit($code);
         }
+
+        fflush(STDOUT);
     }
 
 

src/console/Output.php

@@ -132,35 +132,46 @@ public function comment($messages, $quit = false)
 
     /**
      * 读取输入信息
-     * @param  string $text  若不为空，则先输出文本
-     * @param  bool   $nl    true 会添加换行符 false 原样输出，不添加换行符
+     * @param  string $message  若不为空，则先输出文本
+     * @param  bool   $nl       true 会添加换行符 false 原样输出，不添加换行符
      * @return string
      */
     public function read($message = null, $nl = false)
     {
-        $this->write($message, $nl);
+        if ( $message ) {
+            $this->write($message, $nl);
+        }
 
         return trim(fgets(STDIN));
     }
 
     /**
-     * Write a message to standard output.
-     * @param  string      $text  output message
-     * @param  bool        $nl    true 会添加换行符 false 原样输出，不添加换行符
-     * @param  int|boolean $quit  If is int, settin it is exit code.
+     * Write a message to standard output stream.
+     * @param  mixed       $messages  Output message
+     * @param  bool        $nl        true 会添加换行符 false 原样输出，不添加换行符
+     * @param  int|boolean $quit      If is int, settin it is exit code.
      * @return static
      */
-    public function write($text = '', $nl = true, $quit = false)
+    public function write($messages = '', $nl = true, $quit = false)
     {
-        $text = $this->getColor()->format($text);
+        if ( is_array($messages) ) {
+            $messages = implode( $nl ? PHP_EOL : '', $messages );
+        }
 
-        fwrite($this->outputStream, $text . ($nl ? "\n" : null));
+        $messages = $this->getColor()->format($messages);
+
+        if (false === @fwrite($this->outputStream, $messages . ($nl ? PHP_EOL : ''))) {
+            // should never happen
+            throw new \RuntimeException('Unable to write output.');
+        }
 
         if ( is_int($quit) || true === $quit) {
             $code = true === $quit ? 0 : $quit;
             exit($code);
         }
 
+        fflush($this->outputStream);
+
         return $this;
     }