some update, some bug fixed for parse input argv

Author: inhere

README.md

@@ -24,27 +24,76 @@ $app = new App([], $input, $output);
 example(in terminal):
 
 ```
-./bin/app image/packTask name=john -d -s=test --debug=true
-php bin/cli.php start name=john -d -s=test --debug=true
+$ examples/app home/useArg status=2 name=john name=tom name=jack arg0 -s=test --page=23 --id=23 --id=154 --id=456  -d -rf --debug --test=false
 ```
 
 get command info:
 
 ```
-$script = $input->getScript();   // './bin/app'    'bin/cli.php'
-$command = $input->getCommand(); // 'image/packTask' 'start'
+echo $input->getScript();   // 'examples/app'
+echo $input->getCommand(); // 'home/useArg'
+```
+
+get parsed arguments:
+
+```php
+var_dump($input->getArgs());
+```
+
+output:
+
+```php
+array(3) {            
+  'status' => string(1) "2"       
+  'name' =>  array(3) {          
+    [0] => string(4) "john"  
+    [1] => string(3) "tom"   
+    [2] => string(4) "jack"  
+  }                   
+  [0] => string(4) "arg0"    
+}                     
+```
+
+get parsed options:
+
+```php
+var_dump($input->getOpts());
+```
+
+output:
+
+```php
+array(8) {                  
+  's' => string(4) "test"   
+  'page' => string(2) "23"  
+  'id' => array(3) {        
+    [0] => string(2) "23"   
+    [1] => string(3) "154"  
+    [2] => string(3) "456"  
+  }                         
+  'd' => bool(true)         
+  'r' => bool(true)         
+  'f' => bool(true)         
+  'debug' => bool(true)     
+  'test' => bool(false)     
+}                           
+```
+
+more method:
+
+```php
 
 // argument
-$name = $input->get('name', 'default'); // 'john'
-$s = $input->get('s', 'default'); // 'test'
+$first = $input->getFirstArg(); // 'arg0'
+$status = $input->get('status', 'default'); // '2'
 
 // option
-$d = $input->getBool('d') // True
-$debug = $input->getBool('debug') // True
-$noexists = $input->getBool('noexists') // False
+$page = $input->getOpt('page') // '23'
+$debug = $input->boolOpt('debug') // True
+$test = $input->boolOpt('test') // False
 ```
 
-get user input:
+### get user input:
 
 ```
 echo "Your name:";
@@ -183,4 +232,6 @@ var_dump($result); // bool(false)
 
 ```
 
-## formatted output
+## License
+
+MIT

examples/HomeController.php

@@ -91,11 +91,12 @@ public function fmtMsgCommand()
      * a example for use arguments on command
      * @usage home/useArg [arg1=val1 arg2=arg2] [options]
      * @example home/useArg status=2 name=john arg0 -s=test --page=23 -d -rf --debug --test=false
+     *   home/useArg status=2 name=john name=tom name=jack arg0 -s=test --page=23 --id=23 --id=154 --id=456  -d -rf --debug --test=false
      */
     public function useArgCommand()
     {
         $this->write('input arguments:');
-        var_dump($this->input->get());
+        var_dump($this->input->getArgs());
 
         $this->write('input options:');
         var_dump($this->input->getOpts());

src/AbstractApp.php

@@ -10,13 +10,16 @@
 
 use inhere\console\io\Input;
 use inhere\console\io\Output;
+use inhere\console\utils\TraitInputOutput;
 
 /**
  * Class AbstractApp
  * @package inhere\console
  */
 abstract class AbstractApp
 {
+    use TraitInputOutput;
+
     // event name list
     const ON_BEFORE_RUN = 'beforeRun';
     const ON_AFTER_RUN  = 'afterRun';
@@ -47,16 +50,6 @@ abstract class AbstractApp
         'timeZone' => 'Asia/Shanghai',
     ];
 
-    /**
-     * @var Input
-     */
-    public $input;
-
-    /**
-     * @var Output
-     */
-    public $output;
-
     /**
      * @var array
      */
@@ -161,7 +154,7 @@ public function stop($code = 0)
      * @param string $controller The controller class
      * @return static
      */
-    public function controller($name, $controller)
+    public function controller(string $name, string $controller)
     {
         if (!$name || !$controller) {
             throw new \InvalidArgumentException('Parameters are not allowed to is empty!');
@@ -194,7 +187,7 @@ public function controllers(array $controllers)
      * @param string|\Closure $handler
      * @return $this
      */
-    public function command($name, $handler)
+    public function command(string $name, $handler)
     {
         if (!$name || !$handler) {
             throw new \InvalidArgumentException('Parameters are not allowed to is empty!');
@@ -221,7 +214,7 @@ public function commands(array $commands)
     /**
      * @return array
      */
-    public static function hooks()
+    public static function hooks(): array
     {
         return array_keys(self::$hooks);
     }
@@ -230,7 +223,7 @@ public static function hooks()
      * @param $event
      * @param callable $handler
      */
-    public function on($event, callable $handler)
+    public function on(string $event, callable $handler)
     {
         if (isset(self::$hooks[$event])) {
             self::$hooks[$event] = $handler;
@@ -240,7 +233,7 @@ public function on($event, callable $handler)
     /**
      * @return array
      */
-    public function getInternalCommands()
+    public function getInternalCommands(): array
     {
         return $this->internalCommands;
     }
@@ -249,7 +242,7 @@ public function getInternalCommands()
      * @param $name
      * @return bool
      */
-    public function isInternalCommand($name)
+    public function isInternalCommand(string $name): bool
     {
         return isset($this->internalCommands[$name]);
     }
@@ -303,7 +296,7 @@ public function setConfig(array $config)
      * get config
      * @return array
      */
-    public function getConfig()
+    public function getConfig(): array
     {
         return $this->config;
     }
@@ -312,44 +305,16 @@ public function getConfig()
      * is Debug
      * @return boolean
      */
-    public function isDebug()
+    public function isDebug(): bool
     {
         return (bool)$this->config['debug'];
     }
 
     /**
-     * @return Input
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * @param Input $input
-     */
-    public function setInput(Input $input)
-    {
-        $this->input = $input;
-    }
-
-    /**
-     * @return Output
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-    /**
-     * @param Output $output
+     * @param $name
+     * @param bool $isGroup
      */
-    public function setOutput(Output $output)
-    {
-        $this->output = $output;
-    }
-
-    protected function checkName($name, $isGroup = false)
+    protected function checkName(string $name, $isGroup = false)
     {
         $pattern = $isGroup ? '/^[a-z][\w-]+$/' : '/^[a-z][\w-]*:?([a-z][\w-]+)?$/';
 

src/AbstractCommand.php

@@ -8,6 +8,8 @@
 
 namespace inhere\console;
 
+use inhere\console\io\Input;
+use inhere\console\io\Output;
 use inhere\console\utils\TraitInputOutput;
 use inhere\console\utils\TraitInteract;
 
@@ -36,28 +38,39 @@ abstract class AbstractCommand
      */
     protected static $allowTags = ['description', 'usage', 'example'];
 
+    /**
+     * Command constructor.
+     * @param Input $input
+     * @param Output $output
+     */
+    public function __construct(Input $input, Output $output)
+    {
+        $this->input  = $input;
+        $this->output = $output;
+    }
+
     abstract public function run($arg = '');
 
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName(string $name)
     {
         $this->name = $name;
     }
 
     /**
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
      * @return array
      */
-    public static function getAllowTags()
+    public static function getAllowTags(): array
     {
         return self::$allowTags;
     }

src/App.php

@@ -232,7 +232,7 @@ public function showVersionInfo($quit = true)
      */
     public function showCommandList($quit = true)
     {
-        $script = $this->input->getScriptName();
+        $script = $this->getScriptName();
         $controllerArr = $commandArr = [];
 
         // built in commands

src/Command.php

@@ -31,7 +31,7 @@ public function run($name = '')
     {
         $this->setName($name);
 
-        if ($this->input->getBool('h') || $this->input->getBool('help')) {
+        if ($this->input->boolOpt('h') || $this->input->boolOpt('help')) {
             return $this->showHelp();
         }
 

src/Controller.php

@@ -37,7 +37,7 @@ abstract class Controller extends AbstractCommand
      */
     public function run($action = '')
     {
-        $showCmdHelp = $action && ($this->input->getBool('h') || $this->input->getBool('help'));
+        $showCmdHelp = $action && ($this->input->boolOpt('h') || $this->input->boolOpt('help'));
 
         if ($showCmdHelp) {
             return $this->helpCommand($action);