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

Add some corrections

Browse Source
This commit is contained in:
Olivier Dolbeau 2012-06-05 21:32:53 +02:00
parent 7ca0ac289e
commit 79a9ce5000
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ class ArrayHydrator extends AbstractHydrator
// Get a reference to the right element in the result tree. // Get a reference to the right element in the result tree.
// This element will get the associated element attached. // This element will get the associated element attached.
if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) { if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) {
$first = reset($this->_resultPointers); $first = reset($this->_resultPointers);
// TODO: Exception if $key === null ? // TODO: Exception if $key === null ?
$baseElement =& $this->_resultPointers[$parent][key($first)]; $baseElement =& $this->_resultPointers[$parent][key($first)];
} else if (isset($this->_resultPointers[$parent])) { } else if (isset($this->_resultPointers[$parent])) {

2
lib/Doctrine/ORM/Query.php
View File

@ -348,7 +348,7 @@ final class Query extends AbstractQuery
* Returns the cache driver used for query caching. * Returns the cache driver used for query caching.
* *
* @return CacheDriver The cache driver used for query caching or NULL, if * @return CacheDriver The cache driver used for query caching or NULL, if
* this Query does not use query caching. * this Query does not use query caching.
*/ */
public function getQueryCacheDriver() public function getQueryCacheDriver()
{ {

4
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -2046,8 +2046,8 @@ class SqlWalker implements TreeWalker
public function walkArithmeticExpression($arithmeticExpr) public function walkArithmeticExpression($arithmeticExpr)
{ {
return ($arithmeticExpr->isSimpleArithmeticExpression()) return ($arithmeticExpr->isSimpleArithmeticExpression())
? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression) ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
: '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')'; : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
} }
/** /**