refactoring match and dispatch logic

Author: inhere

examples/alone

@@ -19,7 +19,7 @@ try {
 } catch (\Exception $e) {
     $message = \Toolkit\Cli\Color::apply('error', $e->getMessage());
 
-    echo sprintf("%s\nFile %s:%d\nTrace:\n%s\n",
+    echo \sprintf("%s\nFile %s:%d\nTrace:\n%s\n",
         $message, $e->getFile(), $e->getLine(), $e->getTraceAsString()
     );
 }

examples/alone-app

@@ -5,6 +5,7 @@
  */
 
 use Inhere\Console\Examples\Controller\HomeController;
+use Toolkit\Cli\Color;
 
 define('BASE_PATH', dirname(__DIR__));
 
@@ -18,11 +19,13 @@ try {
     ], $input);
 
     $app->controller('home', HomeController::class);
-    $code = $app->runAction('home', $input->getCommand(), false, true);
 
-    exit((int)$code);
+    $subCmd = $input->getCommand();
+    $result = $app->dispatch('home:' . $subCmd, true);
+
+    exit((int)$result);
 } catch (\Exception $e) {
-    $message = \Toolkit\Cli\Color::apply('error', $e->getMessage());
+    $message = Color::apply('error', $e->getMessage());
 
     echo sprintf("%s\nFile %s:%d\nTrace:\n%s\n",
         $message, $e->getFile(), $e->getLine(), $e->getTraceAsString()

examples/commands.php

@@ -46,4 +46,4 @@
 $app->controller(\Inhere\Console\Examples\Controller\InteractController::class);
 
 // add alias for a group command.
-$app->addCommandAliases('home:test', 'h-test');
+$app->addAliases('home:test', 'h-test');

src/AbstractApplication.php

@@ -87,21 +87,6 @@ abstract class AbstractApplication implements ApplicationInterface
      */
     private $errorHandler;
 
-    /**
-     * @var array Some metadata for command
-     * - description
-     */
-    private $commandsMeta = [];
-
-    /** @var array Save command aliases */
-    private $commandAliases = [];
-
-    /** @var array The independent commands */
-    protected $commands = [];
-
-    /** @var array The group commands(controller) */
-    protected $controllers = [];
-
     /**
      * Class constructor.
      * @param array  $config
@@ -219,13 +204,6 @@ public function run(bool $exit = true)
         return $result;
     }
 
-    /**
-     * dispatch command
-     * @param string $command A command name
-     * @return int|mixed
-     */
-    abstract protected function dispatch(string $command);
-
     protected function afterRun(): void
     {
     }
@@ -366,62 +344,20 @@ protected function filterSpecialCommand(string $command): bool
         return true;
     }
 
-    /**
-     * @param      $name
-     * @param bool $isGroup
-     * @throws \InvalidArgumentException
-     */
-    protected function validateName(string $name, bool $isGroup = false): void
-    {
-        $pattern = $isGroup ? '/^[a-z][\w-]+$/' : '/^[a-z][\w-]*:?([a-z][\w-]+)?$/';
-
-        if (1 !== \preg_match($pattern, $name)) {
-            throw new \InvalidArgumentException("The command name '$name' is must match: $pattern");
-        }
-
-        if ($this->isInternalCommand($name)) {
-            throw new \InvalidArgumentException("The command name '$name' is not allowed. It is a built in command.");
-        }
-    }
-
     /**
      * @param string       $name
      * @param string|array $aliases
      * @return $this
      */
-    public function addCommandAliases(string $name, $aliases): self
+    public function addAliases(string $name, $aliases): self
     {
-        if (!$name || !$aliases) {
-            return $this;
-        }
-
-        foreach ((array)$aliases as $alias) {
-            if ($alias = trim($alias)) {
-                $this->commandAliases[$alias] = $name;
-            }
+        if ($name && $aliases) {
+            $this->router->setAlias($name, $aliases);
         }
 
         return $this;
     }
 
-    /**
-     * @param string $name
-     * @return string
-     */
-    protected function getRealCommandName(string $name): string
-    {
-        return $this->commandAliases[$name] ?? $name;
-    }
-
-    /**
-     * @param string $name
-     * @return mixed|null
-     */
-    public function findCommand(string $name)
-    {
-        return $this->commands[$name] ?? $this->controllers[$name] ?? null;
-    }
-
     /**
      * @param int    $level
      * @param string $format
@@ -440,86 +376,6 @@ public function logf(int $level, string $format, ...$args): void
      * getter/setter methods
      **********************************************************/
 
-    /**
-     * @return array
-     */
-    public function getControllerNames(): array
-    {
-        return \array_keys($this->controllers);
-    }
-
-    /**
-     * @return array
-     */
-    public function getCommandNames(): array
-    {
-        return \array_keys($this->commands);
-    }
-
-    /**
-     * @param array $controllers
-     * @throws \InvalidArgumentException
-     */
-    public function setControllers(array $controllers): void
-    {
-        foreach ($controllers as $name => $controller) {
-            if (\is_int($name)) {
-                $this->controller($controller);
-            } else {
-                $this->controller($name, $controller);
-            }
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getControllers(): array
-    {
-        return $this->controllers;
-    }
-
-    /**
-     * @param $name
-     * @return bool
-     */
-    public function isController(string $name): bool
-    {
-        return isset($this->controllers[$name]);
-    }
-
-    /**
-     * @param array $commands
-     * @throws \InvalidArgumentException
-     */
-    public function setCommands(array $commands): void
-    {
-        foreach ($commands as $name => $handler) {
-            if (\is_int($name)) {
-                $this->command($handler);
-            } else {
-                $this->command($name, $handler);
-            }
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getCommands(): array
-    {
-        return $this->commands;
-    }
-
-    /**
-     * @param $name
-     * @return bool
-     */
-    public function isCommand(string $name): bool
-    {
-        return isset($this->commands[$name]);
-    }
-
     /**
      * @return string|null
      */
@@ -653,80 +509,6 @@ public function isProfile(): bool
         return (bool)$this->input->getOpt('profile', $this->getParam('profile'));
     }
 
-    /**
-     * @param null|string $name
-     * @return array
-     */
-    public function getCommandAliases(string $name = null): array
-    {
-        if (!$name) {
-            return $this->commandAliases;
-        }
-
-        return \array_keys($this->commandAliases, $name, true);
-    }
-
-    /**
-     * @param array $commandAliases
-     */
-    public function setCommandAliases(array $commandAliases): void
-    {
-        $this->commandAliases = $commandAliases;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCommandsMeta(): array
-    {
-        return $this->commandsMeta;
-    }
-
-    /**
-     * @param string $command
-     * @param array  $meta
-     */
-    public function setCommandMeta(string $command, array $meta): void
-    {
-        if (isset($this->commandsMeta[$command])) {
-            $this->commandsMeta[$command] = \array_merge($this->commandsMeta[$command], $meta);
-        } else {
-            $this->commandsMeta[$command] = $meta;
-        }
-    }
-
-    /**
-     * @param string $command
-     * @return array
-     */
-    public function getCommandMeta(string $command): array
-    {
-        return $this->commandsMeta[$command] ?? [];
-    }
-
-    /**
-     * @param string $command
-     * @param string $key
-     * @param        $value
-     */
-    public function setCommandMetaValue(string $command, string $key, $value): void
-    {
-        if ($value !== null) {
-            $this->commandsMeta[$command][$key] = $value;
-        }
-    }
-
-    /**
-     * @param string $command
-     * @param string $key
-     * @param mixed  $default
-     * @return mixed
-     */
-    public function getCommandMetaValue(string $command, string $key, $default = null)
-    {
-        return $this->commandsMeta[$command][$key] ?? $default;
-    }
-
     /**
      * @return ErrorHandlerInterface
      */