RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixed ObjectHydrator when namespace alias is given.

Browse source
This commit is contained in:
Szczepan Cieślik 2013-01-24 15:50:05 +01:00
parent f5f583d1cc
commit 23e0bb7345
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View file

@ -83,7 +83,7 @@ class ObjectHydrator extends AbstractHydrator
*/ */
private $existingCollections = array(); private $existingCollections = array();
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function prepare() protected function prepare()
@ -102,6 +102,12 @@ class ObjectHydrator extends AbstractHydrator
$this->identifierMap[$dqlAlias] = array(); $this->identifierMap[$dqlAlias] = array();
$this->idTemplate[$dqlAlias] = ''; $this->idTemplate[$dqlAlias] = '';
// Check for namespace alias.
if (strpos($className, ':') !== false) {
$metadata = $this->_em->getClassMetadata($className);
$className = $metadata->name;
}
if ( ! isset($this->ce[$className])) { if ( ! isset($this->ce[$className])) {
$this->ce[$className] = $this->_em->getClassMetadata($className); $this->ce[$className] = $this->_em->getClassMetadata($className);
} }
@ -525,7 +531,7 @@ class ObjectHydrator extends AbstractHydrator
// check for existing result from the iterations before // check for existing result from the iterations before
if ( ! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) { if ( ! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
$element = $this->getEntity($rowData[$dqlAlias], $dqlAlias); $element = $this->getEntity($rowData[$dqlAlias], $dqlAlias);
if ($this->_rsm->isMixed) { if ($this->_rsm->isMixed) {
$element = array($entityKey => $element); $element = array($entityKey => $element);
} }
@ -597,7 +603,7 @@ class ObjectHydrator extends AbstractHydrator
if ($count === 1) { if ($count === 1) {
$result[$resultKey] = $obj; $result[$resultKey] = $obj;
continue; continue;
} }