Correct some mistakes (tabs & trailing spaces) #362

Merged
merged 3 commits into from Jun 15, 2012

Projects

None yet

4 participants

@odolbeau
Contributor
odolbeau commented Jun 5, 2012

No description provided.

@stof stof commented on an outdated diff Jun 5, 2012
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);
stof
stof Jun 5, 2012 Member

too much indentation here

@stof stof and 1 other commented on an outdated diff Jun 5, 2012
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.
*/
stof
stof Jun 5, 2012 Member

this is wrong and should be reverted

odolbeau
odolbeau Jun 5, 2012 Contributor

There was tabs.
How should it be formatted?

stof
stof Jun 5, 2012 Member

The second line of the description should probably be aligned with the first one here. Aligning it with the @return tag itself makes it less readable IMO

@stof stof commented on an outdated diff Jun 5, 2012
lib/Doctrine/ORM/Query/SqlWalker.php
@@ -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) . ')';
stof
stof Jun 5, 2012 Member

it should use only 4 spaces, not 8

This pull request passes (merged 7ca0ac2 into 9445502).

This pull request passes (merged 79a9ce5 into 9445502).

@guilhermeblanco guilhermeblanco merged commit 27b4f58 into doctrine:master Jun 15, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment