doctrine / orm

lib/Doctrine/ORM/PersistentCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
      * Internal note: Tried to implement Serializable first but that did not work well
      *                with circular references. This solution seems simpler and works well.
      *
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +2 added lines, -2 removed lines

@@ -403,7 +403,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -436,7 +436,7 @@ 
             && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }
 

lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Persisters\Collection;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Proxy\Proxy;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Utility\PersisterHelper;

Indentation +3 added lines, -3 removed lines

@@ -147,9 +147,9 @@
         return (bool) $persister->count($criteria);
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function contains(PersistentCollection $collection, $element)
     {
         if ( ! $this->isValidEntityState($element)) {

Spacing +9 added lines, -9 removed lines

@@ -218,8 +218,8 @@ 
             $parameters[] = $identifier[$sourceClass->getFieldForColumn($joinColumn['referencedColumnName'])];
         }
 
-        $statement = 'DELETE FROM ' . $this->quoteStrategy->getTableName($targetClass, $this->platform)
-            . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        $statement = 'DELETE FROM '.$this->quoteStrategy->getTableName($targetClass, $this->platform)
+            . ' WHERE '.implode(' = ? AND ', $columns).' = ?';
 
         return $this->conn->executeUpdate($statement, $parameters);
     }
@@ -256,18 +256,18 @@ 
             );
         }
 
-        $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable
-            . ' (' . $this->platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $statement = $this->platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable
+            . ' ('.$this->platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->conn->executeUpdate($statement);
 
         // 2) Build insert table records into temporary table
         $query = $this->em->createQuery(
-            ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
-            . ' FROM ' . $targetClass->name . ' t0 WHERE t0.' . $mapping['mappedBy'] . ' = :owner'
+            ' SELECT t0.'.implode(', t0.', $rootClass->getIdentifierFieldNames())
+            . ' FROM '.$targetClass->name.' t0 WHERE t0.'.$mapping['mappedBy'].' = :owner'
         )->setParameter('owner', $collection->getOwner());
 
-        $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ') ' . $query->getSQL();
+        $statement  = 'INSERT INTO '.$tempTable.' ('.$idColumnList.') '.$query->getSQL();
         $parameters = array_values($sourceClass->getIdentifierValues($collection->getOwner()));
         $numDeleted = $this->conn->executeUpdate($statement, $parameters);
 
@@ -276,8 +276,8 @@ 
 
         foreach (array_reverse($classNames) as $className) {
             $tableName = $this->quoteStrategy->getTableName($this->em->getClassMetadata($className), $this->platform);
-            $statement = 'DELETE FROM ' . $tableName . ' WHERE (' . $idColumnList . ')'
-                . ' IN (SELECT ' . $idColumnList . ' FROM ' . $tempTable . ')';
+            $statement = 'DELETE FROM '.$tableName.' WHERE ('.$idColumnList.')'
+                . ' IN (SELECT '.$idColumnList.' FROM '.$tempTable.')';
 
             $this->conn->executeUpdate($statement);
         }

lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php

Unused Use Statements -3 removed lines

@@ -20,11 +20,8 @@
 namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Query\ResultSetMapping;
-
 use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Type;
-
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Utility\PersisterHelper;
 

Spacing +19 added lines, -19 removed lines

@@ -208,7 +208,7 @@ 
                 }
 
                 foreach ($data as $columnName => $value) {
-                    if (!is_array($id) || !isset($id[$columnName])) {
+                    if ( ! is_array($id) || ! isset($id[$columnName])) {
                         $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]);
                     }
                 }
@@ -323,7 +323,7 @@ 
         // If the current class in the root entity, add the filters
         if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -342,29 +342,29 @@ 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
 
-                $lockSql = ' ' . $this->platform->getReadLockSql();
+                $lockSql = ' '.$this->platform->getReadLockSql();
 
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
 
-                $lockSql = ' ' . $this->platform->getWriteLockSql();
+                $lockSql = ' '.$this->platform->getWriteLockSql();
 
                 break;
         }
 
         $tableName  = $this->quoteStrategy->getTableName($this->class, $this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql != '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql != '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT '  . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -384,14 +384,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -410,16 +410,16 @@ 
             $conditions     = array();
             $tableAlias     = $this->getSQLTableAlias($parentClassName);
             $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql       .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -488,7 +488,7 @@ 
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -603,11 +603,11 @@ 
             $conditions   = array();
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableAlias   = $this->getSQLTableAlias($parentClassName);
-            $joinSql     .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -618,10 +618,10 @@ 
             $conditions  = array();
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);

lib/Doctrine/ORM/Proxy/ProxyFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * @param EntityManagerInterface $em           The EntityManager the new factory works for.
      * @param string                 $proxyDir     The directory to use for the proxy classes. It must exist.
      * @param string                 $proxyNs      The namespace to use for the proxy classes.
-     * @param boolean|int            $autoGenerate The strategy for automatically generating proxy classes. Possible
+     * @param integer            $autoGenerate The strategy for automatically generating proxy classes. Possible
      *                                             values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
      */
     public function __construct(EntityManagerInterface $em, $proxyDir, $proxyNs, $autoGenerate = AbstractProxyFactory::AUTOGENERATE_NEVER)

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
     {
         $wakeupProxy = $classMetadata->getReflectionClass()->hasMethod('__wakeup');
 
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
             $initializer = $proxy->__getInitializer();
             $cloner      = $proxy->__getCloner();
 
@@ -177,7 +177,7 @@ 
      */
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
     {
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata) {
             if ($proxy->__isInitialized()) {
                 return;
             }

lib/Doctrine/ORM/Query/AST/UpdateItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
     /**
      * @param PathExpression                           $pathExpression
-     * @param InputParameter|ArithmeticExpression|null $newValue
+     * @param ArithmeticExpression|null $newValue
      */
     public function __construct($pathExpression, $newValue)
     {

lib/Doctrine/ORM/Query/Expr.php

Doc Comments +8 added lines, -9 removed lines

@@ -106,8 +106,8 @@ 
      *     // u.id = ?1
      *     $expr->eq('u.id', '?1');
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param string $x Left expression.
+     * @param string $y Right expression.
      *
      * @return Expr\Comparison
      */
@@ -125,8 +125,8 @@ 
      *     // u.id <> ?1
      *     $q->where($q->expr()->neq('u.id', '?1'));
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param string $x Left expression.
+     * @param string $y Right expression.
      *
      * @return Expr\Comparison
      */
@@ -436,7 +436,7 @@ 
      * Creates an IN() expression with the given arguments.
      *
      * @param string $x Field in string format to be restricted by IN() function.
-     * @param mixed  $y Argument to be used in IN() function.
+     * @param string  $y Argument to be used in IN() function.
      *
      * @return Expr\Func
      */
@@ -457,7 +457,7 @@ 
      * Creates a NOT IN() expression with the given arguments.
      *
      * @param string $x Field in string format to be restricted by NOT IN() function.
-     * @param mixed  $y Argument to be used in NOT IN() function.
+     * @param string  $y Argument to be used in NOT IN() function.
      *
      * @return Expr\Func
      */
@@ -502,7 +502,7 @@ 
      * Creates a LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -528,7 +528,6 @@ 
      * Creates a CONCAT() function expression with the given arguments.
      *
      * @param mixed $x First argument to be used in CONCAT() function.
-     * @param mixed $y,... Other arguments to be used in CONCAT() function.
      *
      * @return Expr\Func
      */
@@ -629,7 +628,7 @@ 
      * @param integer $x   Starting range value to be used in BETWEEN() function.
      * @param integer $y   End point value to be used in BETWEEN() function.
      *
-     * @return Expr\Func A BETWEEN expression.
+     * @return string A BETWEEN expression.
      */
     public function between($val, $x, $y)
     {

Spacing +8 added lines, -8 removed lines

@@ -268,7 +268,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -450,7 +450,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -471,7 +471,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -495,7 +495,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -613,12 +613,12 @@ 
      */
     private function _quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         } else {
-            return "'" . str_replace("'", "''", $literal) . "'";
+            return "'".str_replace("'", "''", $literal)."'";
         }
     }
 
@@ -633,7 +633,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**

lib/Doctrine/ORM/Query/Parser.php

Doc Comments +6 added lines, -6 removed lines

@@ -412,7 +412,7 @@ 
      * declarations (from ... x join ... y join ... z ...) appear in the query
      * as the hydration process relies on that order for proper operation.
      *
-     * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST
+     * @param AST\SelectStatement $AST
      *
      * @return void
      */
@@ -748,7 +748,7 @@ 
      * SingleValuedAssociationPathExpression ::= IdentificationVariable "." SingleValuedAssociationField
      * CollectionValuedPathExpression        ::= IdentificationVariable "." CollectionValuedAssociationField
      *
-     * @param mixed $AST
+     * @param AST\SelectStatement $AST
      *
      * @return void
      */
@@ -1622,7 +1622,7 @@ 
      * accessible is "FROM", prohibiting an easy implementation without larger
      * changes.}
      *
-     * @return \Doctrine\ORM\Query\AST\SubselectIdentificationVariableDeclaration |
+     * @return AST\IdentificationVariableDeclaration |
      *         \Doctrine\ORM\Query\AST\IdentificationVariableDeclaration
      */
     public function SubselectIdentificationVariableDeclaration()
@@ -1760,7 +1760,7 @@ 
     /**
      * JoinAssociationDeclaration ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy]
      *
-     * @return \Doctrine\ORM\Query\AST\JoinAssociationPathExpression
+     * @return AST\JoinAssociationDeclaration
      */
     public function JoinAssociationDeclaration()
     {
@@ -1798,7 +1798,7 @@ 
      * PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet
      * PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}"
      *
-     * @return array
+     * @return AST\PartialObjectExpression
      */
     public function PartialObjectExpression()
     {
@@ -2877,7 +2877,7 @@ 
     /**
      * StringExpression ::= StringPrimary | ResultVariable | "(" Subselect ")"
      *
-     * @return \Doctrine\ORM\Query\AST\StringPrimary |
+     * @return null|AST\Node |
      *         \Doctrine\ORM\Query\AST\Subselect |
      *         string
      */

Spacing +14 added lines, -14 removed lines

@@ -396,7 +396,7 @@ 
             $this->queryComponents = $treeWalkerChain->getQueryComponents();
         }
 
-        $outputWalkerClass = $this->customOutputWalker ?: __NAMESPACE__ . '\SqlWalker';
+        $outputWalkerClass = $this->customOutputWalker ?: __NAMESPACE__.'\SqlWalker';
         $outputWalker      = new $outputWalkerClass($this->query, $this->parserResult, $this->queryComponents);
 
         // Assign an SQL executor to the parser result
@@ -491,7 +491,7 @@ 
         $tokenStr = substr($dql, $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
     }
@@ -638,7 +638,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -690,13 +690,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -767,7 +767,7 @@ 
             // Check if field or association exists
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
                 $this->semanticalError(
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
+                    'Class '.$class->name.' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -807,8 +807,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= (count($expectedStringTypes) == 1)
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -981,7 +981,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -996,7 +996,7 @@ 
      */
     private function validateAbstractSchemaName($schemaName)
     {
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
         }
     }
@@ -1052,7 +1052,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1066,7 +1066,7 @@ 
         $class = $qComp['metadata'];
 
         if ( ! $class->hasAssociation($field)) {
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2488,7 +2488,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], array("=",  "<", "<=", "<>", ">", ">=", "!=")) ||
+        if (in_array($peek['value'], array("=", "<", "<=", "<>", ">", ">=", "!=")) ||
             in_array($peek['type'], array(Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS)) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2593,7 +2593,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Doctrine/ORM/Query/QueryExpressionVisitor.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Query;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\Common\Collections\Expr\ExpressionVisitor;
 use Doctrine\Common\Collections\Expr\Comparison;
 use Doctrine\Common\Collections\Expr\CompositeExpression;

Spacing +9 added lines, -9 removed lines

@@ -114,7 +114,7 @@ 
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
                 return new Expr\Andx($expressionList);
 
@@ -122,7 +122,7 @@ 
                 return new Expr\Orx($expressionList);
 
             default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
         }
     }
 
@@ -136,10 +136,10 @@ 
             throw new QueryException('No aliases are set before invoking walkComparison().');
         }
 
-        $field = $this->queryAliases[0] . '.' . $comparison->getField();
+        $field = $this->queryAliases[0].'.'.$comparison->getField();
 
-        foreach($this->queryAliases as $alias) {
-            if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
+        foreach ($this->queryAliases as $alias) {
+            if (strpos($comparison->getField().'.', $alias.'.') === 0) {
                 $field = $comparison->getField();
                 break;
             }
@@ -149,13 +149,13 @@ 
 
         foreach ($this->parameters as $parameter) {
             if ($parameter->getName() === $parameterName) {
-                $parameterName .= '_' . count($this->parameters);
+                $parameterName .= '_'.count($this->parameters);
                 break;
             }
         }
 
         $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue()));
-        $placeholder = ':' . $parameterName;
+        $placeholder = ':'.$parameterName;
 
         switch ($comparison->getOperator()) {
             case Comparison::IN:
@@ -182,7 +182,7 @@ 
                 
                 return $this->expr->neq($field, $placeholder);
             case Comparison::CONTAINS:
-                $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
                 
                 return $this->expr->like($field, $placeholder);
@@ -198,7 +198,7 @@ 
                     );
                 }
 
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
+                throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator());
         }
     }
 

lib/Doctrine/ORM/Query/ResultSetMapping.php

Doc Comments +1 added lines, -1 removed lines

@@ -389,7 +389,7 @@
     /**
      * Adds a metadata parameter mappings.
      *
-     * @param mixed  $parameter The parameter name in the SQL result set.
+     * @param string  $parameter The parameter name in the SQL result set.
      * @param string $attribute The metadata attribute.
      */
     public function addMetadataParameterMapping($parameter, $attribute)

Braces +3 added lines, -1 removed lines

@@ -227,7 +227,9 @@
         $found = false;
 
         foreach (array_merge($this->metaMappings, $this->fieldMappings) as $columnName => $columnFieldName) {
-            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) continue;
+            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) {
+                continue;
+            }
 
             $this->addIndexByColumn($alias, $columnName);
             $found = true;