RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-22 15:13:13 +03:00
Code Issues Projects Releases Wiki Activity

#1196 DDC-3418 DDC-3419 - refactoring class metadata factory to avoid duplicate checks

Browse Source
This commit is contained in:
Marco Pivetta 2014-11-27 18:54:10 +01:00
parent 7648a3c590
commit b761d84d4f
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,8 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
} }
} }
if ($parent && $parent->isInheritanceTypeSingleTable()) { if ($parent) {
if ($parent->isInheritanceTypeSingleTable()) {
$class->setPrimaryTable($parent->table); $class->setPrimaryTable($parent->table);
} }
@ -179,29 +180,30 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
$this->addInheritedIndexes($class, $parent); $this->addInheritedIndexes($class, $parent);
} }
if ($parent && $parent->cache) { if ($parent->cache) {
$class->cache = $parent->cache; $class->cache = $parent->cache;
} }
if ($parent && $parent->containsForeignIdentifier) { if ($parent->containsForeignIdentifier) {
$class->containsForeignIdentifier = true; $class->containsForeignIdentifier = true;
} }
if ($parent && !empty($parent->namedQueries)) { if ( ! empty($parent->namedQueries)) {
$this->addInheritedNamedQueries($class, $parent); $this->addInheritedNamedQueries($class, $parent);
} }
if ($parent && !empty($parent->namedNativeQueries)) { if ( ! empty($parent->namedNativeQueries)) {
$this->addInheritedNamedNativeQueries($class, $parent); $this->addInheritedNamedNativeQueries($class, $parent);
} }
if ($parent && !empty($parent->sqlResultSetMappings)) { if ( ! empty($parent->sqlResultSetMappings)) {
$this->addInheritedSqlResultSetMappings($class, $parent); $this->addInheritedSqlResultSetMappings($class, $parent);
} }
if ($parent && !empty($parent->entityListeners) && empty($class->entityListeners)) { if ( ! empty($parent->entityListeners) && empty($class->entityListeners)) {
$class->entityListeners = $parent->entityListeners; $class->entityListeners = $parent->entityListeners;
} }
}
$class->setParentClasses($nonSuperclassParents); $class->setParentClasses($nonSuperclassParents);