RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #943 from jankramer/handle-embeddables-in-embeddables

Browse Source 
Validate embeddables do not contain other embeddables.
This commit is contained in:
Benjamin Eberlei 2014-02-09 11:06:43 +01:00
commit 3c2b626102
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -3162,6 +3162,10 @@ class ClassMetadataInfo implements ClassMetadata
*/
public function mapEmbedded(array $mapping)
{
if ($this->isEmbeddedClass) {
throw MappingException::noEmbeddablesInEmbeddable($this->name);
}
$this->assertFieldNotMapped($mapping['fieldName']);
$this->embeddedClasses[$mapping['fieldName']] = array(

8
lib/Doctrine/ORM/Mapping/MappingException.php
View File

@ -781,4 +781,12 @@ class MappingException extends \Doctrine\ORM\ORMException
sprintf('Missing "sequenceName" attribute for sequence id generator definition on class "%s".', $className)
);
}
public static function noEmbeddablesInEmbeddable($className)
{
return new self(sprintf(
"You embedded one or more embeddables in embeddable '%s', but this behavior is currently unsupported.",
$className
));
}
}

33
tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
View File

@ -162,6 +162,23 @@ class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
$reloadedCar = $this->_em->find(__NAMESPACE__.'\\DDC93Car', $car->id);
$this->assertEquals($car, $reloadedCar);
}
public function testEmbeddableWithinEmbeddable()
{
$this->setExpectedException(
'Doctrine\ORM\Mapping\MappingException',
sprintf(
"You embedded one or more embeddables in embeddable '%s', but this behavior is currently unsupported.",
__NAMESPACE__ . '\DDC93ContactInfo'
)
);
$this->_schemaTool->createSchema(array(
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Customer'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93ContactInfo'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93PhoneNumber')
));
}
}
/**
@ -263,3 +280,19 @@ class DDC93Address
}
}
/** @Entity */
class DDC93Customer
{
/** @Id @GeneratedValue @Column(type="integer") */
private $id;
/** @Embedded(class = "DDC93ContactInfo", columnPrefix = "contact_info_") */
private $contactInfo;
}
/** @Embeddable */
class DDC93ContactInfo
{
/** @Embedded(class = "DDC93Address") */
private $address;
}