RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

CS fixes.

Browse Source
This commit is contained in:
Guilherme Blanco 2013-07-30 12:11:08 -04:00 committed by Benjamin Eberlei
parent 3f1003fee9
commit 5b8d6a1486
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
View File

@ -146,6 +146,7 @@ class ArrayHydrator extends AbstractHydrator
$baseElement =& $this->_resultPointers[$parent]; $baseElement =& $this->_resultPointers[$parent];
} else { } else {
unset($this->_resultPointers[$dqlAlias]); // Ticket #1228 unset($this->_resultPointers[$dqlAlias]); // Ticket #1228
continue; continue;
} }
@ -167,6 +168,7 @@ class ArrayHydrator extends AbstractHydrator
if ( ! $indexExists || ! $indexIsValid) { if ( ! $indexExists || ! $indexIsValid) {
$element = $data; $element = $data;
if (isset($this->_rsm->indexByMap[$dqlAlias])) { if (isset($this->_rsm->indexByMap[$dqlAlias])) {
$baseElement[$relationAlias][$row[$this->_rsm->indexByMap[$dqlAlias]]] = $element; $baseElement[$relationAlias][$row[$this->_rsm->indexByMap[$dqlAlias]]] = $element;
} else { } else {
@ -183,9 +185,15 @@ class ArrayHydrator extends AbstractHydrator
} else { } else {
$oneToOne = true; $oneToOne = true;
if ( ! isset($nonemptyComponents[$dqlAlias]) && ! isset($baseElement[$relationAlias])) { if (
( ! isset($nonemptyComponents[$dqlAlias])) &&
( ! isset($baseElement[$relationAlias]))
) {
$baseElement[$relationAlias] = null; $baseElement[$relationAlias] = null;
} else if ( ! isset($baseElement[$relationAlias]) || ! isset($this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]])) { } else if (
( ! isset($baseElement[$relationAlias])) ||
( ! isset($this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]]))
) {
$baseElement[$relationAlias] = $data; $baseElement[$relationAlias] = $data;
} }
} }
@ -195,7 +203,6 @@ class ArrayHydrator extends AbstractHydrator
if ($coll !== null) { if ($coll !== null) {
$this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne); $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
} }
} else { } else {
// It's a root result element // It's a root result element
@ -204,7 +211,7 @@ class ArrayHydrator extends AbstractHydrator
// if this row has a NULL value for the root result id then make it a null result. // if this row has a NULL value for the root result id then make it a null result.
if ( ! isset($nonemptyComponents[$dqlAlias]) ) { if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
$result[] = ($this->_rsm->isMixed) $result[] = $this->_rsm->isMixed
? array($entityKey => null) ? array($entityKey => null)
: null; : null;
@ -216,11 +223,9 @@ class ArrayHydrator extends AbstractHydrator
// Check for an existing element // Check for an existing element
if ($this->_isSimpleQuery || ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) { if ($this->_isSimpleQuery || ! isset($this->_identifierMap[$dqlAlias][$id[$dqlAlias]])) {
$element = $rowData[$dqlAlias]; $element = $this->_rsm->isMixed
? array($entityKey => $rowData[$dqlAlias])
if ($this->_rsm->isMixed) { : $rowData[$dqlAlias];
$element = array($entityKey => $element);
}
if (isset($this->_rsm->indexByMap[$dqlAlias])) { if (isset($this->_rsm->indexByMap[$dqlAlias])) {
$resultKey = $row[$this->_rsm->indexByMap[$dqlAlias]]; $resultKey = $row[$this->_rsm->indexByMap[$dqlAlias]];
@ -228,6 +233,7 @@ class ArrayHydrator extends AbstractHydrator
} else { } else {
$resultKey = $this->_resultCounter; $resultKey = $this->_resultCounter;
$result[] = $element; $result[] = $element;
++$this->_resultCounter; ++$this->_resultCounter;
} }
@ -235,6 +241,7 @@ class ArrayHydrator extends AbstractHydrator
} else { } else {
$index = $this->_identifierMap[$dqlAlias][$id[$dqlAlias]]; $index = $this->_identifierMap[$dqlAlias][$id[$dqlAlias]];
$resultKey = $index; $resultKey = $index;
/*if ($this->_rsm->isMixed) { /*if ($this->_rsm->isMixed) {
$result[] =& $result[$index]; $result[] =& $result[$index];
++$this->_resultCounter; ++$this->_resultCounter;
@ -249,11 +256,9 @@ class ArrayHydrator extends AbstractHydrator
if (isset($scalars)) { if (isset($scalars)) {
if ( ! isset($resultKey) ) { if ( ! isset($resultKey) ) {
// this only ever happens when no object is fetched (scalar result only) // this only ever happens when no object is fetched (scalar result only)
if (isset($this->_rsm->indexByMap['scalars'])) { $resultKey = isset($this->_rsm->indexByMap['scalars'])
$resultKey = $row[$this->_rsm->indexByMap['scalars']]; ? $row[$this->_rsm->indexByMap['scalars']]
} else { : $this->_resultCounter - 1;
$resultKey = $this->_resultCounter - 1;
}
} }
foreach ($scalars as $name => $value) { foreach ($scalars as $name => $value) {