mnior: reboot kernel in database resetter instead of shutdown (#1059)

nikophil · web-flow · commit 8701b45c7fba · 2026-01-15T17:23:06.000+01:00
diff --git a/config/orm.php b/config/orm.php
@@ -45,6 +45,7 @@
                 ->decorate(OrmResetter::class, priority: 10)
                 ->args([
                     service('.inner'),
+                    param('kernel.build_dir')
                 ])
         ;
     }
diff --git a/src/ORM/ResetDatabase/DamaDatabaseResetter.php b/src/ORM/ResetDatabase/DamaDatabaseResetter.php
@@ -15,6 +15,8 @@
 
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpKernel\RebootableInterface;
+use Zenstruck\Assert;
 use Zenstruck\Foundry\Configuration;
 use Zenstruck\Foundry\Persistence\PersistenceManager;
 use Zenstruck\Foundry\Persistence\ResetDatabase\ResetDatabaseManager;
@@ -27,6 +29,7 @@ final class DamaDatabaseResetter implements OrmResetter
 {
     public function __construct(
         private OrmResetter $decorated,
+        private string $kernelBuildDir,
     ) {
     }
 
@@ -50,12 +53,15 @@ public function resetBeforeFirstTest(KernelInterface $kernel): void
             Configuration::instance()->stories->loadGlobalStories();
         }
 
-        // shutdown kernel before re-enabling static connections
-        // this would prevent any error if any ResetInterface execute sql queries (example: symfony/doctrine-messenger)
-        $kernel->shutdown();
-
         // re-enable static connections
         StaticDriver::setKeepStaticConnections(true);
+
+        if (!$kernel instanceof RebootableInterface) {
+            throw new \InvalidArgumentException('Kernel should be rebootable to work with DAMADoctrineTestBundle.');
+        }
+
+        // let's reboot the kernel to ensure the static connections will be re-created
+        $kernel->reboot($this->kernelBuildDir);
     }
 
     public function resetBeforeEachTest(KernelInterface $kernel): void

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`->decorate(OrmResetter::class, priority: 10)`
`46`	`46`	`->args([`
`47`	`47`	`service('.inner'),`
	`48`	`+ param('kernel.build_dir')`
`48`	`49`	`])`
`49`	`50`	`;`
`50`	`51`	`}`