From a360da5a7e5463f6c12b0922f6063e1cf32dde6d Mon Sep 17 00:00:00 2001
From: Marcin Szulc <necsord@gmail.com>
Date: Fri, 3 Feb 2017 23:54:27 +0100
Subject: [PATCH] Fix lazy loading of 1-to-1 relationship with custom id object

Fixing case when lazy loading of entity in one-to-one relationship on the side without foreign key
did not return eht entity because of custom type not being detected and properly formatted before
applying to database query.

Closes https://github.com/doctrine/doctrine2/issues/5887
---
 .../Entity/BasicEntityPersister.php           |   2 +-
 .../ORM/Functional/Ticket/GH5887Test.php      | 234 ++++++++++++++++++
 2 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php

diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
index f3cdc7055..28dc9179a 100644
--- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -785,7 +785,7 @@ class BasicEntityPersister implements EntityPersister
 
             // unset the old value and set the new sql aliased value here. By definition
             // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method.
-            $identifier[$this->getSQLTableAlias($targetClass->name) . "." . $targetKeyColumn] =
+            $identifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
                 $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
 
             unset($identifier[$targetKeyColumn]);
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php
new file mode 100644
index 000000000..f19dd5924
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php
@@ -0,0 +1,234 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group 5887
+ */
+class GH5887Test extends OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        Type::addType(GH5887CustomIdObjectType::NAME, GH5887CustomIdObjectType::class);
+
+        $this->_schemaTool->createSchema(
+            [
+                $this->_em->getClassMetadata(GH5887Cart::class),
+                $this->_em->getClassMetadata(GH5887Customer::class),
+            ]
+        );
+    }
+
+    public function testLazyLoadsForeignEntitiesInOneToOneRelationWhileHavingCustomIdObject()
+    {
+        $customerId = new GH5887CustomIdObject(1);
+        $customer = new GH5887Customer();
+        $customer->setId($customerId);
+
+        $cartId = 2;
+        $cart = new GH5887Cart();
+        $cart->setId($cartId);
+        $cart->setCustomer($customer);
+
+        $this->_em->persist($customer);
+        $this->_em->persist($cart);
+        $this->_em->flush();
+
+        // Clearing cached entities
+        $this->_em->clear();
+
+        $customerRepository = $this->_em->getRepository(GH5887Customer::class);
+        /** @var GH5887Customer $customer */
+        $customer = $customerRepository->createQueryBuilder('c')
+            ->where('c.id = :id')
+            ->setParameter('id', $customerId->getId())
+            ->getQuery()
+            ->getOneOrNullResult();
+
+        $this->assertInstanceOf(GH5887Cart::class, $customer->getCart());
+    }
+}
+
+/**
+ * @Entity
+ */
+class GH5887Cart
+{
+    /**
+     * @var int
+     *
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="NONE")
+     */
+    private $id;
+
+    /**
+     * One Cart has One Customer.
+     *
+     * @var GH5887Customer
+     *
+     * @OneToOne(targetEntity="GH5887Customer", inversedBy="cart")
+     * @JoinColumn(name="customer_id", referencedColumnName="id")
+     */
+    private $customer;
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return GH5887Customer
+     */
+    public function getCustomer()
+    {
+        return $this->customer;
+    }
+
+    /**
+     * @param GH5887Customer $customer
+     */
+    public function setCustomer(GH5887Customer $customer)
+    {
+        if ($this->customer !== $customer) {
+            $this->customer = $customer;
+            $customer->setCart($this);
+        }
+    }
+}
+
+/**
+ * @Entity
+ */
+class GH5887Customer
+{
+    /**
+     * @var GH5887CustomIdObject
+     *
+     * @Id
+     * @Column(type="GH5887CustomIdObject")
+     * @GeneratedValue(strategy="NONE")
+     */
+    private $id;
+
+    /**
+     * One Customer has One Cart.
+     *
+     * @var GH5887Cart
+     *
+     * @OneToOne(targetEntity="GH5887Cart", mappedBy="customer")
+     */
+    private $cart;
+
+    /**
+     * @return GH5887CustomIdObject
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param GH5887CustomIdObject $id
+     */
+    public function setId(GH5887CustomIdObject $id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return GH5887Cart
+     */
+    public function getCart(): GH5887Cart
+    {
+        return $this->cart;
+    }
+
+    /**
+     * @param GH5887Cart $cart
+     */
+    public function setCart(GH5887Cart $cart)
+    {
+        if ($this->cart !== $cart) {
+            $this->cart = $cart;
+            $cart->setCustomer($this);
+        }
+    }
+}
+
+class GH5887CustomIdObject
+{
+    /**
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @param int $id
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function __toString()
+    {
+        return 'non existing id';
+    }
+}
+
+class GH5887CustomIdObjectType extends StringType
+{
+    const NAME = 'GH5887CustomIdObject';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    {
+        return $value->getId();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertToPHPValue($value, AbstractPlatform $platform)
+    {
+        return new GH5887CustomIdObject($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+}