Skip to content

Commit

Permalink
Add some corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
odolbeau committed Jun 5, 2012
1 parent 7ca0ac2 commit 79a9ce5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ protected function hydrateRowData(array $row, array &$cache, array &$result)
// Get a reference to the right element in the result tree.
// This element will get the associated element attached.
if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) {
$first = reset($this->_resultPointers);
$first = reset($this->_resultPointers);
// TODO: Exception if $key === null ?
$baseElement =& $this->_resultPointers[$parent][key($first)];
} else if (isset($this->_resultPointers[$parent])) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public function useQueryCache($bool)
* Returns the cache driver used for query caching.
*
* @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()
{
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/Query/SqlWalker.php
Original file line number Diff line number Diff line change
Expand Up @@ -2046,8 +2046,8 @@ public function walkInputParameter($inputParam)
public function walkArithmeticExpression($arithmeticExpr)
{
return ($arithmeticExpr->isSimpleArithmeticExpression())
? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
: '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
: '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
}

/**
Expand Down

0 comments on commit 79a9ce5

Please sign in to comment.