Merge pull request #591 from wayofdev/feat/updates

Author: lotyp

.env.example

@@ -2,6 +2,7 @@
 # With custom namespace provided, it will be used to prefix all services
 # in Docker network for current project
 COMPOSE_PROJECT_NAME=laravel-cycle-orm-adapter
+APP_ENV=production
 
 DB_CONNECTION=pgsql
 DB_HOST=pgsql

src/Bridge/Laravel/Console/Commands/Migrations/AbstractCommand.php

@@ -40,7 +40,7 @@ protected function verifyEnvironment(?string $confirmationQuestion = null): bool
     {
         $confirmationQuestion = $confirmationQuestion ?? self::DEFAULT_CONFIRMATION;
 
-        if ($this->option('force') || $this->config->isSafe()) {
+        if ($this->isForced() || $this->config->isSafe()) {
             return true;
         }
 
@@ -69,11 +69,31 @@ protected function defineOptions(): array
         return array_merge(
             static::OPTIONS,
             [
-                ['force', 's', InputOption::VALUE_NONE, 'Skip safe environment check'],
+                ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
+                ['no-interaction', 'n', InputOption::VALUE_NONE, 'Do not ask any interactive question'],
             ]
         );
     }
 
+    /**
+     * Check if the operation is being forced.
+     */
+    protected function isForced(): bool
+    {
+        return $this->option('force');
+    }
+
+    /**
+     * Check if the command is running in interactive mode.
+     */
+    protected function isInteractive(): bool
+    {
+        return ! $this->option('no-interaction');
+    }
+
+    /**
+     * Configure the command options.
+     */
     protected function configure(): void
     {
         foreach ($this->defineOptions() as $option) {

src/Bridge/Laravel/Console/Commands/Migrations/InitCommand.php

@@ -13,7 +13,7 @@ final class InitCommand extends AbstractCommand
 {
     protected $signature = 'cycle:migrate:init';
 
-    protected $description = 'Create the cycle orm migrations table';
+    protected $description = 'Create the cycle orm migrations table if it does not exist.';
 
     public function handle(): int
     {

src/Bridge/Laravel/Console/Commands/Migrations/MigrateCommand.php

@@ -17,7 +17,7 @@ final class MigrateCommand extends AbstractCommand
                            {--o|one : Execute only one (first) migration. }
                            {--seed : Indicates if the seed task should be re-run }';
 
-    protected $description = 'Perform one or all outstanding migrations';
+    protected $description = 'Execute one or multiple migrations.';
 
     public function handle(): int
     {
@@ -49,7 +49,7 @@ public function handle(): int
         }
 
         if ($this->option('seed')) {
-            $this->call('db:seed', ['--force' => $this->option('force')]);
+            $this->call('db:seed', ['--force' => $this->isForced()]);
         }
 
         return self::SUCCESS;

src/Bridge/Laravel/Console/Commands/Migrations/ReplayCommand.php

@@ -22,16 +22,16 @@ public function handle(): int
             return self::FAILURE;
         }
 
-        $rollback = ['--force' => $this->option('force')];
-        $migrate = ['--force' => $this->option('force')];
+        $rollback = ['--force' => $this->isForced()];
+        $migrate = ['--force' => $this->isForced()];
 
         if ($this->option('all')) {
             $rollback['--all'] = true;
         } else {
             $migrate['--one'] = true;
         }
 
-        $this->info('Rolling back executed migration(s)...');
+        $this->warn('Rolling back executed migration(s)...');
         $this->call(RollbackCommand::class, $rollback);
 
         $this->info('');

src/Bridge/Laravel/Console/Commands/ORM/Generators/ShowChanges.php

@@ -7,11 +7,15 @@
 use Cycle\Migrations\State;
 use Cycle\Schema\Compiler as CycleSchemaCompiler;
 use Cycle\Schema\Generator\Migrations\GenerateMigrations;
+use Cycle\Schema\Generator\Migrations\Strategy\GeneratorStrategyInterface;
+use Cycle\Schema\Generator\Migrations\Strategy\MultipleFilesStrategy;
+use Cycle\Schema\Generator\PrintChanges;
 use Cycle\Schema\Registry;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\Console\Command\Command;
 use WayOfDev\Cycle\Bridge\Laravel\Console\Commands\Migrations\AbstractCommand;
 use WayOfDev\Cycle\Bridge\Laravel\Console\Commands\Migrations\MigrateCommand as DatabaseMigrateCommand;
-use WayOfDev\Cycle\Bridge\Laravel\Console\Commands\ORM\Generators\ShowChanges;
 use WayOfDev\Cycle\Contracts\CacheManager as CacheManagerContract;
 use WayOfDev\Cycle\Contracts\GeneratorLoader;
 use WayOfDev\Cycle\Schema\Compiler;
@@ -24,14 +28,18 @@
 final class MigrateCommand extends AbstractCommand
 {
     protected $signature = 'cycle:orm:migrate
-                           {--r|run : Automatically run generated migration }';
+                           {--r|run : Automatically run generated migration }
+                           {--s|split : Split generated migration into multiple files }';
 
     protected $description = 'Generate ORM schema migrations.';
 
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
     public function handle(
         GeneratorLoader $generators,
         Registry $registry,
-        GenerateMigrations $migrations,
         CacheManagerContract $cache
     ): int {
         if (! $this->migrator->isConfigured()) {
@@ -40,19 +48,32 @@ public function handle(
 
         foreach ($this->migrator->getMigrations() as $migration) {
             if ($migration->getState()->getStatus() !== State::STATUS_EXECUTED) {
-                $this->warn('Outstanding migrations found, run `cycle:orm:migrate` first!');
+                if ($this->isInteractive() && $this->output->confirm('Outstanding migrations found. Do you want to run `cycle:migrate` now?')) {
+                    $this->call(DatabaseMigrateCommand::class, ['--force' => true]);
+                } else {
+                    $this->warn('Outstanding migrations found, run `cycle:migrate` first.');
 
-                return self::FAILURE;
+                    return self::FAILURE;
+                }
             }
         }
 
-        $diff = new ShowChanges($this->output);
+        $this->comment('Detecting schema changes...');
+
+        $diff = new PrintChanges($this->output);
         $queue = $generators->add(GeneratorLoader::GROUP_RENDER, $diff);
 
         $schemaCompiler = Compiler::compile($registry, $queue);
         $schemaCompiler->toMemory($cache);
 
         if ($diff->hasChanges()) {
+            if ($this->option('split')) {
+                $this->info('Splitting generated migration into multiple files.');
+                $this->laravel->singleton(GeneratorStrategyInterface::class, MultipleFilesStrategy::class);
+            }
+
+            $migrations = $this->laravel->get(GenerateMigrations::class);
+
             // Creates migration files in database/migrations directory.
             (new CycleSchemaCompiler())->compile($registry, [$migrations]);
 

src/Bridge/Laravel/Console/Commands/ORM/MigrateCommand.php

@@ -4,10 +4,10 @@
 
 namespace WayOfDev\Cycle\Bridge\Laravel\Console\Commands\ORM;
 
+use Cycle\Schema\Generator\PrintChanges;
 use Cycle\Schema\Generator\SyncTables;
 use Cycle\Schema\Registry;
-use Illuminate\Console\Command;
-use WayOfDev\Cycle\Bridge\Laravel\Console\Commands\ORM\Generators\ShowChanges;
+use WayOfDev\Cycle\Bridge\Laravel\Console\Commands\Migrations\AbstractCommand;
 use WayOfDev\Cycle\Contracts\CacheManager as CacheManagerContract;
 use WayOfDev\Cycle\Contracts\GeneratorLoader;
 use WayOfDev\Cycle\Schema\Compiler;
@@ -17,7 +17,7 @@
  *
  * @see https://github.com/spiral/cycle-bridge/blob/master/src/Console/Command/CycleOrm/SyncCommand.php
  */
-final class SyncCommand extends Command
+final class SyncCommand extends AbstractCommand
 {
     protected $signature = 'cycle:orm:sync';
 
@@ -28,7 +28,11 @@ public function handle(
         Registry $registry,
         CacheManagerContract $cache
     ): int {
-        $diff = new ShowChanges($this->output);
+        if (! $this->verifyEnvironment('This operation is not recommended for production environment.')) {
+            return self::FAILURE;
+        }
+
+        $diff = new PrintChanges($this->output);
         $queue = $generators
             ->add(GeneratorLoader::GROUP_RENDER, $diff)
             ->add(GeneratorLoader::GROUP_POSTPROCESS, new SyncTables());
@@ -37,7 +41,7 @@ public function handle(
         $schemaCompiler->toMemory($cache);
 
         if ($diff->hasChanges()) {
-            $this->info('ORM Schema has been synchronized!');
+            $this->info('ORM Schema has been synchronized with database.');
         }
 
         return self::SUCCESS;

src/Bridge/Laravel/Console/Commands/ORM/SyncCommand.php

@@ -30,7 +30,7 @@ public function handle(
 
         Compiler::compile($registry, $generators)->toMemory($cache);
 
-        $this->info('Done');
+        $this->info('Schema has been updated.');
 
         return self::SUCCESS;
     }