RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 20:11:49 +03:00
Code Issues Projects Releases Wiki Activity

Small refactorings.

Browse Source
This commit is contained in:
Roman S. Borschel 2010-04-14 10:46:35 +02:00
parent 6d08164162
commit 4106002344
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -410,12 +410,12 @@ abstract class AbstractQuery
throw new NonUniqueResultException; throw new NonUniqueResultException;
} }
return array_shift($result); return array_shift($result);
} else if (is_object($result)) { }/* else if (is_object($result)) {
if (count($result) > 1) { if (count($result) > 1) {
throw new NonUniqueResultException; throw new NonUniqueResultException;
} }
return $result->first(); return $result->first();
} }*/
return $result; return $result;
} }

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

@ -207,15 +207,12 @@ class ClassMetadataFactory
$loaded = array(); $loaded = array();
// Collect parent classes, ignoring transient (not-mapped) classes. // Collect parent classes, ignoring transient (not-mapped) classes.
//TODO: Evaluate whether we can use class_parents() here.
$parentClass = $name;
$parentClasses = array(); $parentClasses = array();
while ($parentClass = get_parent_class($parentClass)) { foreach (array_reverse(class_parents($name)) as $parentClass) {
if ( ! $this->_driver->isTransient($parentClass)) { if ( ! $this->_driver->isTransient($parentClass)) {
$parentClasses[] = $parentClass; $parentClasses[] = $parentClass;
} }
} }
$parentClasses = array_reverse($parentClasses);
$parentClasses[] = $name; $parentClasses[] = $name;
// Move down the hierarchy of parent classes, starting from the topmost class // Move down the hierarchy of parent classes, starting from the topmost class
@ -262,8 +259,8 @@ class ClassMetadataFactory
} else if ($parent->isIdGeneratorTable()) { } else if ($parent->isIdGeneratorTable()) {
$class->getTableGeneratorDefinition($parent->tableGeneratorDefinition); $class->getTableGeneratorDefinition($parent->tableGeneratorDefinition);
} }
if ($generatorType = $parent->generatorType) { if ($parent->generatorType) {
$class->setIdGeneratorType($generatorType); $class->setIdGeneratorType($parent->generatorType);
} }
if ($parent->idGenerator) { if ($parent->idGenerator) {
$class->setIdGenerator($parent->idGenerator); $class->setIdGenerator($parent->idGenerator);