update some logic for write read message

Author: inhere

.php_cs

@@ -3,7 +3,7 @@
 $header = <<<'EOF'
 This file is part of toolkit/cli-utils.
 
-@link     https://github.com/inhere
+@link     https://github.com/php-toolkit/cli-utils
 @author   https://github.com/inhere
 @license  MIT
 EOF;
@@ -17,7 +17,10 @@ return PhpCsFixer\Config::create()
         ],
         'class_attributes_separation' => true,
         'declare_strict_types' => true,
-        'global_namespace_import' => true,
+        'global_namespace_import' => [
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
         'header_comment' => [
             'comment_type' => 'PHPDoc',
             'header'    => $header,

src/App.php

@@ -108,7 +108,7 @@ public function __construct(array $config = [], array $argv = null)
         self::$i = $this;
 
         // get current dir
-        $this->pwd = getcwd();
+        $this->pwd = (string)getcwd();
 
         // parse cli argv
         $argv = $argv ?? (array)$_SERVER['argv'];
@@ -120,9 +120,10 @@ public function __construct(array $config = [], array $argv = null)
         $this->script = array_shift($argv);
 
         // parse flags
-        [$this->args, $this->opts] = Flags::parseArgv(array_values($argv), [
-            'mergeOpts' => true
-        ]);
+        [
+            $this->args,
+            $this->opts
+        ] = Flags::parseArgv(array_values($argv), ['mergeOpts' => true]);
     }
 
     /**

src/Cli.php

@@ -9,6 +9,8 @@
 
 namespace Toolkit\Cli;
 
+use Toolkit\Cli\Traits\ReadMessageTrait;
+use Toolkit\Cli\Traits\WriteMessageTrait;
 use function date;
 use function defined;
 use function fflush;
@@ -34,7 +36,6 @@
 use const PHP_WINDOWS_VERSION_MAJOR;
 use const PHP_WINDOWS_VERSION_MINOR;
 use const STDERR;
-use const STDIN;
 use const STDOUT;
 
 /**
@@ -44,6 +45,8 @@
  */
 class Cli
 {
+    // use ReadMessageTrait, WriteMessageTrait;
+
     public const LOG_LEVEL2TAG = [
         'info'    => 'info',
         'warn'    => 'warning',
@@ -54,23 +57,12 @@ class Cli
     ];
 
     /*******************************************************************************
-     * read/write message
+     * read message
      ******************************************************************************/
 
-    /**
-     * @param string $message
-     * @param bool   $nl
-     *
-     * @return string
-     */
-    public static function read(string $message = '', bool $nl = false): string
-    {
-        if ($message) {
-            self::write($message, $nl);
-        }
-
-        return trim(fgets(STDIN));
-    }
+    /*******************************************************************************
+     * write message
+     ******************************************************************************/
 
     /**
      * @param string $format
@@ -138,7 +130,7 @@ public static function stderr(string $message, $nl = true, $quit = -1): void
      ******************************************************************************/
 
     /**
-     * @param                  $text
+     * @param string           $text
      * @param string|int|array $style
      *
      * @return string

src/Highlighter.php

@@ -13,17 +13,14 @@
 use function array_merge;
 use function array_slice;
 use function defined;
-use function end;
 use function explode;
 use function file_get_contents;
 use function function_exists;
 use function implode;
 use function is_array;
-use function key;
 use function max;
 use function str_pad;
 use function str_replace;
-use function strlen;
 use function token_get_all;
 use const PHP_EOL;
 use const STR_PAD_LEFT;
@@ -82,8 +79,10 @@ class Highlighter
     /** @var self */
     private static $instance;
 
-    /** @var array */
-    private $defaultTheme = [
+    /**
+     * @var array
+     */
+    private $codeTheme = [
         self::TOKEN_STRING     => 'green',
         self::TOKEN_COMMENT    => 'italic',
         self::TOKEN_KEYWORD    => 'yellow',
@@ -336,7 +335,7 @@ private function colorLines(array $tokenLines): array
         foreach ($tokenLines as $lineCount => $tokenLine) {
             $line = '';
             foreach ($tokenLine as [$tokenType, $tokenValue]) {
-                $style = $this->defaultTheme[$tokenType];
+                $style = $this->codeTheme[$tokenType];
 
                 if (Color::hasStyle($style)) {
                     $line .= Color::apply($style, $tokenValue);
@@ -359,22 +358,22 @@ private function colorLines(array $tokenLines): array
      */
     private function lineNumbers(array $lines, $markLine = null): string
     {
-        end($lines);
-
         $snippet = '';
-        $lineLen = strlen(key($lines) + 1);
-        $lmStyle = $this->defaultTheme[self::ACTUAL_LINE_MARK];
-        $lnStyle = $this->defaultTheme[self::LINE_NUMBER];
+        $lineLen = count($lines) + 1;
+        $lmStyle = $this->codeTheme[self::ACTUAL_LINE_MARK];
+        $lnStyle = $this->codeTheme[self::LINE_NUMBER];
 
         foreach ($lines as $i => $line) {
+            $lineNum = $i + 1;
+            $lineStr = (string)($lineNum);
             if ($markLine !== null) {
-                $snippet .= ($markLine === $i + 1 ? Color::apply($lmStyle, '  > ') : '    ');
+                $snippet .= ($markLine === $lineNum ? Color::apply($lmStyle, '  > ') : '    ');
                 $snippet .= Color::apply(
-                    $markLine === $i + 1 ? $lmStyle : $lnStyle,
-                    str_pad($i + 1, $lineLen, ' ', STR_PAD_LEFT) . '| '
+                    $markLine === $lineNum ? $lmStyle : $lnStyle,
+                    str_pad($lineStr, $lineLen, ' ', STR_PAD_LEFT) . '| '
                 );
             } else {
-                $snippet .= Color::apply($lnStyle, str_pad($i + 1, $lineLen, ' ', STR_PAD_LEFT) . '| ');
+                $snippet .= Color::apply($lnStyle, str_pad($lineStr, $lineLen, ' ', STR_PAD_LEFT) . '| ');
             }
 
             $snippet .= $line . PHP_EOL;
@@ -386,16 +385,16 @@ private function lineNumbers(array $lines, $markLine = null): string
     /**
      * @return array
      */
-    public function getDefaultTheme(): array
+    public function getCodeTheme(): array
     {
-        return $this->defaultTheme;
+        return $this->codeTheme;
     }
 
     /**
-     * @param array $defaultTheme
+     * @param array $codeTheme
      */
-    public function setDefaultTheme(array $defaultTheme): void
+    public function setCodeTheme(array $codeTheme): void
     {
-        $this->defaultTheme = array_merge($this->defaultTheme, $defaultTheme);
+        $this->codeTheme = array_merge($this->codeTheme, $codeTheme);
     }
 }