fix: adapt 'globally disable persisstence' feature to split factories

zenstruck · Aug 11, 2023 · b535afb · b535afb
1 parent f346521
commit b535afb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/Test/Factories.php b/src/Test/Factories.php
@@ -62,7 +62,7 @@ public static function _setUpFactories(): void
     public static function _tearDownFactories(): void
     {
         try {
-            Factory::configuration()->enablePersist();
+            PersistentObjectFactory::persistenceManager()->enablePersist();
         } catch (FoundryBootException) {
         }
 
@@ -71,11 +71,11 @@ public static function _tearDownFactories(): void
 
     public function disablePersist(): void
     {
-        Factory::configuration()->disablePersist();
+        PersistentObjectFactory::persistenceManager()->disablePersist();
     }
 
     public function enablePersist(): void
     {
-        Factory::configuration()->enablePersist();
+        PersistentObjectFactory::persistenceManager()->enablePersist();
     }
 }
diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php
@@ -29,7 +29,11 @@ final class ZenstruckFoundryBundle extends Bundle
 {
     public function boot(): void
     {
-        if (!BaseFactory::isBooted() && $this->container) {
+        if (!$this->container) {
+            return;
+        }
+
+        if (!BaseFactory::isBooted()) {
             BaseFactory::boot(
                 $this->container->get('.zenstruck_foundry.factory_manager'),
                 $this->container->get('.zenstruck_foundry.configuration')

diff --git a/tests/Functional/ModelFactoryTest.php b/tests/Functional/ModelFactoryTest.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Zenstruck\Foundry\BaseFactory;
 use Zenstruck\Foundry\FactoryCollection;
+use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 
@@ -492,7 +493,7 @@ public function cannot_access_repository_method_when_persist_disabled(): void
      */
     public function assert_persist_is_re_enabled_automatically(): void
     {
-        self::assertTrue(Factory::configuration()->isPersistEnabled());
+        self::assertTrue(PersistentObjectFactory::persistenceManager()->isPersistEnabled());
 
         create($this->categoryClass(), ['name' => 'foo']);
         $this->categoryFactoryClass()::assert()->count(1);