Merge pull request #259 from kbond/global-state-fix

Fix global state issue

Author: kbond

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         php: [7.4, 8.0, 8.1]
-        symfony: [4.4.*, 5.3.*, 5.4.*]
+        symfony: [4.4.*, 5.4.*]
         deps: [highest]
         include:
           - php: 7.2

src/Test/DatabaseResetter.php

@@ -5,7 +5,6 @@
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Zenstruck\Foundry\Factory;
 
 /**
  * @internal
@@ -42,7 +41,7 @@ public static function resetDatabase(KernelInterface $kernel): void
 
         $databaseResetter->resetDatabase();
 
-        self::bootFoundry($kernel);
+        self::flushGlobalState($kernel);
 
         self::$hasBeenReset = true;
     }
@@ -57,7 +56,7 @@ public static function resetSchema(KernelInterface $kernel): void
             return;
         }
 
-        self::bootFoundry($kernel);
+        self::flushGlobalState($kernel);
     }
 
     /** @retrun array<SchemaResetterInterface> */
@@ -77,11 +76,9 @@ private static function schemaResetters(KernelInterface $kernel): array
         return $databaseResetters;
     }
 
-    private static function bootFoundry(KernelInterface $kernel): void
+    private static function flushGlobalState(KernelInterface $kernel): void
     {
-        if (!Factory::isBooted()) {
-            TestState::bootFromContainer($kernel->getContainer());
-        }
+        TestState::bootFromContainer($kernel->getContainer());
 
         TestState::flushGlobalState();
     }