doctrine / orm

lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php

Spacing +3 added lines, -3 removed lines

@@ -74,13 +74,13 @@
 
         switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
-                return '(' . implode(' AND ', $expressionList) . ')';
+                return '('.implode(' AND ', $expressionList).')';
 
             case CompositeExpression::TYPE_OR:
-                return '(' . implode(' OR ', $expressionList) . ')';
+                return '('.implode(' OR ', $expressionList).')';
 
             default:
-                throw new RuntimeException('Unknown composite ' . $expr->getType());
+                throw new RuntimeException('Unknown composite '.$expr->getType());
         }
     }
 

lib/Doctrine/ORM/Query/Lexer.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 
             // Recognize identifiers, aliased or qualified names
             case ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\':
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
 
                 if (defined($name)) {
                     $type = constant($name);

lib/Doctrine/ORM/Query/Expr/Base.php

Spacing +4 added lines, -4 removed lines

@@ -63,12 +63,12 @@ 
      */
     public function add($arg)
     {
-        if ($arg !== null && (! $arg instanceof self || $arg->count() > 0)) {
+        if ($arg !== null && ( ! $arg instanceof self || $arg->count() > 0)) {
             // If we decide to keep Expr\Base instances, we can use this check
-            if (! is_string($arg)) {
+            if ( ! is_string($arg)) {
                 $class = get_class($arg);
 
-                if (! in_array($class, $this->allowedClasses, true)) {
+                if ( ! in_array($class, $this->allowedClasses, true)) {
                     throw new InvalidArgumentException(
                         sprintf("Expression of type '%s' not allowed in this context.", $class)
                     );
@@ -98,6 +98,6 @@ 
             return (string) $this->parts[0];
         }
 
-        return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator;
+        return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator;
     }
 }

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +124 added lines, -124 removed lines

@@ -272,10 +272,10 @@ 
      */
     public function getSQLTableAlias($tableName, $dqlAlias = '')
     {
-        $tableName .= $dqlAlias ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= $dqlAlias ? '@['.$dqlAlias.']' : '';
 
-        if (! isset($this->tableAliasMap[$tableName])) {
-            $this->tableAliasMap[$tableName] = 't' . $this->tableAliasCounter++;
+        if ( ! isset($this->tableAliasMap[$tableName])) {
+            $this->tableAliasMap[$tableName] = 't'.$this->tableAliasCounter++;
         }
 
         return $this->tableAliasMap[$tableName];
@@ -293,7 +293,7 @@ 
      */
     public function setSQLTableAlias($tableName, $alias, $dqlAlias = '')
     {
-        $tableName .= $dqlAlias ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= $dqlAlias ? '@['.$dqlAlias.']' : '';
 
         $this->tableAliasMap[$tableName] = $alias;
 
@@ -307,7 +307,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->aliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->aliasCounter++);
     }
 
     /**
@@ -334,14 +334,14 @@ 
 
             // If this is a joined association we must use left joins to preserve the correct result.
             $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER ';
-            $sql .= 'JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= 'JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($class->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $filterSql = $this->generateFilterConditionSQL($parentClass, $tableAlias);
@@ -365,14 +365,14 @@ 
             $tableName  = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
 
-            $sql .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($subClass->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -393,7 +393,7 @@ 
             $qComp       = $this->queryComponents[$dqlAlias];
             $association = $qComp['relation'];
 
-            if (! ($association instanceof ToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -401,7 +401,7 @@ 
                 $property      = $qComp['metadata']->getProperty($fieldName);
                 $tableName     = $property->getTableName();
                 $columnName    = $this->platform->quoteIdentifier($property->getColumnName());
-                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias) . '.' . $columnName;
+                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias).'.'.$columnName;
 
                 // OrderByClause should replace an ordered relation. see - DDC-2475
                 if (isset($this->orderedColumnsMap[$orderedColumn])) {
@@ -409,7 +409,7 @@ 
                 }
 
                 $this->orderedColumnsMap[$orderedColumn] = $orientation;
-                $orderedColumns[]                        = $orderedColumn . ' ' . $orientation;
+                $orderedColumns[]                        = $orderedColumn.' '.$orientation;
             }
         }
 
@@ -449,19 +449,19 @@ 
             $discrColumnType  = $discrColumn->getType();
             $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
             $sqlTableAlias    = $this->useSqlTableAliases
-                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
                 : '';
 
             $sqlParts[] = sprintf(
                 '%s IN (%s)',
-                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
                 implode(', ', $values)
             );
         }
 
         $sql = implode(' AND ', $sqlParts);
 
-        return isset($sqlParts[1]) ? '(' . $sql . ')' : $sql;
+        return isset($sqlParts[1]) ? '('.$sql.')' : $sql;
     }
 
     /**
@@ -474,7 +474,7 @@ 
      */
     private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (! $this->em->hasFilters()) {
+        if ( ! $this->em->hasFilters()) {
             return '';
         }
 
@@ -507,7 +507,7 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -538,11 +538,11 @@ 
             $sql .= $this->walkOrderByClause($AST->orderByClause);
         }
 
-        if (! $AST->orderByClause) {
+        if ( ! $AST->orderByClause) {
             $orderBySql = $this->generateOrderedCollectionOrderByItems();
 
             if ($orderBySql) {
-                $sql .= ' ORDER BY ' . $orderBySql;
+                $sql .= ' ORDER BY '.$orderBySql;
             }
         }
 
@@ -555,11 +555,11 @@ 
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_READ) {
-            return $sql . ' ' . $this->platform->getReadLockSQL();
+            return $sql.' '.$this->platform->getReadLockSQL();
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_WRITE) {
-            return $sql . ' ' . $this->platform->getWriteLockSQL();
+            return $sql.' '.$this->platform->getWriteLockSQL();
         }
 
         if ($lockMode !== LockMode::OPTIMISTIC) {
@@ -567,7 +567,7 @@ 
         }
 
         foreach ($this->selectedClasses as $selectedClass) {
-            if (! $selectedClass['class']->isVersioned()) {
+            if ( ! $selectedClass['class']->isVersioned()) {
                 throw OptimisticLockException::lockFailed($selectedClass['class']->getClassName());
             }
         }
@@ -616,7 +616,7 @@ 
         foreach ($class->getIdentifierColumns($this->em) as $column) {
             $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-            $sqlParts[] = $tableAlias . '.' . $quotedColumnName;
+            $sqlParts[] = $tableAlias.'.'.$quotedColumnName;
         }
 
         return implode(', ', $sqlParts);
@@ -634,7 +634,7 @@ 
     {
         $class = $this->queryComponents[$identificationVariable]['metadata'];
 
-        if (! $fieldName) {
+        if ( ! $fieldName) {
             return $this->getSQLTableAlias($class->getTableName(), $identificationVariable);
         }
 
@@ -663,7 +663,7 @@ 
                 $property  = $class->getProperty($fieldName);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($property->getColumnName());
@@ -677,7 +677,7 @@ 
                 $class       = $this->queryComponents[$dqlAlias]['metadata'];
                 $association = $class->getProperty($fieldName);
 
-                if (! $association->isOwningSide()) {
+                if ( ! $association->isOwningSide()) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -691,7 +691,7 @@ 
                 $joinColumn = reset($joinColumns);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias) . '.';
+                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($joinColumn->getColumnName());
@@ -709,7 +709,7 @@ 
      */
     public function walkSelectClause($selectClause)
     {
-        $sql                  = 'SELECT ' . ($selectClause->isDistinct ? 'DISTINCT ' : '');
+        $sql                  = 'SELECT '.($selectClause->isDistinct ? 'DISTINCT ' : '');
         $sqlSelectExpressions = array_filter(array_map([$this, 'walkSelectExpression'], $selectClause->selectExpressions));
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true && $selectClause->isDistinct) {
@@ -752,7 +752,7 @@ 
 
                 $sqlSelectExpressions[] = sprintf(
                     '%s AS %s',
-                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . '.' . $quotedColumnName, $this->platform),
+                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.'.'.$quotedColumnName, $this->platform),
                     $sqlColumnAlias
                 );
 
@@ -762,7 +762,7 @@ 
 
             // Add foreign key columns of class and also parent classes
             foreach ($class->getDeclaredPropertiesIterator() as $association) {
-                if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
+                if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
                     || ( ! $addMetaColumns && ! $association->isPrimaryKey())) {
                     continue;
                 }
@@ -777,7 +777,7 @@ 
                     $columnAlias          = $this->getSQLColumnAlias();
                     $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                     }
 
@@ -793,7 +793,7 @@ 
             }
 
             // Add foreign key columns to SQL, if necessary
-            if (! $addMetaColumns) {
+            if ( ! $addMetaColumns) {
                 continue;
             }
 
@@ -807,7 +807,7 @@ 
                         continue;
                     }
 
-                    if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
+                    if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
                         continue;
                     }
 
@@ -821,7 +821,7 @@ 
                         $columnAlias          = $this->getSQLColumnAlias();
                         $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -838,7 +838,7 @@ 
             }
         }
 
-        return $sql . implode(', ', $sqlSelectExpressions);
+        return $sql.implode(', ', $sqlSelectExpressions);
     }
 
     /**
@@ -853,7 +853,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -928,7 +928,7 @@ 
         $tableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
         $sql = $this->platform->appendLockHint(
-            $tableName . ' ' . $tableAlias,
+            $tableName.' '.$tableAlias,
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
 
@@ -938,11 +938,11 @@ 
 
         $classTableInheritanceJoins = $this->generateClassTableInheritanceJoins($class, $dqlAlias);
 
-        if (! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+        if ( ! $buildNestedJoins) {
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -978,7 +978,7 @@ 
             : $association;
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true &&
-            (! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
+            ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
             if ($association instanceof ToManyAssociationMetadata) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($owningAssociation);
             }
@@ -1032,7 +1032,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } elseif ($owningAssociation instanceof ManyToManyAssociationMetadata) {
@@ -1059,7 +1059,7 @@ 
                 );
             }
 
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' ON ' . implode(' AND ', $conditions);
+            $sql .= $joinTableName.' '.$joinTableAlias.' ON '.implode(' AND ', $conditions);
 
             // Join target table
             $sql .= $joinType === AST\Join::JOIN_TYPE_LEFT || $joinType === AST\Join::JOIN_TYPE_LEFTOUTER ? ' LEFT JOIN ' : ' INNER JOIN ';
@@ -1097,7 +1097,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } else {
@@ -1105,23 +1105,23 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = $condExpr === null ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = $condExpr === null ? '' : ('('.$this->walkConditionalExpression($condExpr).')');
 
         if ($targetClass->inheritanceType === InheritanceType::JOINED) {
             $ctiJoins = $this->generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
 
             // If we have WITH condition, we need to build nested joins for target class table and cti joins
             if ($withCondition) {
-                $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
+                $sql .= '('.$targetTableJoin['table'].$ctiJoins.') ON '.$targetTableJoin['condition'];
             } else {
-                $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
+                $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'].$ctiJoins;
             }
         } else {
-            $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
+            $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'];
         }
 
         if ($withCondition) {
-            $sql .= ' AND ' . $withCondition;
+            $sql .= ' AND '.$withCondition;
         }
 
         // Apply the indexes
@@ -1155,7 +1155,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1172,10 +1172,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1183,7 +1183,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1206,7 +1206,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1231,7 +1231,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1261,7 +1261,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        return $sql . implode(', ', $scalarExpressions) . ')';
+        return $sql.implode(', ', $scalarExpressions).')';
     }
 
     /**
@@ -1281,7 +1281,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1294,11 +1294,11 @@ 
         $sql = 'CASE';
 
         foreach ($generalCaseExpression->whenClauses as $whenClause) {
-            $sql .= ' WHEN ' . $this->walkConditionalExpression($whenClause->caseConditionExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkConditionalExpression($whenClause->caseConditionExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
         }
 
-        return $sql . ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END';
+        return $sql.' ELSE '.$this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression).' END';
     }
 
     /**
@@ -1310,14 +1310,14 @@ 
      */
     public function walkSimpleCaseExpression($simpleCaseExpression)
     {
-        $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
+        $sql = 'CASE '.$this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
 
         foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) {
-            $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
         }
 
-        return $sql . ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
+        return $sql.' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END';
     }
 
     /**
@@ -1356,7 +1356,7 @@ 
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, $property->getType());
                     $this->scalarFields[$dqlAlias][$fieldName] = $columnAlias;
                 }
@@ -1377,11 +1377,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // Conceptually we could resolve field type here by traverse through AST to retrieve field type,
                     // but this is not a feasible solution; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
@@ -1392,11 +1392,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // We cannot resolve field type here; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
                 }
@@ -1420,7 +1420,7 @@ 
                 $class       = $queryComp['metadata'];
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: null;
 
-                if (! isset($this->selectedClasses[$dqlAlias])) {
+                if ( ! isset($this->selectedClasses[$dqlAlias])) {
                     $this->selectedClasses[$dqlAlias] = [
                         'class'       => $class,
                         'dqlAlias'    => $dqlAlias,
@@ -1432,7 +1432,7 @@ 
 
                 // Select all fields from the queried class
                 foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                    if (! ($property instanceof FieldMetadata)) {
+                    if ( ! ($property instanceof FieldMetadata)) {
                         continue;
                     }
 
@@ -1467,7 +1467,7 @@ 
                         $subClass = $this->em->getClassMetadata($subClassName);
 
                         foreach ($subClass->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                            if (! ($property instanceof FieldMetadata)) {
+                            if ( ! ($property instanceof FieldMetadata)) {
                                 continue;
                             }
 
@@ -1506,7 +1506,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1546,7 +1546,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1554,7 +1554,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1588,7 +1588,7 @@ 
                     break;
 
                 case $e instanceof AST\Subselect:
-                    $sqlSelectExpressions[] = '(' . $e->dispatch($this) . ') AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = '('.$e->dispatch($this).') AS '.$columnAlias;
                     break;
 
                 case $e instanceof AST\PathExpression:
@@ -1597,7 +1597,7 @@ 
                     $class     = $qComp['metadata'];
                     $fieldType = $class->getProperty($e->field)->getType();
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 case $e instanceof AST\Literal:
@@ -1611,11 +1611,11 @@ 
                             break;
                     }
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 default:
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
             }
 
@@ -1648,10 +1648,10 @@ 
             case $expr instanceof AST\Subselect:
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $columnAlias                        = 'sclr' . $this->aliasCounter++;
+                $columnAlias                        = 'sclr'.$this->aliasCounter++;
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
                 break;
 
             case $expr instanceof AST\Functions\FunctionNode:
@@ -1668,7 +1668,7 @@ 
                 $columnAlias                        = $this->getSQLColumnAlias();
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
                 break;
 
             case $expr instanceof AST\ParenthesisExpression:
@@ -1688,8 +1688,8 @@ 
      */
     public function walkAggregateExpression($aggExpression)
     {
-        return $aggExpression->functionName . '(' . ($aggExpression->isDistinct ? 'DISTINCT ' : '')
-            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression) . ')';
+        return $aggExpression->functionName.'('.($aggExpression->isDistinct ? 'DISTINCT ' : '')
+            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression).')';
     }
 
     /**
@@ -1703,7 +1703,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1712,7 +1712,7 @@ 
     public function walkGroupByItem($groupByItem)
     {
         // StateFieldPathExpression
-        if (! is_string($groupByItem)) {
+        if ( ! is_string($groupByItem)) {
             return $this->walkPathExpression($groupByItem);
         }
 
@@ -1766,7 +1766,7 @@ 
     {
         $class     = $this->em->getClassMetadata($deleteClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'DELETE FROM ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'DELETE FROM '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable);
 
@@ -1782,12 +1782,12 @@ 
     {
         $class     = $this->em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'UPDATE ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'UPDATE '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->rootAliases[] = $updateClause->aliasIdentificationVariable;
 
-        return $sql . ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        return $sql.' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
     }
 
     /**
@@ -1798,7 +1798,7 @@ 
         $useTableAliasesBefore    = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1842,7 +1842,7 @@ 
 
             if ($filterClauses) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1850,11 +1850,11 @@ 
         }
 
         if ($condSql) {
-            return ' WHERE ' . (! $discrSql ? $condSql : '(' . $condSql . ') AND ' . $discrSql);
+            return ' WHERE '.( ! $discrSql ? $condSql : '('.$condSql.') AND '.$discrSql);
         }
 
         if ($discrSql) {
-            return ' WHERE ' . $discrSql;
+            return ' WHERE '.$discrSql;
         }
 
         return '';
@@ -1867,7 +1867,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalExpression
         // if only one ConditionalTerm is defined
-        if (! ($condExpr instanceof AST\ConditionalExpression)) {
+        if ( ! ($condExpr instanceof AST\ConditionalExpression)) {
             return $this->walkConditionalTerm($condExpr);
         }
 
@@ -1881,7 +1881,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalTerm
         // if only one ConditionalFactor is defined
-        if (! ($condTerm instanceof AST\ConditionalTerm)) {
+        if ( ! ($condTerm instanceof AST\ConditionalTerm)) {
             return $this->walkConditionalFactor($condTerm);
         }
 
@@ -1897,7 +1897,7 @@ 
         // if only one ConditionalPrimary is defined
         return ! ($factor instanceof AST\ConditionalFactor)
             ? $this->walkConditionalPrimary($factor)
-            : ($factor->not ? 'NOT ' : '') . $this->walkConditionalPrimary($factor->conditionalPrimary);
+            : ($factor->not ? 'NOT ' : '').$this->walkConditionalPrimary($factor->conditionalPrimary);
     }
 
     /**
@@ -1912,7 +1912,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
     }
 
@@ -1923,7 +1923,7 @@ 
     {
         $sql = $existsExpr->not ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1971,7 +1971,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $targetTableName . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $targetTableName.' '.$targetTableAlias.' WHERE ';
 
             $sqlParts = [];
 
@@ -1992,7 +1992,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -2006,7 +2006,7 @@ 
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
             // join to target table
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' INNER JOIN ' . $targetTableName . ' ' . $targetTableAlias . ' ON ';
+            $sql .= $joinTableName.' '.$joinTableAlias.' INNER JOIN '.$targetTableName.' '.$targetTableAlias.' ON ';
 
             // join conditions
             $joinSqlParts = [];
@@ -2055,13 +2055,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2072,7 +2072,7 @@ 
         $sizeFunc                           = new AST\Functions\SizeFunction('size');
         $sizeFunc->collectionPathExpression = $emptyCollCompExpr->expression;
 
-        return $sizeFunc->getSql($this) . ($emptyCollCompExpr->not ? ' > 0' : ' = 0');
+        return $sizeFunc->getSql($this).($emptyCollCompExpr->not ? ' > 0' : ' = 0');
     }
 
     /**
@@ -2081,19 +2081,19 @@ 
     public function walkNullComparisonExpression($nullCompExpr)
     {
         $expression = $nullCompExpr->expression;
-        $comparison = ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL';
+        $comparison = ' IS'.($nullCompExpr->not ? ' NOT' : '').' NULL';
 
         // Handle ResultVariable
         if (is_string($expression) && isset($this->queryComponents[$expression]['resultVariable'])) {
-            return $this->walkResultVariable($expression) . $comparison;
+            return $this->walkResultVariable($expression).$comparison;
         }
 
         // Handle InputParameter mapping inclusion to ParserResult
         if ($expression instanceof AST\InputParameter) {
-            return $this->walkInputParameter($expression) . $comparison;
+            return $this->walkInputParameter($expression).$comparison;
         }
 
-        return $expression->dispatch($this) . $comparison;
+        return $expression->dispatch($this).$comparison;
     }
 
     /**
@@ -2101,7 +2101,7 @@ 
      */
     public function walkInExpression($inExpr)
     {
-        $sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';
+        $sql = $this->walkArithmeticExpression($inExpr->expression).($inExpr->not ? ' NOT' : '').' IN (';
 
         $sql .= $inExpr->subselect
             ? $this->walkSubselect($inExpr->subselect)
@@ -2126,12 +2126,12 @@ 
         $discrColumnType  = $discrColumn->getType();
         $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
         $sqlTableAlias    = $this->useSqlTableAliases
-            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
             : '';
 
         return sprintf(
             '%s %sIN %s',
-            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
             ($instanceOfExpr->not ? 'NOT ' : ''),
             $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr)
         );
@@ -2178,8 +2178,8 @@ 
             $sql .= ' NOT';
         }
 
-        return $sql . ' BETWEEN ' . $this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
-            . ' AND ' . $this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
+        return $sql.' BETWEEN '.$this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
+            . ' AND '.$this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
     }
 
     /**
@@ -2192,7 +2192,7 @@ 
             ? $this->walkResultVariable($stringExpr)
             : $stringExpr->dispatch($this);
 
-        $sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE ';
+        $sql = $leftExpr.($likeExpr->not ? ' NOT' : '').' LIKE ';
 
         if ($likeExpr->stringPattern instanceof AST\InputParameter) {
             $sql .= $this->walkInputParameter($likeExpr->stringPattern);
@@ -2205,7 +2205,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2232,7 +2232,7 @@ 
             ? $leftExpr->dispatch($this)
             : (is_numeric($leftExpr) ? $leftExpr : $this->conn->quote($leftExpr));
 
-        $sql .= ' ' . $compExpr->operator . ' ';
+        $sql .= ' '.$compExpr->operator.' ';
 
         $sql .= $rightExpr instanceof AST\Node
             ? $rightExpr->dispatch($this)
@@ -2268,7 +2268,7 @@ 
     {
         return $arithmeticExpr->isSimpleArithmeticExpression()
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2276,7 +2276,7 @@ 
      */
     public function walkSimpleArithmeticExpression($simpleArithmeticExpr)
     {
-        if (! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
+        if ( ! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
             return $this->walkArithmeticTerm($simpleArithmeticExpr);
         }
 
@@ -2296,7 +2296,7 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticTerm
         // if only one ArithmeticFactor is defined
-        if (! ($term instanceof AST\ArithmeticTerm)) {
+        if ( ! ($term instanceof AST\ArithmeticTerm)) {
             return $this->walkArithmeticFactor($term);
         }
 
@@ -2316,13 +2316,13 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticFactor
         // if only one ArithmeticPrimary is defined
-        if (! ($factor instanceof AST\ArithmeticFactor)) {
+        if ( ! ($factor instanceof AST\ArithmeticFactor)) {
             return $this->walkArithmeticPrimary($factor);
         }
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2335,7 +2335,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2393,7 +2393,7 @@ 
             $entityClassName = $entityClass->getClassName();
 
             if ($entityClassName !== $rootClass->getClassName()) {
-                if (! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
+                if ( ! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
                     throw QueryException::instanceOfUnrelatedClass($entityClassName, $rootClass->getClassName());
                 }
             }
@@ -2405,6 +2405,6 @@ 
             $sqlParameterList[] = $this->conn->quote($discriminator);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }

lib/Doctrine/ORM/Query/Parser.php

Spacing +31 added lines, -31 removed lines

@@ -397,7 +397,7 @@ 
         }
 
         foreach ($this->queryComponents as $dqlAlias => $qComp) {
-            if (! isset($this->identVariableExpressions[$dqlAlias])) {
+            if ( ! isset($this->identVariableExpressions[$dqlAlias])) {
                 continue;
             }
 
@@ -461,7 +461,7 @@ 
         $tokenStr = substr($dql, (int) $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,
@@ -564,7 +564,7 @@ 
             $identVariable = $deferredItem['expression'];
 
             // Check if IdentificationVariable exists in queryComponents
-            if (! isset($this->queryComponents[$identVariable])) {
+            if ( ! isset($this->queryComponents[$identVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $identVariable),
                     $deferredItem['token']
@@ -574,7 +574,7 @@ 
             $qComp = $this->queryComponents[$identVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['metadata'])) {
+            if ( ! isset($qComp['metadata'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a Class.", $identVariable),
                     $deferredItem['token']
@@ -608,7 +608,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;
@@ -616,13 +616,13 @@ 
                 }
             }
 
-            if (! class_exists($className)) {
+            if ( ! class_exists($className)) {
                 $this->semanticalError(sprintf('Class "%s" is not defined.', $className), $token);
             }
 
             $class = new ReflectionClass($className);
 
-            if (! $class->isInstantiable()) {
+            if ( ! $class->isInstantiable()) {
                 $this->semanticalError(sprintf('Class "%s" can not be instantiated.', $className), $token);
             }
 
@@ -679,7 +679,7 @@ 
             $resultVariable = $deferredItem['expression'];
 
             // Check if ResultVariable exists in queryComponents
-            if (! isset($this->queryComponents[$resultVariable])) {
+            if ( ! isset($this->queryComponents[$resultVariable])) {
                 $this->semanticalError(
                     sprintf("'%s' is not defined.", $resultVariable),
                     $deferredItem['token']
@@ -689,7 +689,7 @@ 
             $qComp = $this->queryComponents[$resultVariable];
 
             // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
-            if (! isset($qComp['resultVariable'])) {
+            if ( ! isset($qComp['resultVariable'])) {
                 $this->semanticalError(
                     sprintf("'%s' does not point to a ResultVariable.", $resultVariable),
                     $deferredItem['token']
@@ -731,9 +731,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -749,7 +749,7 @@ 
             // Validate if PathExpression is one of the expected types
             $expectedType = $pathExpression->expectedType;
 
-            if (! ($expectedType & $fieldType)) {
+            if ( ! ($expectedType & $fieldType)) {
                 // We need to recognize which was expected type(s)
                 $expectedStringTypes = [];
 
@@ -771,8 +771,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']);
             }
@@ -784,7 +784,7 @@ 
 
     private function processRootEntityAliasSelected()
     {
-        if (! $this->identVariableExpressions) {
+        if ( ! $this->identVariableExpressions) {
             return;
         }
 
@@ -941,7 +941,7 @@ 
 
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
 
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -1020,9 +1020,9 @@ 
     {
         $identVariable = $this->IdentificationVariable();
 
-        if (! isset($this->queryComponents[$identVariable])) {
+        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.'
             );
         }
 
@@ -1036,8 +1036,8 @@ 
         $class    = $qComp['metadata'];
         $property = $class->getProperty($field);
 
-        if (! ($property !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! ($property !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -1067,7 +1067,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
         }
 
@@ -1449,7 +1449,7 @@ 
         // Still need to decide between IdentificationVariable or ResultVariable
         $lookaheadValue = $this->lexer->lookahead['value'];
 
-        if (! isset($this->queryComponents[$lookaheadValue])) {
+        if ( ! isset($this->queryComponents[$lookaheadValue])) {
             $this->semanticalError('Cannot group by undefined identification or result variable.');
         }
 
@@ -1797,7 +1797,7 @@ 
         while ($this->lexer->isNextToken(Lexer::T_DOT)) {
             $this->match(Lexer::T_DOT);
             $this->match(Lexer::T_IDENTIFIER);
-            $field .= '.' . $this->lexer->token['value'];
+            $field .= '.'.$this->lexer->token['value'];
         }
 
         $partialFieldSet[] = $field;
@@ -1811,7 +1811,7 @@ 
             while ($this->lexer->isNextToken(Lexer::T_DOT)) {
                 $this->match(Lexer::T_DOT);
                 $this->match(Lexer::T_IDENTIFIER);
-                $field .= '.' . $this->lexer->token['value'];
+                $field .= '.'.$this->lexer->token['value'];
             }
 
             $partialFieldSet[] = $field;
@@ -2432,7 +2432,7 @@ 
 
         // Phase 1 AST optimization: Prevent AST\ConditionalFactor
         // if only one AST\ConditionalPrimary is defined
-        if (! $not) {
+        if ( ! $not) {
             return $conditionalPrimary;
         }
 
@@ -2451,7 +2451,7 @@ 
     {
         $condPrimary = new AST\ConditionalPrimary();
 
-        if (! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
+        if ( ! $this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
 
             return $condPrimary;
@@ -2619,7 +2619,7 @@ 
             $this->match(Lexer::T_OF);
         }
 
-        $collMemberExpr      = new AST\CollectionMemberExpression(
+        $collMemberExpr = new AST\CollectionMemberExpression(
             $entityExpr,
             $this->CollectionValuedPathExpression()
         );
@@ -2958,7 +2958,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $isDistinct    = false;
 
-        if (! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_COUNT, Lexer::T_AVG, Lexer::T_MAX, Lexer::T_MIN, Lexer::T_SUM], true)) {
             $this->syntaxError('One of: MAX, MIN, AVG, SUM, COUNT');
         }
 
@@ -2988,7 +2988,7 @@ 
         $lookaheadType = $this->lexer->lookahead['type'];
         $value         = $this->lexer->lookahead['value'];
 
-        if (! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
+        if ( ! in_array($lookaheadType, [Lexer::T_ALL, Lexer::T_ANY, Lexer::T_SOME], true)) {
             $this->syntaxError('ALL, ANY or SOME');
         }
 
@@ -3226,7 +3226,7 @@ 
                 $lookaheadValue = $this->lexer->lookahead['value'];
 
                 // Validate existing component
-                if (! isset($this->queryComponents[$lookaheadValue])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue])) {
                     $this->semanticalError('Cannot add having condition on undefined result variable.');
                 }
 
@@ -3237,7 +3237,7 @@ 
                 }
 
                 // Validating ResultVariable
-                if (! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
+                if ( ! isset($this->queryComponents[$lookaheadValue]['resultVariable'])) {
                     $this->semanticalError('Cannot add having condition on a non result variable.');
                 }
 

lib/Doctrine/ORM/Query/FilterCollection.php

Spacing +6 added lines, -6 removed lines

@@ -81,11 +81,11 @@ 
      */
     public function enable($name)
     {
-        if (! $this->has($name)) {
-            throw new InvalidArgumentException("Filter '" . $name . "' does not exist.");
+        if ( ! $this->has($name)) {
+            throw new InvalidArgumentException("Filter '".$name."' does not exist.");
         }
 
-        if (! $this->isEnabled($name)) {
+        if ( ! $this->isEnabled($name)) {
             $filterClass = $this->config->getFilterClassName($name);
 
             $this->enabledFilters[$name] = new $filterClass($this->em);
@@ -133,8 +133,8 @@ 
      */
     public function getFilter($name)
     {
-        if (! $this->isEnabled($name)) {
-            throw new InvalidArgumentException("Filter '" . $name . "' is not enabled.");
+        if ( ! $this->isEnabled($name)) {
+            throw new InvalidArgumentException("Filter '".$name."' is not enabled.");
         }
 
         return $this->enabledFilters[$name];
@@ -187,7 +187,7 @@ 
         $filterHash = '';
 
         foreach ($this->enabledFilters as $name => $filter) {
-            $filterHash .= $name . $filter;
+            $filterHash .= $name.$filter;
         }
 
         return $filterHash;

lib/Doctrine/ORM/Query/Filter/SQLFilter.php

Spacing +2 added lines, -2 removed lines

@@ -83,8 +83,8 @@
      */
     final public function getParameter($name)
     {
-        if (! isset($this->parameters[$name])) {
-            throw new InvalidArgumentException("Parameter '" . $name . "' does not exist.");
+        if ( ! isset($this->parameters[$name])) {
+            throw new InvalidArgumentException("Parameter '".$name."' does not exist.");
         }
 
         return $this->em->getConnection()->quote($this->parameters[$name]['value'], $this->parameters[$name]['type']);

lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php

Spacing +5 added lines, -5 removed lines

@@ -57,8 +57,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $primaryDqlAlias);
 
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
 
         $rangeDecl        = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $primaryDqlAlias);
         $fromClause       = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -80,7 +80,7 @@ 
         // 3. Create and store DELETE statements
         $hierarchyClasses = array_merge(
             array_map(
-                static function ($className) use ($em) {
+                static function($className) use ($em) {
                     return $em->getClassMetadata($className);
                 },
                 array_reverse($primaryClass->getSubClasses())
@@ -103,8 +103,8 @@ 
             ];
         }
 
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }

lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php

Spacing +5 added lines, -5 removed lines

@@ -67,8 +67,8 @@ 
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 'i0', $updateClause->aliasIdentificationVariable);
 
-        $this->insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ')'
-                . ' SELECT i0.' . implode(', i0.', array_keys($idColumns));
+        $this->insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.')'
+                . ' SELECT i0.'.implode(', i0.', array_keys($idColumns));
 
         $rangeDecl  = new AST\RangeVariableDeclaration($primaryClass->getClassName(), $updateClause->aliasIdentificationVariable);
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -86,7 +86,7 @@ 
         // 3. Create and store UPDATE statements
         $hierarchyClasses = array_merge(
             array_map(
-                static function ($className) use ($em) {
+                static function($className) use ($em) {
                     return $em->getClassMetadata($className);
                 },
                 array_reverse($primaryClass->getSubClasses())
@@ -142,8 +142,8 @@ 
             ];
         }
 
-        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $this->createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
     }