update some logic for app. add more test for run command

Author: inhere

src/AbstractApplication.php

@@ -39,6 +39,7 @@
 
 /**
  * Class AbstractApplication
+ *
  * @package Inhere\Console
  */
 abstract class AbstractApplication implements ApplicationInterface
@@ -107,9 +108,11 @@ abstract class AbstractApplication implements ApplicationInterface
 
     /**
      * Class constructor.
+     *
      * @param array  $config
      * @param Input  $input
      * @param Output $output
+     *
      * @throws InvalidArgumentException
      */
     public function __construct(array $config = [], Input $input = null, Output $output = null)
@@ -181,7 +184,9 @@ protected function beforeRun(): void
 
     /**
      * run application
+     *
      * @param bool $exit
+     *
      * @return int|mixed
      * @throws InvalidArgumentException
      */
@@ -251,6 +256,7 @@ public function stop(int $code = 0)
      * @param string          $command
      * @param InputInterface  $input
      * @param OutputInterface $output
+     *
      * @return int|mixed
      */
     public function subRun(string $command, InputInterface $input, OutputInterface $output)
@@ -274,14 +280,13 @@ protected function runtimeCheck(): void
         // check env
         if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'cli-server'], true)) {
             header('HTTP/1.1 403 Forbidden');
-            exit("  403 Forbidden \n\n"
-                . " current environment is CLI. \n"
-                . " :( Sorry! Run this script is only allowed in the terminal environment!\n,You are not allowed to access this file.\n");
+            exit("  403 Forbidden \n\n" . " current environment is CLI. \n" . " :( Sorry! Run this script is only allowed in the terminal environment!\n,You are not allowed to access this file.\n");
         }
     }
 
     /**
      * register error handle
+     *
      * @throws InvalidArgumentException
      */
     protected function registerErrorHandle(): void
@@ -296,11 +301,13 @@ protected function registerErrorHandle(): void
     }
 
     /**
-     * 运行异常处理
+     * Running error handling
+     *
      * @param int    $num
      * @param string $str
      * @param string $file
      * @param int    $line
+     *
      * @throws InvalidArgumentException
      */
     public function handleError(int $num, string $str, string $file, int $line): void
@@ -311,18 +318,20 @@ public function handleError(int $num, string $str, string $file, int $line): voi
 
     /**
      * Running exception handling
+     *
      * @param Throwable $e
+     *
      * @throws InvalidArgumentException
      */
     public function handleException($e): void
     {
         // you can log error on sub class ...
-
         $this->errorHandler->handle($e, $this);
     }
 
     /**
      * @param string $command
+     *
      * @return bool True will stop run, False will goon run give command.
      */
     protected function filterSpecialCommand(string $command): bool
@@ -365,6 +374,7 @@ protected function filterSpecialCommand(string $command): bool
     /**
      * @param string       $name
      * @param string|array $aliases
+     *
      * @return $this
      */
     public function addAliases(string $name, $aliases): self
@@ -449,6 +459,7 @@ public function getInternalCommands(): array
 
     /**
      * @param $name
+     *
      * @return bool
      */
     public function isInternalCommand(string $name): bool
@@ -500,8 +511,10 @@ public function getConfig(): array
 
     /**
      * Get config param value
+     *
      * @param null|string $name
      * @param null|string $default
+     *
      * @return array|string
      */
     public function getParam(string $name, $default = null)
@@ -519,6 +532,7 @@ public function isStrictMode(): bool
 
     /**
      * get current debug level value
+     *
      * @return int
      */
     public function getVerbLevel(): int
@@ -528,6 +542,7 @@ public function getVerbLevel(): int
 
     /**
      * is profile
+     *
      * @return boolean
      */
     public function isProfile(): bool

src/Application.php

@@ -25,6 +25,7 @@
 
 /**
  * Class App
+ *
  * @package Inhere\Console
  */
 class Application extends AbstractApplication
@@ -50,7 +51,8 @@ public function controller(string $name, $class = null, $option = null)
     }
 
     /**
-     * add group/controller
+     * Add group/controller
+     *
      * @inheritdoc
      * @see controller()
      */
@@ -61,8 +63,8 @@ public function addGroup(string $name, $controller = null, $option = null)
 
     /**
      * {@inheritdoc}
-     * @see controller()
      * @throws InvalidArgumentException
+     * @see controller()
      */
     public function addController(string $name, $class = null, $option = null)
     {
@@ -71,6 +73,7 @@ public function addController(string $name, $class = null, $option = null)
 
     /**
      * @param array $controllers
+     *
      * @throws InvalidArgumentException
      */
     public function controllers(array $controllers): void
@@ -80,6 +83,7 @@ public function controllers(array $controllers): void
 
     /**
      * @param array $controllers
+     *
      * @throws InvalidArgumentException
      * @deprecated please use addControllers() instead it.
      */
@@ -90,6 +94,7 @@ public function setControllers(array $controllers): void
 
     /**
      * @param array $controllers
+     *
      * @throws InvalidArgumentException
      */
     public function addControllers(array $controllers): void
@@ -115,6 +120,7 @@ public function command(string $name, $handler = null, $option = null)
 
     /**
      * add command
+     *
      * @inheritdoc
      * @see command()
      */
@@ -125,6 +131,7 @@ public function addCommand(string $name, $handler = null, $option = null): self
 
     /**
      * @param array $commands
+     *
      * @throws InvalidArgumentException
      */
     public function addCommands(array $commands): void
@@ -134,6 +141,7 @@ public function addCommands(array $commands): void
 
     /**
      * @param array $commands
+     *
      * @throws InvalidArgumentException
      */
     public function commands(array $commands): void
@@ -150,6 +158,7 @@ public function commands(array $commands): void
      *
      * @param string $namespace
      * @param string $basePath
+     *
      * @return $this
      * @throws InvalidArgumentException
      */
@@ -168,8 +177,10 @@ public function registerCommands(string $namespace, string $basePath): self
 
     /**
      * auto register controllers from a dir.
+     *
      * @param string $namespace
      * @param string $basePath
+     *
      * @return $this
      * @throws InvalidArgumentException
      */
@@ -241,6 +252,9 @@ public function dispatch(string $name, bool $standAlone = false)
             return 2;
         }
 
+        // save command ID
+        $this->input->setCommandId($info['cmdId']);
+
         // is command
         if ($info['type'] === Router::TYPE_SINGLE) {
             return $this->runCommand($info['name'], $info['handler'], $info['options']);
@@ -252,9 +266,11 @@ public function dispatch(string $name, bool $standAlone = false)
 
     /**
      * run a independent command
-     * @param string          $name Command name
+     *
+     * @param string         $name    Command name
      * @param Closure|string $handler Command class
-     * @param array           $options
+     * @param array          $options
+     *
      * @return mixed
      * @throws InvalidArgumentException
      */
@@ -290,11 +306,13 @@ protected function runCommand(string $name, $handler, array $options)
 
     /**
      * Execute an action in a group command(controller)
-     * @param string $group The group name
-     * @param string $action Command method, no suffix
+     *
+     * @param string $group   The group name
+     * @param string $action  Command method, no suffix
      * @param mixed  $handler The controller class or object
      * @param array  $options
      * @param bool   $standAlone
+     *
      * @return mixed
      * @throws ReflectionException
      */
@@ -312,11 +330,8 @@ protected function runAction(string $group, string $action, $handler, array $opt
         }
 
         if (!($handler instanceof Controller)) {
-            Helper::throwInvalidArgument(
-                'The console controller class [%s] must instanceof the %s',
-                $handler,
-                Controller::class
-            );
+            Helper::throwInvalidArgument('The console controller class [%s] must instanceof the %s', $handler,
+                Controller::class);
         }
 
         $handler::setName($group);

src/Contract/RouterInterface.php

@@ -26,12 +26,13 @@ interface RouterInterface
 
     /**
      * Register a app group command(by controller)
-     * @param string                     $name The controller name
-     * @param string|ControllerInterface $class The controller class
-     * @param array                      $options
-     * array:
-     *  - aliases     The command aliases
-     *  - description The description message
+     *
+     * @param string                     $name    The controller name
+     * @param string|ControllerInterface $class   The controller class
+     * @param array                      $options array:
+     *                                            - aliases     The command aliases
+     *                                            - description The description message
+     *
      * @return static
      * @throws InvalidArgumentException
      */
@@ -43,7 +44,7 @@ public function addGroup(string $name, $class = null, array $options = []): self
      * @param string|CommandInterface         $name
      * @param string|Closure|CommandInterface $handler
      * @param array                           $options
-     * array:
+     *  array:
      *  - aliases     The command aliases
      *  - description The description message
      *
@@ -54,6 +55,7 @@ public function addCommand(string $name, $handler = null, array $options = []):
 
     /**
      * @param string $name The input command name
+     *
      * @return array return route info array. If not found, will return empty array.
      * [
      *  type    => 1, // 1 group 2 command