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

Remove tabs & trailing spaces

Browse source
This commit is contained in:
Olivier Dolbeau 2012-06-05 15:40:44 +02:00
parent c98f9117c2
commit 7ca0ac289e
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
View file

@ -81,7 +81,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs
*/ */
public function getOldValue($field) public function getOldValue($field)
{ {
$this->assertValidField($field); $this->assertValidField($field);
return $this->entityChangeSet[$field][0]; return $this->entityChangeSet[$field][0];
} }
@ -119,7 +119,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs
*/ */
private function assertValidField($field) private function assertValidField($field)
{ {
if ( ! isset($this->entityChangeSet[$field])) { if ( ! isset($this->entityChangeSet[$field])) {
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.', 'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
$field, $field,

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])) {

4
lib/Doctrine/ORM/Query.php
View file

@ -347,8 +347,8 @@ 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 this * @return CacheDriver The cache driver used for query caching or NULL, if
* Query does not use query caching. * this Query does not use query caching.
*/ */
public function getQueryCacheDriver() public function getQueryCacheDriver()
{ {

6
lib/Doctrine/ORM/Query/SqlWalker.php
View file

@ -1852,7 +1852,7 @@ class SqlWalker implements TreeWalker
$dqlAlias = $instanceOfExpr->identificationVariable; $dqlAlias = $instanceOfExpr->identificationVariable;
$discrClass = $class = $this->_queryComponents[$dqlAlias]['metadata']; $discrClass = $class = $this->_queryComponents[$dqlAlias]['metadata'];
if ($class->discriminatorColumn) { if ($class->discriminatorColumn) {
$discrClass = $this->_em->getClassMetadata($class->rootEntityName); $discrClass = $this->_em->getClassMetadata($class->rootEntityName);
} }
@ -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) . ')';
} }
/** /**

2
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
View file

@ -104,7 +104,7 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
$pathExpression->type = PathExpression::TYPE_STATE_FIELD; $pathExpression->type = PathExpression::TYPE_STATE_FIELD;
$AST->selectClause->selectExpressions[] = new SelectExpression( $AST->selectClause->selectExpressions[] = new SelectExpression(
$pathExpression, $pathExpression,
'_dctrn_ord' . $this->_aliasCounter++ '_dctrn_ord' . $this->_aliasCounter++
); );
} }
} }