[bug] fix/improve embeddable support (#193)

- fix regression in #181 (closes #192)
- remove requirement to call `->withoutPersisting()` for embeddables

Author: kbond

src/Factory.php

@@ -355,14 +355,21 @@ private function relationshipField(self $factory): ?string
 
         // Check inversedBy side ($this is the owner of the relation)
         $factoryClassMetadata = self::configuration()->objectManagerFor($factoryClass)->getMetadataFactory()->getMetadataFor($factoryClass);
+
         foreach ($factoryClassMetadata->getAssociationNames() as $field) {
             if (!$factoryClassMetadata->isAssociationInverseSide($field) && $factoryClassMetadata->getAssociationTargetClass($field) === $relationClass) {
                 return $field;
             }
         }
 
-        // Check mappedBy side ($factory is the owner of the relation)
-        $relationClassMetadata = self::configuration()->objectManagerFor($relationClass)->getClassMetadata($relationClass);
+        try {
+            // Check mappedBy side ($factory is the owner of the relation)
+            $relationClassMetadata = self::configuration()->objectManagerFor($relationClass)->getClassMetadata($relationClass);
+        } catch (\RuntimeException $e) {
+            // relation not managed - could be embeddable
+            return null;
+        }
+
         foreach ($relationClassMetadata->getAssociationNames() as $field) {
             if (($relationClassMetadata->isSingleValuedAssociation($field) || $relationClassMetadata->isCollectionValuedAssociation($field)) && $relationClassMetadata->getAssociationTargetClass($field) === $factoryClass) {
                 return $field;
@@ -418,6 +425,17 @@ private function hasCascadePersist(self $factory, ?string $field): bool
 
     private function isPersisting(): bool
     {
-        return self::configuration()->hasManagerRegistry() ? $this->persist : false;
+        if (!$this->persist || !self::configuration()->hasManagerRegistry()) {
+            return false;
+        }
+
+        try {
+            self::configuration()->objectManagerFor($this->class);
+
+            return true;
+        } catch (\RuntimeException $e) {
+            // entity not managed (perhaps Embeddable)
+            return false;
+        }
     }
 }

tests/Fixtures/Entity/Contact.php

@@ -42,4 +42,9 @@ public function getAddress(): Address
     {
         return $this->address;
     }
+
+    public function setAddress(Address $address): void
+    {
+        $this->address = $address;
+    }
 }

tests/Fixtures/Factories/AddressFactory.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Zenstruck\Foundry\Tests\Fixtures\Factories;
+
+use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Tests\Fixtures\Entity\Address;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+final class AddressFactory extends ModelFactory
+{
+    protected static function getClass(): string
+    {
+        return Address::class;
+    }
+
+    protected function getDefaults(): array
+    {
+        return ['value' => 'Some address'];
+    }
+}

tests/Fixtures/Factories/ContactFactory.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Zenstruck\Foundry\Tests\Fixtures\Factories;
+
+use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Tests\Fixtures\Entity\Contact;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+final class ContactFactory extends ModelFactory
+{
+    protected static function getClass(): string
+    {
+        return Contact::class;
+    }
+
+    protected function getDefaults(): array
+    {
+        return [
+            'name' => 'Sally',
+            'address' => AddressFactory::new(),
+        ];
+    }
+}

tests/Functional/FactoryTest.php

@@ -6,6 +6,7 @@
 use Zenstruck\Foundry\AnonymousFactory;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
+use Zenstruck\Foundry\Tests\Fixtures\Entity\Address;
 use Zenstruck\Foundry\Tests\Fixtures\Entity\Category;
 use Zenstruck\Foundry\Tests\Fixtures\Entity\Post;
 use Zenstruck\Foundry\Tests\Fixtures\Entity\Tag;
@@ -122,4 +123,16 @@ public function creating_with_factory_attribute_persists_the_factory(): void
 
         $this->assertNotNull($object->getCategory()->getId());
     }
+
+    /**
+     * @test
+     */
+    public function can_create_embeddable(): void
+    {
+        $object1 = (new AnonymousFactory(Address::class))->create();
+        $object2 = (new AnonymousFactory(Address::class))->create(['value' => 'an address']);
+
+        $this->assertNull($object1->getValue());
+        $this->assertSame('an address', $object2->getValue());
+    }
 }

tests/Functional/ModelFactoryTest.php

@@ -7,8 +7,10 @@
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 use Zenstruck\Foundry\Tests\Fixtures\Entity\Category;
+use Zenstruck\Foundry\Tests\Fixtures\Factories\AddressFactory;
 use Zenstruck\Foundry\Tests\Fixtures\Factories\CategoryFactory;
 use Zenstruck\Foundry\Tests\Fixtures\Factories\CommentFactory;
+use Zenstruck\Foundry\Tests\Fixtures\Factories\ContactFactory;
 use Zenstruck\Foundry\Tests\Fixtures\Factories\PostFactory;
 use Zenstruck\Foundry\Tests\Fixtures\Factories\PostFactoryWithInvalidInitialize;
 use Zenstruck\Foundry\Tests\Fixtures\Factories\PostFactoryWithNullInitialize;
@@ -440,4 +442,30 @@ public function can_find_by(): void
         $this->assertSame('name2', $categories[0]->getName());
         $this->assertSame('name2', $categories[1]->getName());
     }
+
+    /**
+     * @test
+     */
+    public function embeddables_are_never_persisted(): void
+    {
+        $object1 = AddressFactory::createOne();
+        $object2 = AddressFactory::createOne(['value' => 'another address']);
+
+        $this->assertSame('Some address', $object1->getValue());
+        $this->assertSame('another address', $object2->getValue());
+    }
+
+    /**
+     * @test
+     */
+    public function factory_with_embeddable(): void
+    {
+        ContactFactory::repository()->assert()->empty();
+
+        $object = ContactFactory::createOne();
+
+        ContactFactory::repository()->assert()->count(1);
+        $this->assertSame('Sally', $object->getName());
+        $this->assertSame('Some address', $object->getAddress()->getValue());
+    }
 }

tests/Unit/FactoryTest.php

@@ -254,7 +254,6 @@ public function can_create_object(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(2))
             ->method('getManagerForClass')
             ->with(Post::class)
             ->willReturn($this->createMock(ObjectManager::class))
@@ -278,7 +277,6 @@ public function can_create_many_objects_legacy(): void
 
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(6))
             ->method('getManagerForClass')
             ->with(Post::class)
             ->willReturn($this->createMock(ObjectManager::class))
@@ -304,7 +302,6 @@ public function can_add_after_persist_events(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(2)) // once for persisting, once for each afterPersist event
             ->method('getManagerForClass')
             ->with(Post::class)
             ->willReturn($this->createMock(ObjectManager::class))

tests/Unit/FunctionsTest.php

@@ -65,7 +65,6 @@ public function create(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(2))
             ->method('getManagerForClass')
             ->with(Category::class)
             ->willReturn($this->createMock(ObjectManager::class))
@@ -85,7 +84,6 @@ public function create_many(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(6))
             ->method('getManagerForClass')
             ->with(Category::class)
             ->willReturn($this->createMock(ObjectManager::class))

tests/Unit/ProxyTest.php

@@ -71,7 +71,6 @@ public function saving_unpersisted_proxy_changes_it_to_a_persisted_proxy(): void
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry
-            ->expects($this->exactly(2))
             ->method('getManagerForClass')
             ->with(Category::class)
             ->willReturn($this->createMock(ObjectManager::class))