feat: bind entity behaviour to interface

Author: lotyp

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

@@ -14,6 +14,7 @@
 use Cycle\ORM\ORM;
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\SchemaInterface;
+use Cycle\ORM\Transaction\CommandGeneratorInterface;
 use Illuminate\Contracts\Foundation\Application;
 use WayOfDev\Cycle\Bridge\Laravel\Factories\SpiralFactory;
 use WayOfDev\Cycle\Schema\Config\SchemaConfig;
@@ -39,13 +40,16 @@ public function __invoke(Application $app): void
             );
         });
 
-        $app->singleton(ORMInterface::class, function (Application $app): ORMInterface {
-            $commandGenerator = null;
-            $loadEntityBehavior = config('cycle.entityBehavior.register', true);
+        if ($this->shouldLoadEntityBehavior() === true) {
+            $app->bind(CommandGeneratorInterface::class, function (Application $app): CommandGeneratorInterface {
+                return new EventDrivenCommandGenerator($app->get(SchemaInterface::class), $app);
+            });
+        }
 
-            if (true === $loadEntityBehavior) {
-                $commandGenerator = new EventDrivenCommandGenerator($app->get(SchemaInterface::class), $app);
-            }
+        $app->singleton(ORMInterface::class, function (Application $app): ORMInterface {
+            $commandGenerator = $this->shouldLoadEntityBehavior()
+                ? $app->get(CommandGeneratorInterface::class)
+                : null;
 
             return new ORM(
                 factory: $app->get(FactoryInterface::class),
@@ -60,4 +64,9 @@ public function __invoke(Application $app): void
             );
         });
     }
+
+    private function shouldLoadEntityBehavior(): bool
+    {
+        return config('cycle.entityBehavior.register', true);
+    }
 }

tests/app/Entities/User.php

@@ -30,7 +30,7 @@ class User
     public ?User $friend = null;
 
     #[HasMany(target: User::class, outerKey: 'userId', nullable: true)]
-    public iterable|null $friends = [];
+    public ?iterable $friends = [];
 
     #[HasMany(target: User::class, outerKey: 'userId', nullable: true, collection: 'array')]
     public ?array $friendsAsArray = [];

tests/src/Bridge/Laravel/Providers/Registrators/RegisterORMTest.php

@@ -10,6 +10,7 @@
 use Cycle\ORM\ORM;
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\Transaction\CommandGenerator;
+use Cycle\ORM\Transaction\CommandGeneratorInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use WayOfDev\Tests\TestCase;
@@ -51,6 +52,9 @@ public function it_registers_orm_as_singleton(): void
 
     /**
      * @test
+     *
+     * @throws NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
      */
     public function it_registers_entity_behavior_by_default(): void
     {
@@ -61,6 +65,11 @@ public function it_registers_entity_behavior_by_default(): void
         }
 
         $this::assertInstanceOf(EventDrivenCommandGenerator::class, $class->getCommandGenerator());
+
+        $this::assertInstanceOf(
+            EventDrivenCommandGenerator::class,
+            $this->app->get(CommandGeneratorInterface::class)
+        );
     }
 
     /**