Permalink
Browse files

Merge pull request #362 from odolbeau/cs

Correct some mistakes (tabs & trailing spaces)
  • Loading branch information...
2 parents e8ad82c + 79a9ce5 commit 27b4f58b66f643de90d698429e622ce28696fe27 @guilhermeblanco guilhermeblanco committed Jun 15, 2012
View
4 lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
@@ -81,7 +81,7 @@ public function hasChangedField($field)
*/
public function getOldValue($field)
{
- $this->assertValidField($field);
+ $this->assertValidField($field);
return $this->entityChangeSet[$field][0];
}
@@ -119,7 +119,7 @@ public function setNewValue($field, $value)
*/
private function assertValidField($field)
{
- if ( ! isset($this->entityChangeSet[$field])) {
+ if ( ! isset($this->entityChangeSet[$field])) {
throw new \InvalidArgumentException(sprintf(
'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
$field,
View
1 lib/Doctrine/ORM/Id/AssignedGenerator.php
@@ -20,7 +20,6 @@
namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\ORMException;
/**
View
2 lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
@@ -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])) {
View
2 lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php
@@ -19,8 +19,6 @@
namespace Doctrine\ORM\Internal\Hydration;
-use Doctrine\DBAL\Connection;
-
/**
* Hydrator that produces flat, rectangular results of scalar data.
* The created result is almost the same as a regular SQL result set, except
View
4 lib/Doctrine/ORM/Query.php
@@ -347,8 +347,8 @@ 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.
+ * @return CacheDriver The cache driver used for query caching or NULL, if
+ * this Query does not use query caching.
*/
public function getQueryCacheDriver()
{
View
2 lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
@@ -19,9 +19,7 @@
namespace Doctrine\ORM\Query\AST\Functions;
-use Doctrine\ORM\Query\Lexer;
use Doctrine\ORM\Query\SqlWalker;
-use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\QueryException;
/**
View
6 lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1852,7 +1852,7 @@ public function walkInstanceOfExpression($instanceOfExpr)
$dqlAlias = $instanceOfExpr->identificationVariable;
$discrClass = $class = $this->_queryComponents[$dqlAlias]['metadata'];
-
+
if ($class->discriminatorColumn) {
$discrClass = $this->_em->getClassMetadata($class->rootEntityName);
}
@@ -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) . ')';
}
/**
View
1 lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php
@@ -20,7 +20,6 @@
namespace Doctrine\ORM\Tools\Console\Command;
use Doctrine\ORM\Mapping\MappingException;
-use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Command\Command;
View
2 lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
@@ -104,7 +104,7 @@ public function walkSelectStatement(SelectStatement $AST)
$pathExpression->type = PathExpression::TYPE_STATE_FIELD;
$AST->selectClause->selectExpressions[] = new SelectExpression(
$pathExpression,
- '_dctrn_ord' . $this->_aliasCounter++
+ '_dctrn_ord' . $this->_aliasCounter++
);
}
}

0 comments on commit 27b4f58

Please sign in to comment.