fix: can use reuse with inheritance (#914)

nikophil · web-flow · commit f6c81a0bd5f2 · 2025-05-24T10:26:14.000+02:00
diff --git a/src/ObjectFactory.php b/src/ObjectFactory.php
@@ -162,12 +162,23 @@ final protected function reusedAttributes(): array
                 continue;
             }
 
-            if (!$type instanceof \ReflectionNamedType) {
+            if (!$type instanceof \ReflectionNamedType || $type->isBuiltin()) {
                 continue;
             }
 
             if (isset($this->reusedObjects[$type->getName()])) {
                 $attributes[$property->getName()] = $this->reusedObjects[$type->getName()];
+
+                continue;
+            }
+
+            // test if reused object is a subclass of the property's type
+            foreach ($this->reusedObjects as $reusedObject) {
+                if (is_a($reusedObject, $type->getName())) {
+                    $attributes[$property->getName()] = $reusedObject;
+
+                    break;
+                }
             }
         }
 
diff --git a/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/Entity.php b/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/Entity.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases\RelationshipOnInterface;
+
+use Doctrine\ORM\Mapping as ORM;
+use Zenstruck\Foundry\Tests\Fixture\Model\Base;
+
+#[ORM\Entity]
+#[ORM\Table('relationship_on_interface_entity')]
+class Entity extends Base implements EntityInterface
+{
+}
diff --git a/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/EntityInterface.php b/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/EntityInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases\RelationshipOnInterface;
+
+interface EntityInterface
+{
+}
diff --git a/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/OtherEntity.php b/tests/Fixture/Entity/EdgeCases/RelationshipOnInterface/OtherEntity.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases\RelationshipOnInterface;
+
+use Doctrine\ORM\Mapping as ORM;
+use Zenstruck\Foundry\Tests\Fixture\Model\Base;
+
+#[ORM\Entity]
+#[ORM\Table('relationship_on_interface_other_entity')]
+class OtherEntity extends Base
+{
+    public function __construct(
+        #[ORM\ManyToOne(targetEntity: Entity::class)] // @phpstan-ignore doctrine.associationType
+        #[ORM\JoinColumn(nullable: false)]
+        public EntityInterface $entity,
+    ) {
+    }
+}
diff --git a/tests/Unit/ReuseEntityTest.php b/tests/Unit/ReuseEntityTest.php
@@ -16,10 +16,14 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Zenstruck\Foundry\Test\Factories;
+use Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases\RelationshipOnInterface;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Address\AddressFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Category\CategoryFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Contact\ContactFactory;
 
+use function Zenstruck\Foundry\factory;
+use function Zenstruck\Foundry\object;
+
 final class ReuseEntityTest extends TestCase
 {
     use Factories;
@@ -161,4 +165,18 @@ public function reused_object_dont_have_priority_over_states(): void
 
         self::assertNotSame($address, $contact->getAddress());
     }
+
+    /**
+     * @test
+     */
+    #[Test]
+    public function reused_object_on_interface_property(): void
+    {
+        $otherEntity = factory(RelationshipOnInterface\OtherEntity::class)
+            ->reuse($entity = object(RelationshipOnInterface\Entity::class))
+            ->create()
+        ;
+
+        self::assertSame($entity, $otherEntity->entity);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -162,12 +162,23 @@ final protected function reusedAttributes(): array`
`162`	`162`	`continue;`
`163`	`163`	`}`
`164`	`164`
`165`		`- if (!$type instanceof \ReflectionNamedType) {`
	`165`	`+ if (!$type instanceof \ReflectionNamedType \|\| $type->isBuiltin()) {`
`166`	`166`	`continue;`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if (isset($this->reusedObjects[$type->getName()])) {`
`170`	`170`	`$attributes[$property->getName()] = $this->reusedObjects[$type->getName()];`
	`171`	`+`
	`172`	`+ continue;`
	`173`	`+ }`
	`174`	`+`
	`175`	`+ // test if reused object is a subclass of the property's type`
	`176`	`+ foreach ($this->reusedObjects as $reusedObject) {`
	`177`	`+ if (is_a($reusedObject, $type->getName())) {`
	`178`	`+ $attributes[$property->getName()] = $reusedObject;`
	`179`	`+`
	`180`	`+ break;`
	`181`	`+ }`
`171`	`182`	`}`
`172`	`183`	`}`
`173`	`184`