EntityManager::getReference() should handle a PK which is also a FK

doctrine · Sep 22, 2024 · b2e4500 · b2e4500
1 parent 74ef282
commit b2e4500
Show file tree

Hide file tree

Showing 9 changed files with 386 additions and 3 deletions.
diff --git a/docs/en/reference/advanced-configuration.rst b/docs/en/reference/advanced-configuration.rst
@@ -342,7 +342,7 @@ for the ``$identifier`` parameter is passed. ``$identifier`` values are
 not checked and there is no guarantee that the requested entity instance even
 exists – the method will still return a proxy object.
 
-Its only when the proxy has to be fully initialized or associations cannot
+It is only when the proxy has to be fully initialized or associations cannot
 be written to the database that invalid ``$identifier`` values may lead to
 exceptions.
 

diff --git a/src/EntityManager.php b/src/EntityManager.php
@@ -533,6 +533,19 @@ public function getReference($entityName, $id)
             $id = [$class->identifier[0] => $id];
         }
 
+        foreach ($id as $i => $value) {
+            if (is_object($value)) {
+                $className = DefaultProxyClassNameResolver::getClass($value);
+                if ($this->metadataFactory->hasMetadataFor($className)) {
+                    $id[$i] = $this->unitOfWork->getSingleIdentifierValue($value);
+
+                    if ($id[$i] === null) {
+                        throw ORMInvalidArgumentException::invalidIdentifierBindingEntity($className);
+                    }
+                }
+            }
+        }
+
         $sortedId = [];
 
         foreach ($class->identifier as $identifier) {

diff --git a/src/Proxy/ProxyFactory.php b/src/Proxy/ProxyFactory.php
@@ -26,6 +26,7 @@
 use function array_combine;
 use function array_flip;
 use function array_intersect_key;
+use function assert;
 use function bin2hex;
 use function chmod;
 use function class_exists;
@@ -465,8 +466,9 @@ private function getProxyFactory(string $className): Closure
         $initializer      = $this->createLazyInitializer($class, $entityPersister, $this->identifierFlattener);
         $proxyClassName   = $this->loadProxyClass($class);
         $identifierFields = array_intersect_key($class->getReflectionProperties(), $identifiers);
+        $em               = $this->em;
 
-        $proxyFactory = Closure::bind(static function (array $identifier) use ($initializer, $skippedProperties, $identifierFields, $className): InternalProxy {
+        $proxyFactory = Closure::bind(static function (array $identifier) use ($initializer, $skippedProperties, $identifierFields, $className, $class, $em): InternalProxy {
             $proxy = self::createLazyGhost(static function (InternalProxy $object) use ($initializer, $identifier): void {
                 $initializer($object, $identifier);
             }, $skippedProperties);
@@ -476,7 +478,17 @@ private function getProxyFactory(string $className): Closure
                     throw ORMInvalidArgumentException::missingPrimaryKeyValue($className, $idField);
                 }
 
-                $reflector->setValue($proxy, $identifier[$idField]);
+                assert($reflector !== null);
+
+                $idValue = $identifier[$idField];
+                if ($class->hasAssociation($idField)) {
+                    $idValue = $em->getReference(
+                        $class->getAssociationTargetClass($idField),
+                        $idValue,
+                    );
+                }
+
+                $reflector->setValue($proxy, $idValue);
             }
 
             return $proxy;

diff --git a/tests/Tests/Models/RelationAsId/Group.php b/tests/Tests/Models/RelationAsId/Group.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\RelationAsId;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="relation_as_id_group")
+ */
+class Group
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column
+     */
+    public int $id;
+
+    /**
+     * @ORM\Column
+     */
+    public string $name;
+}
diff --git a/tests/Tests/Models/RelationAsId/Membership.php b/tests/Tests/Models/RelationAsId/Membership.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\RelationAsId;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="relation_as_id_membership")
+ */
+class Membership
+{
+    /**
+     * @ORM\Id
+     * @ORM\ManyToOne
+     */
+    public User $user;
+
+    /**
+     * @ORM\Id
+     * @ORM\ManyToOne
+     */
+    public Group $group;
+
+    /**
+     * @ORM\Column
+     */
+    public string $role;
+}
diff --git a/tests/Tests/Models/RelationAsId/Profile.php b/tests/Tests/Models/RelationAsId/Profile.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\RelationAsId;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="relation_as_id_profile")
+ */
+class Profile
+{
+    /**
+     * @ORM\Id
+     * @ORM\OneToOne
+     */
+    public User $user;
+
+    /**
+     * @ORM\Column
+     */
+    public string $url;
+}
diff --git a/tests/Tests/Models/RelationAsId/User.php b/tests/Tests/Models/RelationAsId/User.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\RelationAsId;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="relation_as_id_user")
+ */
+class User
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column
+     */
+    public int $id;
+
+    /**
+     * @ORM\Column
+     */
+    public string $name;
+}