Merge pull request doctrine#797 from peterkokot/patch-1

CS fixes
vend · Nov 16, 2013 · 3529cd4 · 3529cd4
2 parents 2925fea + dca0914
commit 3529cd4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -477,7 +477,7 @@ protected function hydrateRowData(array $row, array &$cache, array &$result)
                             $targetClass = $this->ce[$relation['targetEntity']];
 
                             if ($relation['isOwningSide']) {
-                                //TODO: Just check hints['fetched'] here?
+                                // TODO: Just check hints['fetched'] here?
                                 // If there is an inverse mapping on the target class its bidirectional
                                 if ($relation['inversedBy']) {
                                     $inverseAssoc = $targetClass->associationMappings[$relation['inversedBy']];

diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -328,7 +328,7 @@ protected function fetchVersionValue($versionedClass, $id)
         $identifier     = $this->quoteStrategy->getIdentifierColumnNames($versionedClass, $this->platform);
         $columnName     = $this->quoteStrategy->getColumnName($versionField, $versionedClass, $this->platform);
 
-        //FIXME: Order with composite keys might not be correct
+        // FIXME: Order with composite keys might not be correct
         $sql = 'SELECT ' . $columnName
              . ' FROM '  . $tableName
              . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
@@ -1976,4 +1976,4 @@ protected function generateFilterConditionSQL(ClassMetadata $targetEntity, $targ
         $sql = implode(' AND ', $filterClauses);
         return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
-}
+}
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php
@@ -82,7 +82,7 @@ public function getSql(SqlWalker $sqlWalker)
             }
         }
 
-        //The table with the relation may be a subclass, so get the table name from the association definition
+        // The table with the relation may be a subclass, so get the table name from the association definition
         $tableName = $sqlWalker->getEntityManager()->getClassMetadata($assoc['sourceEntity'])->getTableName();
 
         $tableAlias = $sqlWalker->getSQLTableAlias($tableName, $dqlAlias);

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -1878,7 +1878,7 @@ public function ScalarExpression()
             case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
                 return $this->SimpleArithmeticExpression();
 
-            //this check must be done before checking for a filed path expression
+            // this check must be done before checking for a filed path expression
             case ($this->isFunction()):
                 $this->lexer->peek(); // "("
 
@@ -1896,7 +1896,7 @@ public function ScalarExpression()
                 }
 
                 break;
-            //it is no function, so it must be a field path
+            // it is no function, so it must be a field path
             case ($lookahead === Lexer::T_IDENTIFIER):
                 $this->lexer->peek(); // lookahead => '.'
                 $this->lexer->peek(); // lookahead => token after '.'
@@ -2431,7 +2431,7 @@ public function SimpleConditionalExpression()
 
             switch ($peek['value']) {
                 case '(':
-                    //Peeks beyond the matched closing parenthesis.
+                    // Peeks beyond the matched closing parenthesis.
                     $token = $this->peekBeyondClosingParenthesis(false);
 
                     if ($token['type'] === Lexer::T_NOT) {

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
@@ -134,7 +134,7 @@ public function export()
         }
 
         foreach ($this->_metadata as $metadata) {
-            //In case output is returned, write it to a file, skip otherwise
+            // In case output is returned, write it to a file, skip otherwise
             if($output = $this->exportClassMetadata($metadata)){
                 $path = $this->_generateOutputPath($metadata);
                 $dir = dirname($path);

diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -166,7 +166,7 @@ public function walkSelectStatement(SelectStatement $AST)
 
         if ($this->platform instanceof PostgreSqlPlatform ||
             $this->platform instanceof OraclePlatform) {
-            //http://www.doctrine-project.org/jira/browse/DDC-1958
+            // http://www.doctrine-project.org/jira/browse/DDC-1958
             $this->preserveSqlOrdering($AST, $sqlIdentifier, $innerSql, $sql);
         }
 
@@ -215,7 +215,7 @@ public function preserveSqlOrdering(SelectStatement $AST, array $sqlIdentifier,
                     }
                 }
             }
-            //remove identifier aliases
+            // remove identifier aliases
             $sqlOrderColumns = array_diff($sqlOrderColumns, $sqlIdentifier);
         }
 

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2406,7 +2406,7 @@ public function scheduleCollectionDeletion(PersistentCollection $coll)
     {
         $coid = spl_object_hash($coll);
 
-        //TODO: if $coll is already scheduled for recreation ... what to do?
+        // TODO: if $coll is already scheduled for recreation ... what to do?
         // Just remove $coll from the scheduled recreations?
         if (isset($this->collectionUpdates[$coid])) {
             unset($this->collectionUpdates[$coid]);