Merge pull request #328 from bowphp/refactor/code-base

refactor: refonte console command runner strategy

Author: papac

src/Console/Argument.php

@@ -38,6 +38,13 @@ class Argument
      */
     private ?string $command = null;
 
+    /**
+     * The first param argument
+     *
+     * @var ?string
+     */
+    private ?string $raw_command = null;
+
     /**
      * The command first argument
      * php bow command:[action]
@@ -104,14 +111,26 @@ private function formatParameters(): void
      */
     private function initCommand(string $param): void
     {
-        if (!preg_match('/^[a-z-]+[a-z]+:[a-z-]+[a-z]+$/', $param)) {
+        $this->raw_command = $param;
+
+        if (!preg_match('/^[a-z-]+[a-z]+(:[a-z-]+[a-z]+){1,}$/', $param)) {
             $this->command = $param;
             $this->action = null;
         } else {
             [$this->command, $this->action] = explode(':', $param);
         }
     }
 
+    /**
+     * Get commands
+     *
+     * @return ?string
+     */
+    public function getRawCommand(): ?string
+    {
+        return $this->raw_command;
+    }
+
     /**
      * Retrieves a parameter
      *

src/Console/Command.php

@@ -38,44 +38,48 @@ class Command extends AbstractCommand
      *
      * @var array
      */
-    private array $command = [
+    private array $commands = [
         "clear" => ClearCommand::class,
         "migration" => MigrationCommand::class,
-        "seeder" => SeederCommand::class,
-        "add" => [
-            "controller" => ControllerCommand::class,
-            "configuration" => ConfigurationCommand::class,
-            "exception" => ExceptionCommand::class,
-            "middleware" => MiddlewareCommand::class,
-            "migration" => MigrationCommand::class,
-            "model" => ModelCommand::class,
-            "seeder" => SeederCommand::class,
-            "service" => ServiceCommand::class,
-            "validation" => ValidationCommand::class,
-            "event" => AppEventCommand::class,
-            "listener" => EventListenerCommand::class,
-            "producer" => ProducerCommand::class,
-            "command" => ConsoleCommand::class,
-            "message" => MessagingCommand::class,
-        ],
-        "generator" => [
-            "key" => GenerateKeyCommand::class,
-            "resource" => GenerateResourceControllerCommand::class,
-            "session-table" => GenerateSessionCommand::class,
-            "queue-table" => GenerateQueueCommand::class,
-            "cache-table" => GenerateCacheCommand::class,
-            "notification-table" => GenerateNotificationCommand::class,
-        ],
-        "runner" => [
-            "console" => ReplCommand::class,
-            "server" => ServerCommand::class,
-            "worker" => WorkerCommand::class,
-        ],
-        "flush" => [
-            "worker" => WorkerCommand::class,
-        ],
+        "migrate" => MigrationCommand::class,
+        "seed" => SeederCommand::class,
+        "serve" => ServerCommand::class,
+        "add:controller" => ControllerCommand::class,
+        "add:configuration" => ConfigurationCommand::class,
+        "add:exception" => ExceptionCommand::class,
+        "add:middleware" => MiddlewareCommand::class,
+        "add:migration" => MigrationCommand::class,
+        "add:model" => ModelCommand::class,
+        "add:seeder" => SeederCommand::class,
+        "add:service" => ServiceCommand::class,
+        "add:validation" => ValidationCommand::class,
+        "add:event" => AppEventCommand::class,
+        "add:listener" => EventListenerCommand::class,
+        "add:producer" => ProducerCommand::class,
+        "add:command" => ConsoleCommand::class,
+        "add:message" => MessagingCommand::class,
+        "run:console" => ReplCommand::class,
+        "run:server" => ServerCommand::class,
+        "run:worker" => WorkerCommand::class,
+        "flush:worker" => WorkerCommand::class,
+        "generate:key" => GenerateKeyCommand::class,
+        "generate:resource" => GenerateResourceControllerCommand::class,
+        "generate:session-table" => GenerateSessionCommand::class,
+        "generate:queue-table" => GenerateQueueCommand::class,
+        "generate:cache-table" => GenerateCacheCommand::class,
+        "generate:notification-table" => GenerateNotificationCommand::class,
     ];
 
+    /**
+     * Get the commands
+     *
+     * @return array
+     */
+    public function getCommands(): array
+    {
+        return $this->commands;
+    }
+
     /**
      * The call command
      *
@@ -87,24 +91,16 @@ class Command extends AbstractCommand
      */
     public function call(string $command, string $action, ...$rest): mixed
     {
-        $classes = $this->command[$command] ?? null;
+        $class = $this->commands[$command] ?? null;
 
-        if (is_null($classes)) {
+        if (is_null($class)) {
             $this->throwFailsCommand("The command $command not found !");
         }
 
-        if ($command == "add" || $command == "generator") {
-            $method = "generate";
-        } elseif ($command == "runner") {
+        if (!preg_match('/^(clear|migrate|migration):/', $command)) {
             $method = "run";
         } else {
-            $method = Str::camel($action);
-        }
-
-        if (is_array($classes)) {
-            $class = $classes[$action];
-        } else {
-            $class = $classes;
+            $method = $action;
         }
 
         $instance = new $class($this->setting, $this->arg);

src/Console/Command/AppEventCommand.php

@@ -16,7 +16,7 @@ class AppEventCommand extends AbstractCommand
      * @param  string $event
      * @return void
      */
-    public function generate(string $event): void
+    public function run(string $event): void
     {
         $generator = new Generator(
             $this->setting->getEventDirectory(),

src/Console/Command/ClearCommand.php

@@ -15,7 +15,7 @@ class ClearCommand extends AbstractCommand
      * @param  string $action
      * @return void
      */
-    public function make(string $action): void
+    public function run(string $action): void
     {
         if (!in_array($action, ['view', 'cache', 'session', 'log', 'all'])) {
             $this->throwFailsCommand('Clear target not valid', 'clear help');

src/Console/Command/ConfigurationCommand.php

@@ -17,7 +17,7 @@ class ConfigurationCommand extends AbstractCommand
      * @param  string $configuration
      * @return void
      */
-    public function generate(string $configuration): void
+    public function run(string $configuration): void
     {
         $generator = new Generator(
             $this->setting->getPackageDirectory(),

src/Console/Command/ConsoleCommand.php

@@ -16,7 +16,7 @@ class ConsoleCommand extends AbstractCommand
      * @param  string $service
      * @return void
      */
-    public function generate(string $service): void
+    public function run(string $service): void
     {
         $generator = new Generator(
             $this->setting->getCommandDirectory(),

src/Console/Command/ControllerCommand.php

@@ -16,7 +16,7 @@ class ControllerCommand extends AbstractCommand
      * @param  string $controller
      * @return void
      */
-    public function generate(string $controller): void
+    public function run(string $controller): void
     {
         $generator = new Generator(
             $this->setting->getControllerDirectory(),

src/Console/Command/EventListenerCommand.php

@@ -16,7 +16,7 @@ class EventListenerCommand extends AbstractCommand
      * @param  string $event
      * @return void
      */
-    public function generate(string $event): void
+    public function run(string $event): void
     {
         $generator = new Generator(
             $this->setting->getEventListenerDirectory(),

src/Console/Command/ExceptionCommand.php

@@ -16,7 +16,7 @@ class ExceptionCommand extends AbstractCommand
      * @param  string $exception
      * @return void
      */
-    public function generate(string $exception): void
+    public function run(string $exception): void
     {
         $generator = new Generator(
             $this->setting->getExceptionDirectory(),

src/Console/Command/GenerateCacheCommand.php

@@ -16,7 +16,7 @@ class GenerateCacheCommand extends AbstractCommand
      *
      * @return void
      */
-    public function generate(): void
+    public function run(): void
     {
         $create_at = date("YmdHis");
         $filename = sprintf("Version%s%sTable", $create_at, ucfirst(Str::camel('caches')));