refactor: refacting the input output class.

Author: inhere

src/Contract/InputInterface.php

@@ -40,4 +40,9 @@ public function getCommand(): string;
      * Whether the stream is an interactive terminal
      */
     public function isInteractive(): bool;
+
+    /**
+     * @return string
+     */
+    public function toString(): string;
 }

src/IO/AbstractInput.php

@@ -10,14 +10,17 @@
 namespace Inhere\Console\IO;
 
 use Inhere\Console\Contract\InputInterface;
+use Toolkit\Cli\Helper\FlagHelper;
 use Toolkit\PFlag\FlagsParser;
 use Toolkit\PFlag\SFlags;
+use function array_map;
 use function array_shift;
 use function basename;
 use function getcwd;
 use function implode;
 use function is_int;
 use function is_string;
+use function preg_match;
 use function trim;
 
 /**
@@ -111,7 +114,33 @@ public function __toString(): string
     /**
      * @return string
      */
-    abstract public function toString(): string;
+    public function toString(): string
+    {
+        if (!$this->tokens) {
+            return '';
+        }
+
+        $tokens = array_map([$this, 'tokenEscape'], $this->tokens);
+        return implode(' ', $tokens);
+    }
+
+    /**
+     * @param string $token
+     *
+     * @return string
+     */
+    protected function tokenEscape(string $token): string
+    {
+        if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
+            return $match[1] . FlagHelper::escapeToken($match[2]);
+        }
+
+        if ($token && $token[0] !== '-') {
+            return FlagHelper::escapeToken($token);
+        }
+
+        return $token;
+    }
 
     /**
      * @param array $rawFlags

src/IO/Input.php

@@ -9,21 +9,15 @@
 
 namespace Inhere\Console\IO;
 
+use Inhere\Console\IO\Input\StreamInput;
 use Toolkit\Cli\Cli;
-use Toolkit\Cli\Flags;
-use Toolkit\Cli\Helper\FlagHelper;
-use Toolkit\FsUtil\File;
-use function array_map;
-use function fwrite;
-use function implode;
-use function preg_match;
 
 /**
- * Class Input - The input information. by parse global var $argv.
+ * Class Input - The std input.
  *
  * @package Inhere\Console\IO
  */
-class Input extends AbstractInput
+class Input extends StreamInput
 {
     /**
      * The real command ID(group:command)
@@ -33,13 +27,6 @@ class Input extends AbstractInput
      */
     protected $commandId = '';
 
-    /**
-     * Default is STDIN
-     *
-     * @var resource
-     */
-    protected $stream;
-
     /**
      * Input constructor.
      *
@@ -51,63 +38,10 @@ public function __construct(array $args = null)
             $args = $_SERVER['argv'];
         }
 
-        $this->stream = Cli::getInputStream();
+        parent::__construct(Cli::getInputStream());
         $this->collectInfo($args);
     }
 
-    /**
-     * @return string
-     */
-    public function toString(): string
-    {
-        $tokens = array_map([$this, 'tokenEscape'], $this->tokens);
-
-        return implode(' ', $tokens);
-    }
-
-    /**
-     * @param string $token
-     *
-     * @return string
-     */
-    protected function tokenEscape(string $token): string
-    {
-        if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-            return $match[1] . FlagHelper::escapeToken($match[2]);
-        }
-
-        if ($token && $token[0] !== '-') {
-            return FlagHelper::escapeToken($token);
-        }
-
-        return $token;
-    }
-
-    /**
-     * @return string
-     */
-    public function readAll(): string
-    {
-        return File::streamReadAll($this->stream);
-    }
-
-    /**
-     * Read input information
-     *
-     * @param string $question 若不为空，则先输出文本消息
-     * @param bool   $nl       true 会添加换行符 false 原样输出，不添加换行符
-     *
-     * @return string
-     */
-    public function readln(string $question = '', bool $nl = false): string
-    {
-        if ($question) {
-            fwrite($this->stream, $question . ($nl ? "\n" : ''));
-        }
-
-        return File::streamFgets($this->stream);
-    }
-
     /**
      * @return resource
      */
@@ -141,14 +75,6 @@ public function getFullCommand(): string
         return $this->scriptFile . ' ' . $this->getCommandPath();
     }
 
-    /**
-     * @return resource
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
     /**
      * Get command ID e.g `http:start`
      *

src/IO/Input/AloneInput.php

@@ -11,6 +11,7 @@
 
 use Inhere\Console\IO\Input;
 use Toolkit\Cli\Flags;
+use function is_int;
 
 /**
  * Class ArrayInput
@@ -22,10 +23,19 @@ class ArrayInput extends Input
     /**
      * Input constructor.
      *
-     * @param null|array $args
+     * @param array $arr
      */
-    public function __construct(array $args = null)
+    public function __construct(array $arr = [])
     {
+        $args = [];
+        foreach ($arr as $key => $val) {
+            if (!is_int($key)) {
+                $args[] = $key;
+            }
+
+            $args[] = $val;
+        }
+
         parent::__construct($args);
     }
 }

src/IO/Input/ArrayInput.php

@@ -39,11 +39,6 @@ public function __construct($stream = STDIN)
         $this->setStream($stream);
     }
 
-    public function toString(): string
-    {
-        return '';
-    }
-
     /**
      * @return string
      */
@@ -98,7 +93,7 @@ protected function setStream($stream): void
         File::assertStream($stream);
 
         $meta = stream_get_meta_data($stream);
-        if (strpos($meta['mode'], 'r') === false && strpos($meta['mode'], '+') === false) {
+        if (!str_contains($meta['mode'], 'r') && !str_contains($meta['mode'], '+')) {
             throw new InvalidArgumentException('Expected a readable stream');
         }
 

src/IO/Input/StreamInput.php

@@ -10,7 +10,6 @@
 namespace Inhere\Console\IO\Input;
 
 use Inhere\Console\IO\Input;
-use Toolkit\Cli\Flags;
 use Toolkit\Cli\Util\LineParser;
 
 /**
@@ -28,6 +27,7 @@ class StringInput extends Input
     public function __construct(string $line)
     {
         $flags = LineParser::parseIt($line);
+
         parent::__construct($flags);
     }
 }