1
0
mirror of synced 2024-12-05 03:06:05 +03:00

Merge pull request #1311 from jankramer/DDC-3582-nested-embeddable-hydration

[DDC-3582] Wrong class is instantiated when using nested embeddables
This commit is contained in:
Guilherme Blanco 2015-02-27 10:31:58 -05:00
commit 6e40361fe7
2 changed files with 71 additions and 1 deletions

View File

@ -934,7 +934,7 @@ class ClassMetadataInfo implements ClassMetadata
$this->embeddedClasses[$embeddedClass['declaredField']]['class'],
$embeddedClass['originalField']
),
$embeddedClass['class']
$this->embeddedClasses[$embeddedClass['declaredField']]['class']
);
continue;

View File

@ -0,0 +1,70 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
class DDC3582Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
function testNestedEmbeddablesAreHydratedWithProperClass()
{
$this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC3582Entity::CLASSNAME)]);
$this->_em->persist(new DDC3582Entity('foo'));
$this->_em->flush();
$this->_em->clear();
/** @var DDC3582Entity $entity */
$entity = $this->_em->find(DDC3582Entity::CLASSNAME, 'foo');
$this->assertInstanceOf(DDC3582Embeddable1::CLASSNAME, $entity->embeddable1);
$this->assertInstanceOf(DDC3582Embeddable2::CLASSNAME, $entity->embeddable1->embeddable2);
$this->assertInstanceOf(DDC3582Embeddable3::CLASSNAME, $entity->embeddable1->embeddable2->embeddable3);
}
}
/** @Entity */
class DDC3582Entity
{
const CLASSNAME = __CLASS__;
/** @Column @Id */
private $id;
/** @Embedded(class="DDC3582Embeddable1") @var DDC3582Embeddable1 */
public $embeddable1;
public function __construct($id)
{
$this->id = $id;
$this->embeddable1 = new DDC3582Embeddable1();
}
}
/** @Embeddable */
class DDC3582Embeddable1
{
const CLASSNAME = __CLASS__;
/** @Embedded(class="DDC3582Embeddable2") @var DDC3582Embeddable2 */
public $embeddable2;
public function __construct() { $this->embeddable2 = new DDC3582Embeddable2(); }
}
/** @Embeddable */
class DDC3582Embeddable2
{
const CLASSNAME = __CLASS__;
/** @Embedded(class="DDC3582Embeddable3") @var DDC3582Embeddable3 */
public $embeddable3;
public function __construct() { $this->embeddable3 = new DDC3582Embeddable3(); }
}
/** @Embeddable */
class DDC3582Embeddable3
{
const CLASSNAME = __CLASS__;
/** @Column */
public $embeddedValue = 'foo';
}