fix: should not use flush_after() in FactoryCollection::create()

Author: nikophil

src/FactoryCollection.php

@@ -14,8 +14,6 @@
 use Zenstruck\Foundry\Persistence\PersistentObjectFactory;
 use Zenstruck\Foundry\Persistence\PersistMode;
 
-use function Zenstruck\Foundry\Persistence\flush_after;
-
 /**
  * @author Kevin Bond <[email protected]>
  *
@@ -147,9 +145,12 @@ public static function sequence(Factory $factory, iterable $items): self
     public function create(array|callable $attributes = []): array
     {
         if (Configuration::instance()->flushOnce && $this->isRootFactory && $this->factory instanceof PersistentObjectFactory && $this->factory->isPersisting()) {
-            return flush_after(
-                fn() => \array_map(static fn(Factory $f) => $f->create($attributes), $this->all())
-            );
+            // @phpstan-ignore argument.type (if "$this->factory instanceof PersistentObjectFactory", $this->all() returns a list of PersistentObjectFactory)
+            $objects = \array_map(static fn(PersistentObjectFactory $f) => $f->notRootFactory()->create($attributes), $this->all());
+
+            Configuration::instance()->persistence()->save(...$objects);
+
+            return $objects;
         }
 
         return \array_map(static fn(Factory $f) => $f->create($attributes), $this->all());

src/Persistence/PersistenceManager.php

@@ -59,30 +59,29 @@ public function enablePersisting(): void
         $this->persist = true;
     }
 
-    /**
-     * @template T of object
-     *
-     * @param T $object
-     *
-     * @return T
-     */
-    public function save(object $object): object
+    public function save(object $object, object ...$objects): void
     {
-        if ($object instanceof Proxy) {
-            return $object->_save();
+        $objects = unproxy([$object, ...$objects]);
+
+        $oms = [];
+        foreach ($objects as $object) {
+            $om = $this->strategyFor($object::class)->objectManagerFor($object::class);
+            $om->persist($object);
+
+            $oms[\spl_object_id($om)] = $om;
         }
 
-        $om = $this->strategyFor($object::class)->objectManagerFor($object::class);
-        $om->persist($object);
-        $this->flush($om);
+        foreach ($oms as $om) {
+            $this->flush($om);
+        }
 
         $callbacksCalled = $this->callPostPersistCallbacks();
 
         if ($callbacksCalled) {
-            $this->flush($om);
+            foreach ($oms as $om) {
+                $this->flush($om);
+            }
         }
-
-        return $object;
     }
 
     /**

src/Persistence/functions.php

@@ -121,7 +121,9 @@ function unproxy(mixed $what, bool $withAutoRefresh = true): mixed
  */
 function save(object $object): object
 {
-    return Configuration::instance()->persistence()->save($object);
+    Configuration::instance()->persistence()->save($object);
+
+    return $object;
 }
 
 /**

tests/Integration/ORM/EntityRelationship/EntityFactoryRelationshipTestCase.php

@@ -34,6 +34,7 @@
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Contact\ContactFactory;
 
 use function Zenstruck\Foundry\lazy;
+use function Zenstruck\Foundry\Persistence\flush_after;
 use function Zenstruck\Foundry\Persistence\refresh;
 use function Zenstruck\Foundry\Persistence\unproxy;
 
@@ -712,6 +713,44 @@ static function(Address $a): void {
         self::assertNotNull($address->getContact());
     }
 
+    /** @test */
+    #[Test]
+    #[DataProvider('provideCascadeRelationshipsCombinations')]
+    #[UsingRelationships(Contact::class, ['category'])]
+    public function find_or_create_used_in_many_actually_create_only_one_object(): void
+    {
+        static::contactFactory()
+            ->many(2)
+            ->create(['category' => lazy(fn() => static::categoryFactory()::findOrCreate([]))]);
+
+        static::contactFactory()::assert()->count(2);
+        static::categoryFactory()::assert()->count(1);
+    }
+
+    /** @test */
+    #[Test]
+    #[DataProvider('provideCascadeRelationshipsCombinations')]
+    #[UsingRelationships(Contact::class, ['category'])]
+    public function ensure_inverse_one_to_many_is_hydrated_before_persisting_in_flush_after(): void
+    {
+        flush_after(
+            static function() {
+                $contactFactory = static::contactFactory()
+                    ->afterPersist(static function(Contact $contact) {
+                        self::assertNotNull($contact->getCategory());
+                    });
+
+                static::categoryFactory()::createMany(
+                    2,
+                    ['contacts' => lazy(static fn() => $contactFactory->many(2)->create(['category' => null]))]
+                );
+            }
+        );
+
+        static::contactFactory()::assert()->count(4);
+        static::categoryFactory()::assert()->count(2);
+    }
+
     /** @return PersistentObjectFactory<Contact> */
     protected static function contactFactoryWithoutCategory(): PersistentObjectFactory
     {