refactor: bindings and tests

Author: lotyp

composer.json

@@ -21,10 +21,11 @@
         "cycle/database": "^2.4",
         "cycle/migrations": "^4.0",
         "cycle/orm": "^2.3",
-        "laravel/framework": "*",
-        "symfony/console": "^6.2",
         "cycle/schema-migrations-generator": "^2.1",
-        "cycle/schema-renderer": "^1.2"
+        "cycle/schema-renderer": "^1.2",
+        "laravel/framework": "*",
+        "spiral/attributes": "^3.1",
+        "symfony/console": "^6.2"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.30",

composer.lock

@@ -167,38 +167,38 @@
          * null (default) - Will be used schema generators defined in bootloaders
          */
         'generators' => [
-            GeneratorLoader::GROUP_INDEX => [
-                // Register embeddable entities
-                Annotated\Embeddings::class,
-                // Register annotated entities
-                Annotated\Entities::class,
-                // Register STI/JTI
-                Annotated\TableInheritance::class,
-                // Add @Table column declarations
-                Annotated\MergeColumns::class,
-            ],
-            GeneratorLoader::GROUP_RENDER => [
-                // Re-declared table schemas (remove columns)
-                Schema\Generator\ResetTables::class,
-                // Generate entity relations
-                Schema\Generator\GenerateRelations::class,
-                // Generate changes from schema modifiers
-                Schema\Generator\GenerateModifiers::class,
-                // Make sure all entity schemas are correct
-                Schema\Generator\ValidateEntities::class,
-                // Declare table schemas
-                Schema\Generator\RenderTables::class,
-                // Declare relation keys and indexes
-                Schema\Generator\RenderRelations::class,
-                // Render all schema modifiers
-                Schema\Generator\RenderModifiers::class,
-                // Add @Table column declarations
-                Annotated\MergeIndexes::class,
-            ],
-            GeneratorLoader::GROUP_POSTPROCESS => [
-                // Typecast non string columns
-                Schema\Generator\GenerateTypecast::class,
-            ],
+//            GeneratorLoader::GROUP_INDEX => [
+//                // Register embeddable entities
+//                Annotated\Embeddings::class,
+//                // Register annotated entities
+//                Annotated\Entities::class,
+//                // Register STI/JTI
+//                Annotated\TableInheritance::class,
+//                // Add @Table column declarations
+//                Annotated\MergeColumns::class,
+//            ],
+//            GeneratorLoader::GROUP_RENDER => [
+//                // Re-declared table schemas (remove columns)
+//                Schema\Generator\ResetTables::class,
+//                // Generate entity relations
+//                Schema\Generator\GenerateRelations::class,
+//                // Generate changes from schema modifiers
+//                Schema\Generator\GenerateModifiers::class,
+//                // Make sure all entity schemas are correct
+//                Schema\Generator\ValidateEntities::class,
+//                // Declare table schemas
+//                Schema\Generator\RenderTables::class,
+//                // Declare relation keys and indexes
+//                Schema\Generator\RenderRelations::class,
+//                // Render all schema modifiers
+//                Schema\Generator\RenderModifiers::class,
+//                // Add @Table column declarations
+//                Annotated\MergeIndexes::class,
+//            ],
+//            GeneratorLoader::GROUP_POSTPROCESS => [
+//                // Typecast non string columns
+//                Schema\Generator\GenerateTypecast::class,
+//            ],
         ],
     ],
 

config/cycle.php

@@ -36,7 +36,7 @@ public function run(Registry $registry): Registry
             if ($registry->hasTable($e)) {
                 $table = $registry->getTableSchema($e);
 
-                dump($table->getComparator());
+                // dump($table->getComparator());
 
                 if ($table->getComparator()->hasChanges()) {
                     $key = $registry->getDatabase($e) . ':' . $registry->getTable($e);

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

@@ -6,13 +6,19 @@
 
 use Cycle\Migrations\State;
 use Cycle\Schema\Generator\Migrations\GenerateMigrations;
+use Cycle\Schema\Registry;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Container\BindingResolutionException;
 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\GeneratorLoader;
-use WayOfDev\Cycle\Contracts\SchemaCompiler;
-use WayOfDev\Cycle\Schema\Generators\GeneratorsFactory;
+use WayOfDev\Cycle\Bridge\Laravel\Providers\Registrators\RegisterSchema;
+use WayOfDev\Cycle\Contracts\CacheManager as CacheManagerContract;
+use WayOfDev\Cycle\Contracts\Config\Repository as Config;
+use WayOfDev\Cycle\Schema\Compiler;
+
+use function array_merge;
 
 /**
  * See original spiral framework commands.
@@ -26,8 +32,17 @@ final class MigrateCommand extends AbstractCommand
 
     protected $description = 'Generate ORM schema migrations.';
 
-    public function handle(GeneratorsFactory $generatorsFactory, SchemaCompiler $schemaCompiler, GenerateMigrations $generateMigrations): int
-    {
+    /**
+     * @throws BindingResolutionException
+     */
+    public function handle(
+        Container $app,
+        RegisterSchema $bootloader,
+        Registry $registry,
+        Config $config,
+        GenerateMigrations $migrations,
+        CacheManagerContract $cache
+    ): int {
         if (! $this->migrator->isConfigured()) {
             $this->migrator->configure();
         }
@@ -40,19 +55,17 @@ public function handle(GeneratorsFactory $generatorsFactory, SchemaCompiler $sch
             }
         }
 
-        $diff = new ShowChanges($this->output);
-
-        $generators = $generatorsFactory
-            ->add(GeneratorLoader::GROUP_POSTPROCESS, $diff);
+        $schemaCompiler = Compiler::compile(
+            $registry,
+            array_merge($bootloader->getGenerators($app, $config), [
+                $diff = new ShowChanges($this->output),
+            ])
+        );
 
-        $schemaCompiler->compile($generators->get());
+        $schemaCompiler->toMemory($cache);
 
         if ($diff->hasChanges()) {
-            $generators = $generatorsFactory
-                ->without()
-                ->add(GeneratorLoader::GROUP_POSTPROCESS, $generateMigrations);
-
-            $schemaCompiler->compile($generators->get());
+            (new \Cycle\Schema\Compiler())->compile($registry, [$migrations]);
 
             if ($this->option('run')) {
                 $this->call(DatabaseMigrateCommand::class, ['--force' => true]);