feat: add support for cycle/schema-builder

spiral/cycle-bridge@v2.4.2...v2.5.0

https://github.com/cycle/schema-builder

Author: lotyp

composer.json

@@ -25,6 +25,7 @@
         "cycle/schema-migrations-generator": "^2.2",
         "cycle/schema-renderer": "^1.2",
         "illuminate/console": "^10.45",
+        "cycle/schema-builder": "^2.8.0",
         "illuminate/contracts": "^10.45",
         "illuminate/support": "^10.45",
         "laminas/laminas-hydrator": "^4.15",

composer.lock

@@ -159,9 +159,7 @@
             SchemaInterface::MAPPER => Cycle\ORM\Mapper\Mapper::class,
             SchemaInterface::REPOSITORY => Cycle\ORM\Select\Repository::class,
             SchemaInterface::SCOPE => null,
-            SchemaInterface::TYPECAST_HANDLER => [
-                // \Cycle\ORM\Parser\Typecast::class,  \App\Infrastructure\CycleORM\Typecaster\UuidTypecast::class,
-            ],
+            SchemaInterface::TYPECAST_HANDLER => null,
         ],
 
         'collections' => [

config/cycle.php

@@ -4,7 +4,9 @@
 
 namespace WayOfDev\Cycle\Bridge\Laravel\Providers\Registrators;
 
+use Cycle\Database\DatabaseProviderInterface;
 use Cycle\ORM\SchemaInterface;
+use Cycle\Schema\Defaults;
 use Cycle\Schema\Registry;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Cache\Factory as CacheFactory;
@@ -37,6 +39,17 @@ public function __invoke(Application $app): void
             );
         });
 
+        $app->bind(Registry::class, static function (Application $app): Registry {
+            $defaults = new Defaults();
+
+            /** @var SchemaConfig $config */
+            $config = $app->get(SchemaConfig::class);
+
+            $defaults->merge($config->defaults());
+
+            return new Registry($app->get(DatabaseProviderInterface::class), $defaults);
+        });
+
         $app->bind(SchemaInterface::class, static function (Application $app): SchemaInterface {
             /** @var SchemaConfig $config */
             $config = $app->get(SchemaConfig::class);

src/Bridge/Laravel/Providers/Registrators/RegisterSchema.php

@@ -45,4 +45,9 @@ public function cacheSchema(): bool
     {
         return $this->config['cache']['enabled'];
     }
+
+    public function defaults()
+    {
+        return $this->config['defaults'];
+    }
 }

src/Schema/Config/SchemaConfig.php

@@ -23,9 +23,10 @@ public function it_runs_handle(): void
         $this->artisanCall('cycle:migrate:init');
         $this->artisanCall('cycle:orm:migrate', ['--force' => true]);
 
+        // @phpstan-ignore-next-line
         $this::assertCount(1, $database->getTables());
 
         $this->artisanCall('cycle:migrate', ['--force' => true]);
-        $this::assertCount(4, $database->getTables());
+        $this::assertCount(5, $database->getTables());
     }
 }

tests/src/Bridge/Laravel/Console/Commands/Migrations/MigrateCommandTest.php

@@ -23,12 +23,13 @@ public function it_runs_handle(): void
         $this->assertConsoleCommandOutputContainsStrings('cycle:migrate:replay', ['--force' => true], 'No');
 
         $this->artisanCall('cycle:orm:migrate', ['--force' => true]);
+        // @phpstan-ignore-next-line
         $this::assertCount(1, $database->getTables());
 
         $this->artisanCall('cycle:migrate', ['--force' => true]);
-        $this::assertCount(4, $database->getTables());
+        $this::assertCount(5, $database->getTables());
 
         $this->artisanCall('cycle:migrate:replay', ['--force' => true]);
-        $this::assertCount(4, $database->getTables());
+        $this::assertCount(5, $database->getTables());
     }
 }

tests/src/Bridge/Laravel/Console/Commands/Migrations/ReplayCommandTest.php

@@ -24,10 +24,11 @@ public function it_runs_handle(): void
         $this::assertConsoleCommandOutputContainsStrings('cycle:migrate:rollback', ['--force' => true], 'No');
 
         $this->artisanCall('cycle:orm:migrate', ['--force' => true]);
+        // @phpstan-ignore-next-line
         $this::assertCount(1, $database->getTables());
 
         $this->artisanCall('cycle:migrate', ['--force' => true]);
-        $this::assertCount(4, $database->getTables());
+        $this::assertCount(5, $database->getTables());
 
         $this->artisanCall('cycle:migrate:rollback', ['--force' => true]);
         $this::assertCount(1, $database->getTables());

tests/src/Bridge/Laravel/Console/Commands/Migrations/RollbackCommandTest.php

@@ -36,7 +36,7 @@ public function it_runs_handle(): void
         $this::assertStringContainsString('not executed yet', $output);
 
         $this->artisanCall('cycle:migrate', ['--force' => true]);
-        $this::assertCount(4, $database->getTables());
+        $this::assertCount(5, $database->getTables());
 
         $this->artisanCall('cycle:migrate:status');
         $output2 = Artisan::output();

tests/src/Bridge/Laravel/Console/Commands/Migrations/StatusCommandTest.php

@@ -4,8 +4,12 @@
 
 namespace WayOfDev\Tests\Bridge\Laravel\Providers\Registrators;
 
+use Cycle\ORM\Mapper\Mapper;
 use Cycle\ORM\Schema;
 use Cycle\ORM\SchemaInterface;
+use Cycle\ORM\Select\Repository;
+use Cycle\ORM\Select\Source;
+use Cycle\Schema\Registry;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -49,6 +53,8 @@ public function it_registers_generator_loader_as_singleton(): void
             $this::fail($e->getMessage());
         }
 
+        $this::assertSame($class1, $class2);
+
         $this::assertInstanceOf(GeneratorLoader::class, $class1);
         $this::assertInstanceOf(GeneratorQueue::class, $class1);
 
@@ -62,19 +68,59 @@ public function it_registers_schema_interface(): void
     {
         try {
             $class1 = $this->app->get(SchemaInterface::class);
-            // $class2 = $this->app->get(SchemaInterface::class);
+            $class2 = $this->app->get(SchemaInterface::class);
         } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
             $this::fail($e->getMessage());
         }
 
         $this::assertInstanceOf(SchemaInterface::class, $class1);
         $this::assertInstanceOf(Schema::class, $class1);
 
-        // $this::assertSame($class1, $class2);
+        $this::assertNotSame($class1, $class2);
 
         $schema = $class1->toArray();
 
         $this::assertArrayHasKey('user', $schema);
         $this::assertArrayHasKey('role', $schema);
     }
+
+    /**
+     * @test
+     */
+    public function it_registers_schema_registry_with_default_config(): void
+    {
+        try {
+            $defaults = $this->app->get(Registry::class)->getDefaults();
+
+            $this::assertSame(Mapper::class, $defaults[SchemaInterface::MAPPER]);
+            $this::assertSame(Repository::class, $defaults[SchemaInterface::REPOSITORY]);
+            $this::assertSame(Source::class, $defaults[SchemaInterface::SOURCE]);
+            $this::assertNull($defaults[SchemaInterface::SCOPE]);
+            $this::assertNull($defaults[SchemaInterface::TYPECAST_HANDLER]);
+        } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+            $this::fail($e->getMessage());
+        }
+    }
+
+    /**
+     * @test
+     */
+    public function it_registers_schema_registry_with_custom_config(): void
+    {
+        try {
+            config()->set('cycle.schema.defaults', [
+                SchemaInterface::TYPECAST_HANDLER => ['foo', 'bar'],
+            ]);
+
+            $defaults = $this->app->get(Registry::class)->getDefaults();
+
+            $this::assertSame(Mapper::class, $defaults[SchemaInterface::MAPPER]);
+            $this::assertSame(Repository::class, $defaults[SchemaInterface::REPOSITORY]);
+            $this::assertSame(Source::class, $defaults[SchemaInterface::SOURCE]);
+            $this::assertNull($defaults[SchemaInterface::SCOPE]);
+            $this::assertSame(['foo', 'bar'], $defaults[SchemaInterface::TYPECAST_HANDLER]);
+        } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+            $this::fail($e->getMessage());
+        }
+    }
 }