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

papac · web-flow · commit 9407f77c8b35 · 2025-04-21T09:08:01.000Z
refactor: reorder command
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "yaml.schemas": {
+    "file:///c%3A/Users/dakia/.vscode/extensions/atlassian.atlascode-3.0.2/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml",
+    "https://www.artillery.io/schema.json": []
+  }
+}
diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -13,23 +13,23 @@
 use Bow\Console\Command\AppEventCommand;
 use Bow\Console\Command\MigrationCommand;
 use Bow\Console\Command\ValidationCommand;
-use Bow\Console\Command\GenerateKeyCommand;
-use Bow\Console\Command\GenerateCacheCommand;
-use Bow\Console\Command\GenerateModelCommand;
-use Bow\Console\Command\GenerateQueueCommand;
-use Bow\Console\Command\GenerateSeederCommand;
-use Bow\Console\Command\GenerateConsoleCommand;
-use Bow\Console\Command\GenerateServiceCommand;
-use Bow\Console\Command\GenerateSessionCommand;
-use Bow\Console\Command\GenerateProducerCommand;
-use Bow\Console\Command\GenerateExceptionCommand;
-use Bow\Console\Command\GenerateMessagingCommand;
-use Bow\Console\Command\GenerateControllerCommand;
-use Bow\Console\Command\GenerateMiddlewareCommand;
-use Bow\Console\Command\GenerateNotificationCommand;
-use Bow\Console\Command\GenerateConfigurationCommand;
-use Bow\Console\Command\GenerateEventListenerCommand;
-use Bow\Console\Command\GenerateResourceControllerCommand;
+use Bow\Console\Command\Generator\GenerateKeyCommand;
+use Bow\Console\Command\Generator\GenerateCacheCommand;
+use Bow\Console\Command\Generator\GenerateModelCommand;
+use Bow\Console\Command\Generator\GenerateQueueCommand;
+use Bow\Console\Command\Generator\GenerateSeederCommand;
+use Bow\Console\Command\Generator\GenerateConsoleCommand;
+use Bow\Console\Command\Generator\GenerateServiceCommand;
+use Bow\Console\Command\Generator\GenerateSessionCommand;
+use Bow\Console\Command\Generator\GenerateProducerCommand;
+use Bow\Console\Command\Generator\GenerateExceptionCommand;
+use Bow\Console\Command\Generator\GenerateMessagingCommand;
+use Bow\Console\Command\Generator\GenerateControllerCommand;
+use Bow\Console\Command\Generator\GenerateMiddlewareCommand;
+use Bow\Console\Command\Generator\GenerateNotificationCommand;
+use Bow\Console\Command\Generator\GenerateConfigurationCommand;
+use Bow\Console\Command\Generator\GenerateEventListenerCommand;
+use Bow\Console\Command\Generator\GenerateRouterResourceCommand;
 
 class Command extends AbstractCommand
 {
@@ -66,7 +66,7 @@ class Command extends AbstractCommand
         "run:worker" => WorkerCommand::class,
         "flush:worker" => WorkerCommand::class,
         "generate:key" => GenerateKeyCommand::class,
-        "generate:resource" => GenerateResourceControllerCommand::class,
+        "generate:resource" => GenerateRouterResourceCommand::class,
         "generate:session-table" => GenerateSessionCommand::class,
         "generate:queue-table" => GenerateQueueCommand::class,
         "generate:cache-table" => GenerateCacheCommand::class,
@@ -100,7 +100,7 @@ public function call(string $command, string $action, ...$rest): mixed
             $this->throwFailsCommand("The command $command not found !");
         }
 
-        if (!preg_match('/^(migrate|migration)/', $command)) {
+        if (!preg_match('/^(migration)/', $command)) {
             $method = "run";
         } else {
             $method = $action;
diff --git a/src/Console/Command/Generator/GenerateCacheCommand.php b/src/Console/Command/Generator/GenerateCacheCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateConfigurationCommand.php b/src/Console/Command/Generator/GenerateConfigurationCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateConsoleCommand.php b/src/Console/Command/Generator/GenerateConsoleCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateControllerCommand.php b/src/Console/Command/Generator/GenerateControllerCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateEventListenerCommand.php b/src/Console/Command/Generator/GenerateEventListenerCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateExceptionCommand.php b/src/Console/Command/Generator/GenerateExceptionCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateKeyCommand.php b/src/Console/Command/Generator/GenerateKeyCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateMessagingCommand.php b/src/Console/Command/Generator/GenerateMessagingCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateMiddlewareCommand.php b/src/Console/Command/Generator/GenerateMiddlewareCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateMigrationCommand.php b/src/Console/Command/Generator/GenerateMigrationCommand.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bow\Console\Command\Generator;
+
+use Bow\Console\AbstractCommand;
+use Bow\Console\Color;
+use Bow\Console\Generator;
+use Bow\Support\Str;
+
+class GenerateMigrationCommand extends AbstractCommand
+{
+    /**
+     * Create a migration command
+     *
+     * @param string $model
+     *
+     * @return void
+     * @throws ErrorException
+     */
+    public function run(string $model): void
+    {
+        $create_at = date("YmdHis");
+        $filename = sprintf("Version%s%s", $create_at, ucfirst(Str::camel($model)));
+
+        $generator = new Generator(
+            $this->setting->getMigrationDirectory(),
+            $filename
+        );
+
+        $parameters = $this->arg->getParameters();
+
+        if ($parameters->has('--create') && $parameters->has('--table')) {
+            $this->throwFailsCommand('bad command', 'add help');
+        }
+
+        $type = "model/standard";
+
+        if ($parameters->has('--table')) {
+            if ($parameters->get('--table') === true) {
+                $this->throwFailsCommand('bad command option [--table=table]', 'add help');
+            }
+
+            $table = $parameters->get('--table');
+
+            $type = 'model/table';
+        } elseif ($parameters->has('--create')) {
+            if ($parameters->get('--create') === true) {
+                $this->throwFailsCommand('bad command option [--create=table]', 'add help');
+            }
+
+            $table = $parameters->get('--create');
+
+            $type = 'model/create';
+        }
+
+        $generator->write($type, [
+            'table' => $table ?? 'table_name',
+            'className' => $filename
+        ]);
+
+        // Print console information
+        echo Color::green('The migration file has been successfully created') . "\n";
+    }
+}
diff --git a/src/Console/Command/Generator/GenerateModelCommand.php b/src/Console/Command/Generator/GenerateModelCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateNotificationCommand.php b/src/Console/Command/Generator/GenerateNotificationCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateProducerCommand.php b/src/Console/Command/Generator/GenerateProducerCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateQueueCommand.php b/src/Console/Command/Generator/GenerateQueueCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/Generator/GenerateRouterResourceCommand.php b/src/Console/Command/Generator/GenerateRouterResourceCommand.php
@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
 use Bow\Console\Generator;
 use Bow\Support\Str;
-use JetBrains\PhpStorm\NoReturn;
 
-class GenerateResourceControllerCommand extends AbstractCommand
+class GenerateRouterResourceCommand extends AbstractCommand
 {
     /**
      * Command used to set up the resource system.
diff --git a/src/Console/Command/Generator/GenerateSeederCommand.php b/src/Console/Command/Generator/GenerateSeederCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateServiceCommand.php b/src/Console/Command/Generator/GenerateServiceCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Generator;
diff --git a/src/Console/Command/Generator/GenerateSessionCommand.php b/src/Console/Command/Generator/GenerateSessionCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bow\Console\Command;
+namespace Bow\Console\Command\Generator;
 
 use Bow\Console\AbstractCommand;
 use Bow\Console\Color;
diff --git a/src/Console/Command/MigrationCommand.php b/src/Console/Command/MigrationCommand.php
@@ -75,59 +75,6 @@ private function factory(string $type): void
         $this->$action($migrations);
     }
 
-    /**
-     * Create a migration command
-     *
-     * @param string $model
-     *
-     * @return void
-     * @throws ErrorException
-     */
-    public function run(string $model): void
-    {
-        $create_at = date("YmdHis");
-        $filename = sprintf("Version%s%s", $create_at, ucfirst(Str::camel($model)));
-
-        $generator = new Generator(
-            $this->setting->getMigrationDirectory(),
-            $filename
-        );
-
-        $parameters = $this->arg->getParameters();
-
-        if ($parameters->has('--create') && $parameters->has('--table')) {
-            $this->throwFailsCommand('bad command', 'add help');
-        }
-
-        $type = "model/standard";
-
-        if ($parameters->has('--table')) {
-            if ($parameters->get('--table') === true) {
-                $this->throwFailsCommand('bad command option [--table=table]', 'add help');
-            }
-
-            $table = $parameters->get('--table');
-
-            $type = 'model/table';
-        } elseif ($parameters->has('--create')) {
-            if ($parameters->get('--create') === true) {
-                $this->throwFailsCommand('bad command option [--create=table]', 'add help');
-            }
-
-            $table = $parameters->get('--create');
-
-            $type = 'model/create';
-        }
-
-        $generator->write($type, [
-            'table' => $table ?? 'table_name',
-            'className' => $filename
-        ]);
-
-        // Print console information
-        echo Color::green('The migration file has been successfully created') . "\n";
-    }
-
     /**
      * Create the migration status table
      *
diff --git a/src/Console/Generator.php b/src/Console/Generator.php
@@ -116,13 +116,10 @@ public function write(string $type, array $data = []): bool
         // Create the stub parsed content
         $template = $this->makeStubContent(
             $type,
-            array_merge(
-                [
+            array_merge([
                 'namespace' => $namespace,
                 'className' => $classname
-                ],
-                $data
-            )
+            ], $data)
         );
 
         return (bool)file_put_contents($this->getPath(), $template);
