From dca09148ca8558c93fcbb3dc3c074eac94cdfe19 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 22 Sep 2013 02:12:30 +0200 Subject: [PATCH] CS fixes --- lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php | 2 +- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 2 +- lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php | 2 +- lib/Doctrine/ORM/Query/Parser.php | 6 +++--- lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php | 2 +- .../ORM/Tools/Pagination/LimitSubqueryOutputWalker.php | 4 ++-- lib/Doctrine/ORM/UnitOfWork.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index fafc497c0..859bd0b00 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -477,7 +477,7 @@ class ObjectHydrator extends AbstractHydrator $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 index 00b00cfa2..fc9b5cbe0 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -328,7 +328,7 @@ class BasicEntityPersister $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) . ' = ?'; diff --git a/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php index 58f0dde13..242a38bcf 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/IdentityFunction.php @@ -82,7 +82,7 @@ class IdentityFunction extends FunctionNode } } - //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 index 5c721a1d5..8ee9fed92 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -1878,7 +1878,7 @@ class Parser 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 @@ class Parser } 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 @@ class Parser 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 index d40d0786e..a0216bf91 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php @@ -134,7 +134,7 @@ abstract class AbstractExporter } 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 index 2ee5f9056..97140ecf1 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php @@ -162,7 +162,7 @@ class LimitSubqueryOutputWalker extends SqlWalker 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); } @@ -211,7 +211,7 @@ class LimitSubqueryOutputWalker extends SqlWalker } } } - //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 index 5de769f63..d00a87af7 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -2406,7 +2406,7 @@ class UnitOfWork implements PropertyChangedListener { $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]);