wip

Author: nikophil

src/Persistence/PersistenceManager.php

@@ -31,10 +31,10 @@ final class PersistenceManager
     private bool $flush = true;
     private bool $persist = true;
 
-    /** @var list<object> */
+    /** @var list<list<object>> */
     private array $objectsToPersist = [];
 
-    /** @var list<callable():void> */
+    /** @var list<list<callable():void>> */
     private array $afterPersistCallbacks = [];
 
     /**
@@ -61,6 +61,12 @@ public function enablePersisting(): void
         $this->persist = true;
     }
 
+    public function startTransaction(): void
+    {
+        $this->objectsToPersist[] = [];
+        $this->afterPersistCallbacks[] = [];
+    }
+
     /**
      * @template T of object
      *
@@ -81,11 +87,17 @@ public function save(object $object): object
         return $object;
     }
 
-    public function saveAll(): void
+    public function commit(): void
     {
         $objectManagers = [];
 
-        foreach ($this->objectsToPersist as $object) {
+        $objectsToPersist = array_pop($this->objectsToPersist);
+
+        if ($objectsToPersist === null) {
+            return;
+        }
+
+        foreach ($objectsToPersist as $object) {
             $om = $this->strategyFor($object::class)->objectManagerFor($object::class);
             $om->persist($object);
 
@@ -94,8 +106,6 @@ public function saveAll(): void
             }
         }
 
-        $this->objectsToPersist = [];
-
         foreach ($objectManagers as $om) {
             $this->flush($om);
         }
@@ -117,9 +127,9 @@ public function scheduleForInsert(object $object, array $afterPersistCallbacks =
             $object = unproxy($object);
         }
 
-        $this->objectsToPersist[] = $object;
+        $this->objectsToPersist[array_key_last($this->objectsToPersist)][] = $object;
 
-        $this->afterPersistCallbacks = [...$this->afterPersistCallbacks, ...$afterPersistCallbacks];
+        $this->afterPersistCallbacks[array_key_last($this->afterPersistCallbacks)] = [...$this->afterPersistCallbacks[array_key_last($this->afterPersistCallbacks)], ...$afterPersistCallbacks];
 
         return $object;
     }
@@ -168,8 +178,7 @@ private function callPostPersistCallbacks(): void
             return;
         }
 
-        $afterPersistCallbacks = $this->afterPersistCallbacks;
-        $this->afterPersistCallbacks = [];
+        $afterPersistCallbacks = array_pop($this->afterPersistCallbacks);
 
         foreach ($afterPersistCallbacks as $afterPersistCallback) {
             $afterPersistCallback();

src/Persistence/PersistentObjectFactory.php

@@ -198,6 +198,10 @@ final public static function truncate(): void
      */
     public function create(callable|array $attributes = []): object
     {
+        if (PersistMode::PERSIST === $this->persistMode() && $this->isRootFactory) {
+            Configuration::instance()->persistence()->startTransaction();
+        }
+
         $object = parent::create($attributes);
 
         foreach ($this->tempAfterInstantiate as $callback) {
@@ -218,7 +222,7 @@ public function create(callable|array $attributes = []): object
             throw new \LogicException('Persistence cannot be used in unit tests.');
         }
 
-        $configuration->persistence()->saveAll();
+        $configuration->persistence()->commit();
 
         return $object;
     }

tests/Integration/ORM/EntityRelationship/EntityFactoryRelationshipTestCase.php

@@ -553,6 +553,33 @@ public function can_call_create_in_nested_after_persist_callback(): void
         self::assertCount(1, $contact->getCategory()?->getSecondaryContacts() ?? []);
     }
 
+    /** @test */
+    #[Test]
+    #[DataProvider('provideCascadeRelationshipsCombinations')]
+    #[UsingRelationships(Address::class, ['contact'])]
+    #[UsingRelationships(Contact::class, ['category'])]
+    public function inverse_one_to_one_with_forced_flush(): void
+    {
+        $address = static::addressFactory()::createOne(
+            [
+                'contact' => static::contactFactory()
+                    ->beforeInstantiate(
+                        function (array $attributes): array {
+                            $attributes['category'] = static::categoryFactory()->create();
+                            return $attributes;
+                        }
+                    ),
+            ]
+        );
+
+        static::addressFactory()::assert()->count(1);
+        static::contactFactory()::assert()->count(1);
+        static::categoryFactory()::assert()->count(1);
+
+        self::assertNotNull($address->getContact());
+        self::assertNotNull($address->getContact()->getCategory());
+    }
+
     /** @return PersistentObjectFactory<Contact> */
     protected static function contactFactoryWithoutCategory(): PersistentObjectFactory
     {