wip fix decorator

zenstruck · Jan 3, 2025 · 7bf6331 · 7bf6331
1 parent 1252d1e
commit 7bf6331
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ $ ./phpunit
 # run "migrate" testsuite (with "migrate" reset database strategy)
 $ composer test-migrate
 # or
-$ ./phpunit --testsuite migrate --bootstrap tests/bootstrap-migrate.php
+$ ./phpunit --testsuite reset-database --bootstrap tests/bootstrap-reset-database.php
 ```
 
 ### Overriding the default configuration

diff --git a/config/orm.php b/config/orm.php
@@ -26,30 +26,30 @@
             ->arg('$connections', service('connections'))
             ->abstract()
 
-        ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema', SchemaDatabaseResetter::class)
-            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
-            ->tag('.foundry.persistence.database_resetter')
-            ->tag('.foundry.persistence.schema_resetter')
-
-        ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate', MigrateDatabaseResetter::class)
-            ->arg('$configurations', abstract_arg('configurations'))
-            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
-            ->tag('.foundry.persistence.database_resetter')
-            ->tag('.foundry.persistence.schema_resetter')
+//        ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema', SchemaDatabaseResetter::class)
+//            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
+//            ->tag('.foundry.persistence.database_resetter')
+//            ->tag('.foundry.persistence.schema_resetter')
+//
+//        ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate', MigrateDatabaseResetter::class)
+//            ->arg('$configurations', abstract_arg('configurations'))
+//            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
+//            ->tag('.foundry.persistence.database_resetter')
+//            ->tag('.foundry.persistence.schema_resetter')
     ;
 
-    if (\class_exists(StaticDriver::class)) {
-        $container->services()
-            ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema.dama', DamaDatabaseResetter::class)
-                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.schema')
-                ->args([
-                    service('.inner'),
-                ])
-            ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate.dama', DamaDatabaseResetter::class)
-                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.migrate')
-                ->args([
-                    service('.inner'),
-                ])
-        ;
-    }
+//    if (\class_exists(StaticDriver::class)) {
+//        $container->services()
+//            ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema.dama', DamaDatabaseResetter::class)
+//                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.schema')
+//                ->args([
+//                    service('.inner'),
+//                ])
+//            ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate.dama', DamaDatabaseResetter::class)
+//                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.migrate')
+//                ->args([
+//                    service('.inner'),
+//                ])
+//        ;
+//    }
 };
diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php
@@ -19,8 +19,10 @@
 use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
 use Zenstruck\Foundry\Mongo\MongoResetter;
 use Zenstruck\Foundry\Object\Instantiator;
+use Zenstruck\Foundry\ORM\ResetDatabase\MigrateDatabaseResetter;
 use Zenstruck\Foundry\ORM\ResetDatabase\OrmResetter;
 use Zenstruck\Foundry\ORM\ResetDatabase\ResetDatabaseMode;
+use Zenstruck\Foundry\ORM\ResetDatabase\SchemaDatabaseResetter;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -249,19 +251,60 @@ public function loadExtension(array $config, ContainerConfigurator $configurator
                 ->replaceArgument('$connections', $config['orm']['reset']['connections'])
             ;
 
-            $container->getDefinition('.zenstruck_foundry.persistence.database_resetter.orm.migrate')
-                ->replaceArgument('$configurations', $config['orm']['reset']['migrations']['configurations'])
-            ;
+//            $container->getDefinition('.zenstruck_foundry.persistence.database_resetter.orm.migrate')
+//                ->replaceArgument('$configurations', $config['orm']['reset']['migrations']['configurations'])
+//            ;
 
             /** @var ResetDatabaseMode $resetMode */
             $resetMode = $config['orm']['reset']['mode'];
-            $toRemove = ResetDatabaseMode::SCHEMA === $resetMode ? ResetDatabaseMode::MIGRATE->value : ResetDatabaseMode::SCHEMA->value;
+            $container->registerChild(OrmResetter::class, '.zenstruck_foundry.persistence.database_resetter.orm.abstract')
+                ->setClass(
+                    match ($resetMode) {
+                        ResetDatabaseMode::SCHEMA => SchemaDatabaseResetter::class,
+                        ResetDatabaseMode::MIGRATE => MigrateDatabaseResetter::class,
+                    }
+                )
+                ->addTag('.foundry.persistence.database_resetter')
+                ->addTag('.foundry.persistence.schema_resetter');
+
+
+//            $toRemove = ResetDatabaseMode::SCHEMA === $resetMode ? ResetDatabaseMode::MIGRATE->value : ResetDatabaseMode::SCHEMA->value;
+//
+//            $container->removeDefinition(".zenstruck_foundry.persistence.database_resetter.orm.{$toRemove}.dama");
+//            $container->removeDefinition(".zenstruck_foundry.persistence.database_resetter.orm.{$toRemove}");
+//
+//            $container->setAlias(OrmResetter::class, ".zenstruck_foundry.persistence.database_resetter.orm.{$resetMode->value}");
+        }
 
-            $container->removeDefinition(".zenstruck_foundry.persistence.database_resetter.orm.{$toRemove}.dama");
-            $container->removeDefinition(".zenstruck_foundry.persistence.database_resetter.orm.{$toRemove}");
+/*
 
-            $container->setAlias(OrmResetter::class, ".zenstruck_foundry.persistence.database_resetter.orm.{$resetMode->value}");
-        }
+        ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema', SchemaDatabaseResetter::class)
+            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
+            ->tag('.foundry.persistence.database_resetter')
+            ->tag('.foundry.persistence.schema_resetter')
+
+        ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate', MigrateDatabaseResetter::class)
+            ->arg('$configurations', abstract_arg('configurations'))
+            ->parent('.zenstruck_foundry.persistence.database_resetter.orm.abstract')
+            ->tag('.foundry.persistence.database_resetter')
+            ->tag('.foundry.persistence.schema_resetter')
+    ;
+
+    if (\class_exists(StaticDriver::class)) {
+        $container->services()
+            ->set('.zenstruck_foundry.persistence.database_resetter.orm.schema.dama', DamaDatabaseResetter::class)
+                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.schema')
+                ->args([
+                    service('.inner'),
+                ])
+            ->set('.zenstruck_foundry.persistence.database_resetter.orm.migrate.dama', DamaDatabaseResetter::class)
+                ->decorate('.zenstruck_foundry.persistence.database_resetter.orm.migrate')
+                ->args([
+                    service('.inner'),
+                ])
+        ;
+    }
+         */
 
         if (isset($bundles['DoctrineMongoDBBundle'])) {
             $configurator->import('../config/mongo.php');

diff --git a/tests/Fixture/ResetDatabase/OrmResetterDecorator.php b/tests/Fixture/ResetDatabase/OrmResetterDecorator.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Zenstruck\Foundry\Tests\Fixture\ResetDatabase;
+
+use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Zenstruck\Foundry\ORM\ResetDatabase\OrmResetter;
+
+#[AsDecorator(OrmResetter::class)]
+final class OrmResetterDecorator implements OrmResetter
+{
+    public static $calledBeforeFirstTest = false;
+    public static $calledBeforeEachTest = false;
+
+    public function __construct(
+        private OrmResetter $decorated
+    ) {}
+
+    public function resetBeforeFirstTest(KernelInterface $kernel): void
+    {
+        $this->decorated->resetBeforeFirstTest($kernel);
+
+        self::$calledBeforeFirstTest = true;
+    }
+
+    public function resetBeforeEachTest(KernelInterface $kernel): void
+    {
+        $this->decorated->resetBeforeEachTest($kernel);
+
+        self::$calledBeforeEachTest = true;
+    }
+}
diff --git a/tests/Fixture/ResetDatabase/ResetDatabaseTestKernel.php b/tests/Fixture/ResetDatabase/ResetDatabaseTestKernel.php
@@ -64,6 +64,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
         }
 
         $c->register(GlobalInvokableService::class);
+        $c->register(OrmResetterDecorator::class)->setAutowired(true)->setAutoconfigured(true);
     }
 
     public static function useMigrations(): bool

diff --git a/tests/Integration/ResetDatabase/ResetDatabaseTest.php b/tests/Integration/ResetDatabase/ResetDatabaseTest.php
@@ -21,6 +21,7 @@
 use Zenstruck\Foundry\Tests\Fixture\EntityInAnotherSchema\Article;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Document\GenericDocumentFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
+use Zenstruck\Foundry\Tests\Fixture\ResetDatabase\OrmResetterDecorator;
 use Zenstruck\Foundry\Tests\Integration\RequiresORM;
 
 use function Zenstruck\Foundry\Persistence\persist;
@@ -104,4 +105,13 @@ public function can_create_object_in_another_schema(): void
         persist(Article::class, ['title' => 'Hello World!']);
         repository(Article::class)->assert()->count(1);
     }
+
+    /**
+     * @test
+     */
+    public function can_extend_reset_mechanism(): void
+    {
+        self::assertTrue(OrmResetterDecorator::$calledBeforeFirstTest);
+        self::assertTrue(OrmResetterDecorator::$calledBeforeEachTest);
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $c->register(GlobalInvokableService::class);
+            $c->register(OrmResetterDecorator::class)->setAutowired(true)->setAutoconfigured(true);
         }
         public static function useMigrations(): bool
@@ Expand Down @@