From 7f8a5f113c76f139800d6275216887b938afbc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Thu, 9 Jun 2016 19:46:37 +0000
Subject: [PATCH] Allow the usage of embedded objects on parent classes.

The `ClassMetadataInfo` was always using the "current class" to
fetch the reflection of a property even when a field is declared
on the parent class (which causes `ReflectionProperty` to throw
an exception).
---
 .../ORM/Mapping/ClassMetadataInfo.php         |  9 ++-
 .../Tests/Models/DDC3303/DDC3303Address.php   | 60 ++++++++++++++++++
 .../Tests/Models/DDC3303/DDC3303Employee.php  | 39 ++++++++++++
 .../Tests/Models/DDC3303/DDC3303Person.php    | 61 +++++++++++++++++++
 .../ORM/Functional/Ticket/DDC3303Test.php     | 32 ++++++++++
 5 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 tests/Doctrine/Tests/Models/DDC3303/DDC3303Address.php
 create mode 100644 tests/Doctrine/Tests/Models/DDC3303/DDC3303Employee.php
 create mode 100644 tests/Doctrine/Tests/Models/DDC3303/DDC3303Person.php
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3303Test.php

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 90db1f8a6fa..5fa8f9e07dd 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -941,8 +941,13 @@ public function wakeupReflection($reflService)
                 continue;
             }
 
-            $parentReflFields[$property] = $reflService->getAccessibleProperty($this->name, $property);
-            $this->reflFields[$property] = $reflService->getAccessibleProperty($this->name, $property);
+            $fieldRefl = $reflService->getAccessibleProperty(
+                isset($embeddedClass['declared']) ? $embeddedClass['declared'] : $this->name,
+                $property
+            );
+
+            $parentReflFields[$property] = $fieldRefl;
+            $this->reflFields[$property] = $fieldRefl;
         }
 
         foreach ($this->fieldMappings as $field => $mapping) {
diff --git a/tests/Doctrine/Tests/Models/DDC3303/DDC3303Address.php b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Address.php
new file mode 100644
index 00000000000..c3b634abf6c
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Address.php
@@ -0,0 +1,60 @@
+<?php
+namespace Doctrine\Tests\Models\DDC3303;
+
+/**
+ * @Embeddable
+ */
+class DDC3303Address
+{
+    /**
+     * @Column(type="string")
+     *
+     * @var string
+     */
+    private $street;
+
+    /**
+     * @Column(type="integer")
+     *
+     * @var int
+     */
+    private $number;
+
+    /**
+     * @Column(type="string")
+     *
+     * @var string
+     */
+    private $city;
+
+    public function __construct($street, $number, $city)
+    {
+        $this->street = $street;
+        $this->number = $number;
+        $this->city = $city;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStreet()
+    {
+        return $this->street;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getNumber()
+    {
+        return $this->number;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCity()
+    {
+        return $this->city;
+    }
+}
diff --git a/tests/Doctrine/Tests/Models/DDC3303/DDC3303Employee.php b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Employee.php
new file mode 100644
index 00000000000..334dc20529b
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Employee.php
@@ -0,0 +1,39 @@
+<?php
+namespace Doctrine\Tests\Models\DDC3303;
+
+/**
+ * @Entity
+ * @Table(name="ddc3303_employee")
+ */
+class DDC3303Employee extends DDC3303Person
+{
+    /**
+     * @Column(type="string")
+     *
+     * @var string
+     */
+    private $company;
+
+    public function __construct($name, DDC3303Address $address, $company)
+    {
+        parent::__construct($name, $address);
+
+        $this->company = $company;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCompany()
+    {
+        return $this->company;
+    }
+
+    /**
+     * @param string $company
+     */
+    public function setCompany($company)
+    {
+        $this->company = $company;
+    }
+}
diff --git a/tests/Doctrine/Tests/Models/DDC3303/DDC3303Person.php b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Person.php
new file mode 100644
index 00000000000..da42d1c5446
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3303/DDC3303Person.php
@@ -0,0 +1,61 @@
+<?php
+namespace Doctrine\Tests\Models\DDC3303;
+
+/**
+ * @MappedSuperclass
+ */
+abstract class DDC3303Person
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @Column(type="string")
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @Embedded(class="DDC3303Address")
+     *
+     * @var DDC3303Address
+     */
+    private $address;
+
+    public function __construct($name, DDC3303Address $address)
+    {
+        $this->name = $name;
+        $this->address = $address;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return DDC3303Address
+     */
+    public function getAddress()
+    {
+        return $this->address;
+    }
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3303Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3303Test.php
new file mode 100644
index 00000000000..e6415d3937a
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3303Test.php
@@ -0,0 +1,32 @@
+<?php
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\DDC3303\DDC3303Address;
+use Doctrine\Tests\Models\DDC3303\DDC3303Employee;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class DDC3303Test extends OrmFunctionalTestCase
+{
+    /**
+     * @before
+     */
+    public function createSchema()
+    {
+        $this->_schemaTool->createSchema(array($this->_em->getClassMetadata(DDC3303Employee::class)));
+    }
+
+    public function testEmbeddedObjectsAreAlsoInherited()
+    {
+        $employee = new DDC3303Employee(
+            'John Doe',
+            new DDC3303Address('Somewhere', 123, 'Over the rainbow'),
+            'Doctrine Inc'
+        );
+
+        $this->_em->persist($employee);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->assertEquals($employee, $this->_em->find(DDC3303Employee::class, 1));
+    }
+}