Merge pull request doctrine#362 from odolbeau/cs

guilhermeblanco · guilhermeblanco · commit 27b4f58b66f6 · 2012-06-14T22:43:18.000-07:00
Correct some mistakes (tabs &amp; trailing spaces)
diff --git a/lib/Doctrine/ORM/Event/PreUpdateEventArgs.php b/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,
diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/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;
 
 /**
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php b/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])) {
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php b/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
diff --git a/lib/Doctrine/ORM/Query.php b/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()
     {
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php b/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;
 
 /**
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/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) . ')';
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php b/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;
diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php b/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++
                     );
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function hasChangedField($field)`
`81`	`81`	`*/`
`82`	`82`	`public function getOldValue($field)`
`83`	`83`	`{`
`84`		`- $this->assertValidField($field);`
	`84`	`+ $this->assertValidField($field);`
`85`	`85`
`86`	`86`	`return $this->entityChangeSet[$field][0];`
`87`	`87`	`}`
`@@ -119,7 +119,7 @@ public function setNewValue($field, $value)`
`119`	`119`	`*/`
`120`	`120`	`private function assertValidField($field)`
`121`	`121`	`{`
`122`		`- if ( ! isset($this->entityChangeSet[$field])) {`
	`122`	`+ if ( ! isset($this->entityChangeSet[$field])) {`
`123`	`123`	`throw new \InvalidArgumentException(sprintf(`
`124`	`124`	`'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',`
`125`	`125`	`$field,`
Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,8 @@ public function useQueryCache($bool)`
`347`	`347`	`/**`
`348`	`348`	`* Returns the cache driver used for query caching.`
`349`	`349`	`*`
`350`		`- * @return CacheDriver The cache driver used for query caching or NULL, if this`
`351`		`- * Query does not use query caching.`
	`350`	`+ * @return CacheDriver The cache driver used for query caching or NULL, if`
	`351`	`+ * this Query does not use query caching.`
`352`	`352`	`*/`
`353`	`353`	`public function getQueryCacheDriver()`
`354`	`354`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1852,7 +1852,7 @@ public function walkInstanceOfExpression($instanceOfExpr)`
`1852`	`1852`
`1853`	`1853`	`$dqlAlias = $instanceOfExpr->identificationVariable;`
`1854`	`1854`	`$discrClass = $class = $this->_queryComponents[$dqlAlias]['metadata'];`
`1855`		`-`
	`1855`	`+`
`1856`	`1856`	`if ($class->discriminatorColumn) {`
`1857`	`1857`	`$discrClass = $this->_em->getClassMetadata($class->rootEntityName);`
`1858`	`1858`	`}`
`@@ -2046,8 +2046,8 @@ public function walkInputParameter($inputParam)`
`2046`	`2046`	`public function walkArithmeticExpression($arithmeticExpr)`
`2047`	`2047`	`{`
`2048`	`2048`	`return ($arithmeticExpr->isSimpleArithmeticExpression())`
`2049`		`- ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)`
`2050`		`- : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';`
	`2049`	`+ ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)`
	`2050`	`+ : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';`
`2051`	`2051`	`}`
`2052`	`2052`
`2053`	`2053`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function walkSelectStatement(SelectStatement $AST)`
`104`	`104`	`$pathExpression->type = PathExpression::TYPE_STATE_FIELD;`
`105`	`105`	`$AST->selectClause->selectExpressions[] = new SelectExpression(`
`106`	`106`	`$pathExpression,`
`107`		`- '_dctrn_ord' . $this->_aliasCounter++`
	`107`	`+ '_dctrn_ord' . $this->_aliasCounter++`
`108`	`108`	`);`
`109`	`109`	`}`
`110`	`110`	`}`