upsome

Author: inhere

src/App.php

@@ -64,12 +64,12 @@ class App
     /**
      * @var array Parsed from `arg0 name=val var2=val2`
      */
-    private $args = [];
+    private $args;
 
     /**
      * @var array Parsed from `--name=val --var2=val2 -d`
      */
-    private $opts = [];
+    private $opts;
 
     /**
      * @var string
@@ -111,7 +111,7 @@ public function __construct(array $config = [], array $argv = null)
         $this->pwd = (string)getcwd();
 
         // parse cli argv
-        $argv = $argv ?? (array)$_SERVER['argv'];
+        $argv = $argv ?? $_SERVER['argv'];
         if ($config) {
             $this->setMetas($config);
         }

src/Cli.php

@@ -13,18 +13,12 @@
 use Toolkit\Cli\Traits\WriteMessageTrait;
 use function date;
 use function defined;
-use function fflush;
-use function fgets;
 use function function_exists;
-use function fwrite;
 use function getenv;
 use function implode;
-use function is_array;
-use function is_int;
 use function is_numeric;
 use function json_encode;
 use function preg_replace;
-use function sprintf;
 use function strpos;
 use function strtoupper;
 use function trim;
@@ -35,7 +29,6 @@
 use const PHP_WINDOWS_VERSION_BUILD;
 use const PHP_WINDOWS_VERSION_MAJOR;
 use const PHP_WINDOWS_VERSION_MINOR;
-use const STDERR;
 use const STDOUT;
 
 /**
@@ -45,7 +38,7 @@
  */
 class Cli
 {
-    // use ReadMessageTrait, WriteMessageTrait;
+    use ReadMessageTrait, WriteMessageTrait;
 
     public const LOG_LEVEL2TAG = [
         'info'    => 'info',
@@ -57,78 +50,17 @@ class Cli
     ];
 
     /*******************************************************************************
-     * read message
-     ******************************************************************************/
-
-    /*******************************************************************************
-     * write message
+     * color render
      ******************************************************************************/
 
     /**
-     * @param string $format
-     * @param mixed  ...$args
-     */
-    public static function writef(string $format, ...$args): void
-    {
-        self::write(sprintf($format, ...$args));
-    }
-
-    /**
-     * Write message to console
-     *
-     * @param string|array $messages
-     * @param bool         $nl
-     * @param bool|int     $quit
-     */
-    public static function write($messages, bool $nl = true, $quit = false): void
-    {
-        if (is_array($messages)) {
-            $messages = implode($nl ? PHP_EOL : '', $messages);
-        }
-
-        self::stdout(Color::parseTag($messages), $nl, $quit);
-    }
-
-    /**
-     * Logs data to stdout
-     *
-     * @param string   $message
-     * @param bool     $nl
-     * @param bool|int $quit
-     */
-    public static function stdout(string $message, bool $nl = true, $quit = false): void
-    {
-        fwrite(STDOUT, $message . ($nl ? PHP_EOL : ''));
-        fflush(STDOUT);
-
-        if (($isTrue = true === $quit) || is_int($quit)) {
-            $code = $isTrue ? 0 : $quit;
-            exit($code);
-        }
-    }
-
-    /**
-     * Logs data to stderr
-     *
-     * @param string   $message
-     * @param bool     $nl
-     * @param bool|int $quit
+     * @return Style
      */
-    public static function stderr(string $message, $nl = true, $quit = -1): void
+    public static function style(): Style
     {
-        fwrite(STDERR, self::color('[ERROR] ', 'red') . $message . ($nl ? PHP_EOL : ''));
-        fflush(STDOUT);
-
-        if (($isTrue = true === $quit) || is_int($quit)) {
-            $code = $isTrue ? 0 : $quit;
-            exit($code);
-        }
+        return Style::instance();
     }
 
-    /*******************************************************************************
-     * color render
-     ******************************************************************************/
-
     /**
      * @param string           $text
      * @param string|int|array $style
@@ -154,7 +86,7 @@ public static function color(string $text, $style = null): string
      *  'coId' => 12,
      *  ]
      */
-    public static function log(string $msg, array $data = [], string $type = 'info', array $opts = []): void
+    public static function clog(string $msg, array $data = [], string $type = 'info', array $opts = []): void
     {
         if (isset(self::LOG_LEVEL2TAG[$type])) {
             $type = ColorTag::add(strtoupper($type), self::LOG_LEVEL2TAG[$type]);

src/Traits/WriteMessageTrait.php

@@ -198,7 +198,7 @@ public static function stdout($text, bool $nl = true, $quit = false): void
      * @param bool         $nl
      * @param bool|int     $quit
      */
-    public static function stderr($text, $nl = true, $quit = -200): void
+    public static function stderr($text, $nl = true, $quit = -2): void
     {
         self::write($text, $nl, $quit, [
             'stream' => self::$errorStream,