RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

#1130 DDC-3300 - rewording and clarifying logic that re-maps discriminator values when needed

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-16 16:46:29 +01:00
parent 635d2c141f
commit e969a6be85
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View File

@ -30,7 +30,6 @@ use Doctrine\ORM\Events;
use Doctrine\ORM\Id\BigIntegerIdentityGenerator; use Doctrine\ORM\Id\BigIntegerIdentityGenerator;
use Doctrine\ORM\Id\IdentityGenerator; use Doctrine\ORM\Id\IdentityGenerator;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Exception;
use ReflectionException; use ReflectionException;
/** /**
@ -75,11 +74,10 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* {@inheritDoc} * {@inheritDoc}
*/ */
protected function loadMetadata($name) protected function loadMetadata($name)
{ `` {
/* @var $loaded string[] */
$loaded = parent::loadMetadata($name); $loaded = parent::loadMetadata($name);
array_map([$this, 'populateDiscriminatorValue'], array_map([$this, 'getMetadataFor'], $loaded)); array_map([$this, 'resolveDiscriminatorValue'], array_map([$this, 'getMetadataFor'], $loaded));
return $loaded; return $loaded;
} }
@ -284,9 +282,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
if ( ! $class->discriminatorColumn) { if ( ! $class->discriminatorColumn) {
throw MappingException::missingDiscriminatorColumn($class->name); throw MappingException::missingDiscriminatorColumn($class->name);
} }
} else if (! $class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) {
// enforce discriminator map for all entities of an inheritance hierarchy, otherwise problems will occur.
//throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName);
} }
} else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) { } else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) {
// second condition is necessary for mapped superclasses in the middle of an inheritance hierarchy // second condition is necessary for mapped superclasses in the middle of an inheritance hierarchy
@ -312,7 +307,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* *
* @throws MappingException * @throws MappingException
*/ */
private function populateDiscriminatorValue(ClassMetadata $metadata) private function resolveDiscriminatorValue(ClassMetadata $metadata)
{ {
if ($metadata->discriminatorValue if ($metadata->discriminatorValue
|| ! $metadata->discriminatorMap || ! $metadata->discriminatorMap
@ -322,6 +317,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
return; return;
} }
// minor optimization: avoid loading related metadata when not needed
foreach ($metadata->discriminatorMap as $discriminatorValue => $discriminatorClass) { foreach ($metadata->discriminatorMap as $discriminatorValue => $discriminatorClass) {
if ($discriminatorClass === $metadata->name) { if ($discriminatorClass === $metadata->name) {
$metadata->discriminatorValue = $discriminatorValue; $metadata->discriminatorValue = $discriminatorValue;
@ -330,6 +326,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
} }
} }
// iterate over discriminator mappings and resolve actual referenced classes according to existing metadata
foreach ($metadata->discriminatorMap as $discriminatorValue => $discriminatorClass) { foreach ($metadata->discriminatorMap as $discriminatorValue => $discriminatorClass) {
if ($metadata->name === $this->getMetadataFor($discriminatorClass)->getName()) { if ($metadata->name === $this->getMetadataFor($discriminatorClass)->getName()) {
$metadata->discriminatorValue = $discriminatorValue; $metadata->discriminatorValue = $discriminatorValue;