update ...

Author: inhere

examples/TestCommand.php

@@ -18,7 +18,7 @@ class TestCommand extends Command
 {
     /**
      * test text
-     * @usage {$name} test message
+     * @usage {name} test message
      */
     public function execute($input, $output)
     {

src/AbstractApp.php

@@ -510,10 +510,10 @@ public function config($name, $default = null)
      * set config
      * @param array $config
      */
-    public function setConfig(array $config)
+    public function setConfig($config)
     {
         if ($config) {
-            $this->config = array_merge($this->config, $config);
+            $this->config = array_merge($this->config, (array)$config);
         }
     }
 
@@ -532,6 +532,6 @@ public function getConfig()
      */
     public function isDebug(): bool
     {
-        return (bool) $this->config['debug'];
+        return (bool) $this->config('debug');
     }
 }

src/AbstractCommand.php

@@ -99,16 +99,40 @@ public function validate()
             return true;
         }
 
-        $givenArgs = $this->input->getArgs();
+        $givenArgs = $errArgs = [];
 
-        $missingArgs = array_filter(array_keys($definition->getArguments()), function ($name) use ($definition, $givenArgs) {
+        foreach ($this->input->getArgs() as $key => $value) {
+            if (is_int($key)) {
+                $givenArgs[$key] = $value;
+            } else {
+                $errArgs[] = $key;
+            }
+        }
+
+        if (count($errArgs) > 0) {
+            throw new \RuntimeException(sprintf('Unknown arguments (error: "%s").', implode(', ', $errArgs)));
+        }
+
+        $defArgs = $definition->getArguments();
+
+        $missingArgs = array_filter(array_keys($defArgs), function ($name) use ($definition, $givenArgs) {
             return !array_key_exists($name, $givenArgs) && $definition->argumentIsRequired($name);
         });
 
         if (count($missingArgs) > 0) {
             throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArgs)));
         }
 
+        $index = 0;
+        $args = [];
+
+        foreach ($defArgs as $name => $conf) {
+            $args[$name] = $givenArgs[$index];
+            $index++;
+        }
+
+        $this->input->setArgs($args);
+
         return true;
     }
 

src/App.php

@@ -14,6 +14,26 @@
  */
 class App extends AbstractApp
 {
+    /**
+     * addCommand
+     * @param string  $name
+     * @param mixed   $controller
+     */
+    public function addCommand(string $name, $handler = null)
+    {
+        return $this->command($name, $handler);
+    }
+
+    /**
+     * addGroup
+     * @param string      $name
+     * @param string|null $controller
+     */
+    public function addGroup(string $name, string $controller = null)
+    {
+        return $this->controller($name, $controller);
+    }
+
     /**********************************************************
      * dispatch and run console controller/command
      **********************************************************/

src/io/Input.php

@@ -433,10 +433,11 @@ public function getArgs(): array
 
     /**
      * @param array $args
+     * @param bool $replace
      */
-    public function setArgs(array $args)
+    public function setArgs(array $args, $replace = false)
     {
-        $this->args = $args;
+        $this->args = $replace ? $args : array_merge($this->args, $args);
     }
 
     /**
@@ -457,10 +458,11 @@ public function getSOpts(): array
 
     /**
      * @param array $sOpts
+     * @param bool $replace
      */
-    public function setSOpts(array $sOpts)
+    public function setSOpts(array $sOpts, $replace = false)
     {
-        $this->sOpts = $sOpts;
+        $this->sOpts = $replace ? $sOpts : array_merge($this->sOpts, $sOpts);
     }
 
     /**
@@ -481,10 +483,11 @@ public function getLOpts(): array
 
     /**
      * @param array $lOpts
+     * @param bool $replace
      */
-    public function setLOpts(array $lOpts)
+    public function setLOpts(array $lOpts, $replace = false)
     {
-        $this->lOpts = $lOpts;
+        $this->lOpts = $replace ? $lOpts : array_merge($this->lOpts, $lOpts);
     }
 
     /**