doctrine / orm

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7661Test.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $keys = $e->participants->getKeys();
         self::assertEquals([1, 2], $keys);
 
-        $participants = $this->_em->createQuery('SELECT p FROM ' . GH7661Participant::class . ' p INDEX BY p.user')->getResult();
+        $participants = $this->_em->createQuery('SELECT p FROM '.GH7661Participant::class.' p INDEX BY p.user')->getResult();
         $keys         = array_keys($participants);
         self::assertEquals([1, 2], $keys);
     }

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +121 added lines, -121 removed lines

@@ -291,11 +291,11 @@ 
      */
     public function getSQLTableAlias($tableName, $dqlAlias = '')
     {
-        $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : '';
 
         if ( ! isset($this->tableAliasMap[$tableName])) {
             $this->tableAliasMap[$tableName] = (preg_match('/[a-z]/i', $tableName[0]) ? strtolower($tableName[0]) : 't')
-                . $this->tableAliasCounter++ . '_';
+                . $this->tableAliasCounter++.'_';
         }
 
         return $this->tableAliasMap[$tableName];
@@ -313,7 +313,7 @@ 
      */
     public function setSQLTableAlias($tableName, $alias, $dqlAlias = '')
     {
-        $tableName .= ($dqlAlias) ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= ($dqlAlias) ? '@['.$dqlAlias.']' : '';
 
         $this->tableAliasMap[$tableName] = $alias;
 
@@ -354,12 +354,12 @@ 
 
             // 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 ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $sql .= 'JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) {
-                $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName;
+                $sqlParts[] = $baseTableAlias.'.'.$columnName.' = '.$tableAlias.'.'.$columnName;
             }
 
             // Add filters on the root class
@@ -380,12 +380,12 @@ 
             $subClass   = $this->em->getClassMetadata($subClassName);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
 
-            $sql .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $sql .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($this->quoteStrategy->getIdentifierColumnNames($subClass, $this->platform) as $columnName) {
-                $sqlParts[] = $baseTableAlias . '.' . $columnName . ' = ' . $tableAlias . '.' . $columnName;
+                $sqlParts[] = $baseTableAlias.'.'.$columnName.' = '.$tableAlias.'.'.$columnName;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -417,7 +417,7 @@ 
                     ? $persister->getOwningTable($fieldName)
                     : $qComp['metadata']->getTableName();
 
-                $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])) {
@@ -425,7 +425,7 @@ 
                 }
 
                 $this->orderedColumnsMap[$orderedColumn] = $orientation;
-                $orderedColumns[] = $orderedColumn . ' ' . $orientation;
+                $orderedColumns[] = $orderedColumn.' '.$orientation;
             }
         }
 
@@ -460,15 +460,15 @@ 
             }
 
             $sqlTableAlias = ($this->useSqlTableAliases)
-                ? $this->getSQLTableAlias($class->getTableName(), $dqlAlias) . '.'
+                ? $this->getSQLTableAlias($class->getTableName(), $dqlAlias).'.'
                 : '';
 
-            $sqlParts[] = $sqlTableAlias . $class->discriminatorColumn['name'] . ' IN (' . implode(', ', $values) . ')';
+            $sqlParts[] = $sqlTableAlias.$class->discriminatorColumn['name'].' IN ('.implode(', ', $values).')';
         }
 
         $sql = implode(' AND ', $sqlParts);
 
-        return (count($sqlParts) > 1) ? '(' . $sql . ')' : $sql;
+        return (count($sqlParts) > 1) ? '('.$sql.')' : $sql;
     }
 
     /**
@@ -481,11 +481,11 @@ 
      */
     private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (!$this->em->hasFilters()) {
+        if ( ! $this->em->hasFilters()) {
             return '';
         }
 
-        switch($targetEntity->inheritanceType) {
+        switch ($targetEntity->inheritanceType) {
             case ClassMetadata::INHERITANCE_TYPE_NONE:
                 break;
             case ClassMetadata::INHERITANCE_TYPE_JOINED:
@@ -508,7 +508,7 @@ 
         $filterClauses = [];
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -540,7 +540,7 @@ 
         }
 
         if ( ! $AST->orderByClause && ($orderBySql = $this->_generateOrderedCollectionOrderByItems())) {
-            $sql .= ' ORDER BY ' . $orderBySql;
+            $sql .= ' ORDER BY '.$orderBySql;
         }
 
         if ($limit !== null || $offset !== null) {
@@ -552,11 +552,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) {
@@ -611,7 +611,7 @@ 
         $sqlParts   = [];
 
         foreach ($this->quoteStrategy->getIdentifierColumnNames($class, $this->platform) as $columnName) {
-            $sqlParts[] = $tableAlias . '.' . $columnName;
+            $sqlParts[] = $tableAlias.'.'.$columnName;
         }
 
         return implode(', ', $sqlParts);
@@ -654,7 +654,7 @@ 
                 $class = $this->queryComponents[$dqlAlias]['metadata'];
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform);
@@ -683,7 +683,7 @@ 
                 }
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->getSQLTableAlias($class->getTableName(), $dqlAlias) . '.';
+                    $sql .= $this->getSQLTableAlias($class->getTableName(), $dqlAlias).'.';
                 }
 
                 $sql .= reset($assoc['targetToSourceKeyColumns']);
@@ -701,7 +701,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) {
@@ -738,7 +738,7 @@ 
                 $discrColumn = $rootClass->discriminatorColumn;
                 $columnAlias = $this->getSQLColumnAlias($discrColumn['name']);
 
-                $sqlSelectExpressions[] = $tblAlias . '.' . $discrColumn['name'] . ' AS ' . $columnAlias;
+                $sqlSelectExpressions[] = $tblAlias.'.'.$discrColumn['name'].' AS '.$columnAlias;
 
                 $this->rsm->setDiscriminatorColumn($dqlAlias, $columnAlias);
                 $this->rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName'], false, $discrColumn['type']);
@@ -752,7 +752,7 @@ 
             // Add foreign key columns of class and also parent classes
             foreach ($class->associationMappings as $assoc) {
                 if ( ! ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE)
-                    || ( ! $addMetaColumns && !isset($assoc['id']))) {
+                    || ( ! $addMetaColumns && ! isset($assoc['id']))) {
                     continue;
                 }
 
@@ -767,7 +767,7 @@ 
                     $columnType  = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
 
                     $quotedColumnName       = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
-                    $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = $sqlTableAlias.'.'.$quotedColumnName.' AS '.$columnAlias;
 
                     $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $isIdentifier, $columnType);
                 }
@@ -796,7 +796,7 @@ 
                             $columnType  = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
 
                             $quotedColumnName       = $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform);
-                            $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
+                            $sqlSelectExpressions[] = $sqlTableAlias.'.'.$quotedColumnName.' AS '.$columnAlias;
 
                             $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $subClass->isIdentifier($columnName), $columnType);
                         }
@@ -822,7 +822,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -877,7 +877,7 @@ 
 
                 $assoc = $class->associationMappings[$fieldName];
 
-                if (! $assoc['isOwningSide']) {
+                if ( ! $assoc['isOwningSide']) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -931,7 +931,7 @@ 
         }
 
         $sql = $this->platform->appendLockHint(
-            $this->quoteStrategy->getTableName($class, $this->platform) . ' ' .
+            $this->quoteStrategy->getTableName($class, $this->platform).' '.
             $this->getSQLTableAlias($class->getTableName(), $dqlAlias),
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
@@ -943,10 +943,10 @@ 
         $classTableInheritanceJoins = $this->_generateClassTableInheritanceJoins($class, $dqlAlias);
 
         if ( ! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -979,7 +979,7 @@ 
         // Ensure we got the owning side, since it has all mapping info
         $assoc = ( ! $relation['isOwningSide']) ? $targetClass->associationMappings[$relation['mappedBy']] : $relation;
 
-        if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && (!$this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
+        if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) == true && ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
             if ($relation['type'] == ClassMetadata::ONE_TO_MANY || $relation['type'] == ClassMetadata::MANY_TO_MANY) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($assoc);
             }
@@ -999,12 +999,12 @@ 
                     $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform);
 
                     if ($relation['isOwningSide']) {
-                        $conditions[] = $sourceTableAlias . '.' . $quotedSourceColumn . ' = ' . $targetTableAlias . '.' . $quotedTargetColumn;
+                        $conditions[] = $sourceTableAlias.'.'.$quotedSourceColumn.' = '.$targetTableAlias.'.'.$quotedTargetColumn;
 
                         continue;
                     }
 
-                    $conditions[] = $sourceTableAlias . '.' . $quotedTargetColumn . ' = ' . $targetTableAlias . '.' . $quotedSourceColumn;
+                    $conditions[] = $sourceTableAlias.'.'.$quotedTargetColumn.' = '.$targetTableAlias.'.'.$quotedSourceColumn;
                 }
 
                 // Apply remaining inheritance restrictions
@@ -1022,7 +1022,7 @@ 
                 }
 
                 $targetTableJoin = [
-                    'table' => $targetTableName . ' ' . $targetTableAlias,
+                    'table' => $targetTableName.' '.$targetTableAlias,
                     'condition' => implode(' AND ', $conditions),
                 ];
                 break;
@@ -1042,10 +1042,10 @@ 
                     $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
                     $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform);
 
-                    $conditions[] = $sourceTableAlias . '.' . $quotedTargetColumn . ' = ' . $joinTableAlias . '.' . $quotedSourceColumn;
+                    $conditions[] = $sourceTableAlias.'.'.$quotedTargetColumn.' = '.$joinTableAlias.'.'.$quotedSourceColumn;
                 }
 
-                $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 ';
@@ -1059,7 +1059,7 @@ 
                     $quotedSourceColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $targetClass, $this->platform);
                     $quotedTargetColumn = $this->quoteStrategy->getReferencedJoinColumnName($joinColumn, $targetClass, $this->platform);
 
-                    $conditions[] = $targetTableAlias . '.' . $quotedTargetColumn . ' = ' . $joinTableAlias . '.' . $quotedSourceColumn;
+                    $conditions[] = $targetTableAlias.'.'.$quotedTargetColumn.' = '.$joinTableAlias.'.'.$quotedSourceColumn;
                 }
 
                 // Apply remaining inheritance restrictions
@@ -1077,7 +1077,7 @@ 
                 }
 
                 $targetTableJoin = [
-                    'table' => $targetTableName . ' ' . $targetTableAlias,
+                    'table' => $targetTableName.' '.$targetTableAlias,
                     'condition' => implode(' AND ', $conditions),
                 ];
                 break;
@@ -1087,22 +1087,22 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = (null === $condExpr) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = (null === $condExpr) ? '' : ('('.$this->walkConditionalExpression($condExpr).')');
 
         if ($targetClass->isInheritanceTypeJoined()) {
             $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
@@ -1135,7 +1135,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1152,10 +1152,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1163,7 +1163,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1186,7 +1186,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1194,7 +1194,7 @@ 
                     ? ' AND '
                     : ' ON ';
 
-                $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, !$isUnconditionalJoin);
+                $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, ! $isUnconditionalJoin);
 
                 // Apply remaining inheritance restrictions
                 $discrSql = $this->_generateDiscriminatorColumnConditionSQL([$dqlAlias]);
@@ -1211,7 +1211,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1241,7 +1241,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        $sql .= implode(', ', $scalarExpressions) . ')';
+        $sql .= implode(', ', $scalarExpressions).')';
 
         return $sql;
     }
@@ -1263,7 +1263,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1278,11 +1278,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);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1296,14 +1296,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);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1337,14 +1337,14 @@ 
                 $fieldMapping  = $class->fieldMappings[$fieldName];
                 $columnName    = $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform);
                 $columnAlias   = $this->getSQLColumnAlias($fieldMapping['columnName']);
-                $col           = $sqlTableAlias . '.' . $columnName;
+                $col           = $sqlTableAlias.'.'.$columnName;
 
                 if (isset($fieldMapping['requireSQLConversion'])) {
                     $type = Type::getType($fieldMapping['type']);
                     $col  = $type->convertToPHPValueSQL($col, $this->conn->getDatabasePlatform());
                 }
 
-                $sql .= $col . ' AS ' . $columnAlias;
+                $sql .= $col.' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
@@ -1369,7 +1369,7 @@ 
                 $columnAlias = $this->getSQLColumnAlias('sclr');
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
@@ -1383,7 +1383,7 @@ 
                 $columnAlias = $this->getSQLColumnAlias('sclr');
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
@@ -1394,7 +1394,7 @@ 
                 break;
 
             case ($expr instanceof AST\NewObjectExpression):
-                $sql .= $this->walkNewObject($expr,$selectExpression->fieldIdentificationVariable);
+                $sql .= $this->walkNewObject($expr, $selectExpression->fieldIdentificationVariable);
                 break;
 
             default:
@@ -1435,14 +1435,14 @@ 
                     $columnAlias      = $this->getSQLColumnAlias($mapping['columnName']);
                     $quotedColumnName = $this->quoteStrategy->getColumnName($fieldName, $class, $this->platform);
 
-                    $col = $sqlTableAlias . '.' . $quotedColumnName;
+                    $col = $sqlTableAlias.'.'.$quotedColumnName;
 
                     if (isset($mapping['requireSQLConversion'])) {
                         $type = Type::getType($mapping['type']);
                         $col = $type->convertToPHPValueSQL($col, $this->platform);
                     }
 
-                    $sqlParts[] = $col . ' AS '. $columnAlias;
+                    $sqlParts[] = $col.' AS '.$columnAlias;
 
                     $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
 
@@ -1459,21 +1459,21 @@ 
                         $sqlTableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
 
                         foreach ($subClass->fieldMappings as $fieldName => $mapping) {
-                            if (isset($mapping['inherited']) || ($partialFieldSet && !in_array($fieldName, $partialFieldSet))) {
+                            if (isset($mapping['inherited']) || ($partialFieldSet && ! in_array($fieldName, $partialFieldSet))) {
                                 continue;
                             }
 
                             $columnAlias      = $this->getSQLColumnAlias($mapping['columnName']);
                             $quotedColumnName = $this->quoteStrategy->getColumnName($fieldName, $subClass, $this->platform);
 
-                            $col = $sqlTableAlias . '.' . $quotedColumnName;
+                            $col = $sqlTableAlias.'.'.$quotedColumnName;
 
                             if (isset($mapping['requireSQLConversion'])) {
                                 $type = Type::getType($mapping['type']);
                                 $col = $type->convertToPHPValueSQL($col, $this->platform);
                             }
 
-                            $sqlParts[] = $col . ' AS ' . $columnAlias;
+                            $sqlParts[] = $col.' AS '.$columnAlias;
 
                             $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
 
@@ -1493,7 +1493,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1533,7 +1533,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1541,7 +1541,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1560,10 +1560,10 @@ 
      * @param null|string               $newObjectResultAlias
      * @return string The SQL.
      */
-    public function walkNewObject($newObjectExpression, $newObjectResultAlias=null)
+    public function walkNewObject($newObjectExpression, $newObjectResultAlias = null)
     {
         $sqlSelectExpressions = [];
-        $objIndex             = $newObjectResultAlias?:$this->newObjectCounter++;
+        $objIndex             = $newObjectResultAlias ?: $this->newObjectCounter++;
 
         foreach ($newObjectExpression->args as $argIndex => $e) {
             $resultAlias = $this->scalarResultCounter++;
@@ -1576,7 +1576,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):
@@ -1585,7 +1585,7 @@ 
                     $class     = $qComp['metadata'];
                     $fieldType = $class->fieldMappings[$e->field]['type'];
 
-                    $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 case ($e instanceof AST\Literal):
@@ -1599,11 +1599,11 @@ 
                             break;
                     }
 
-                    $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 default:
-                    $sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim($e->dispatch($this)).' AS '.$columnAlias;
                     break;
             }
 
@@ -1636,10 +1636,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):
@@ -1656,7 +1656,7 @@ 
                 $columnAlias = $this->getSQLColumnAlias('sclr');
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
                 break;
 
             case ($expr instanceof AST\ParenthesisExpression):
@@ -1676,8 +1676,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).')';
     }
 
     /**
@@ -1691,7 +1691,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1748,7 +1748,7 @@ 
     {
         $class     = $this->em->getClassMetadata($deleteClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'DELETE FROM ' . $this->quoteStrategy->getTableName($class, $this->platform);
+        $sql       = 'DELETE FROM '.$this->quoteStrategy->getTableName($class, $this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable);
         $this->rootAliases[] = $deleteClause->aliasIdentificationVariable;
@@ -1763,12 +1763,12 @@ 
     {
         $class     = $this->em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'UPDATE ' . $this->quoteStrategy->getTableName($class, $this->platform);
+        $sql       = 'UPDATE '.$this->quoteStrategy->getTableName($class, $this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->rootAliases[] = $updateClause->aliasIdentificationVariable;
 
-        $sql .= ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        $sql .= ' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
 
         return $sql;
     }
@@ -1781,7 +1781,7 @@ 
         $useTableAliasesBefore = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1824,7 +1824,7 @@ 
 
             if (count($filterClauses)) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1832,11 +1832,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 '';
@@ -1879,7 +1879,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);
     }
 
     /**
@@ -1894,7 +1894,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
     }
 
@@ -1905,7 +1905,7 @@ 
     {
         $sql = ($existsExpr->not) ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1949,7 +1949,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $this->quoteStrategy->getTableName($targetClass, $this->platform) . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $this->quoteStrategy->getTableName($targetClass, $this->platform).' '.$targetTableAlias.' WHERE ';
 
             $owningAssoc = $targetClass->associationMappings[$assoc['mappedBy']];
             $sqlParts    = [];
@@ -1957,7 +1957,7 @@ 
             foreach ($owningAssoc['targetToSourceKeyColumns'] as $targetColumn => $sourceColumn) {
                 $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $this->platform);
 
-                $sqlParts[] = $sourceTableAlias . '.' . $targetColumn . ' = ' . $targetTableAlias . '.' . $sourceColumn;
+                $sqlParts[] = $sourceTableAlias.'.'.$targetColumn.' = '.$targetTableAlias.'.'.$sourceColumn;
             }
 
             foreach ($this->quoteStrategy->getIdentifierColumnNames($targetClass, $this->platform) as $targetColumnName) {
@@ -1965,7 +1965,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.'  . $targetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$targetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -1981,8 +1981,8 @@ 
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
             // join to target table
-            $sql .= $this->quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $this->platform) . ' ' . $joinTableAlias
-                . ' INNER JOIN ' . $this->quoteStrategy->getTableName($targetClass, $this->platform) . ' ' . $targetTableAlias . ' ON ';
+            $sql .= $this->quoteStrategy->getJoinTableName($owningAssoc, $targetClass, $this->platform).' '.$joinTableAlias
+                . ' INNER JOIN '.$this->quoteStrategy->getTableName($targetClass, $this->platform).' '.$targetTableAlias.' ON ';
 
             // join conditions
             $joinColumns  = $assoc['isOwningSide'] ? $joinTable['inverseJoinColumns'] : $joinTable['joinColumns'];
@@ -1991,7 +1991,7 @@ 
             foreach ($joinColumns as $joinColumn) {
                 $targetColumn = $this->quoteStrategy->getColumnName($targetClass->fieldNames[$joinColumn['referencedColumnName']], $targetClass, $this->platform);
 
-                $joinSqlParts[] = $joinTableAlias . '.' . $joinColumn['name'] . ' = ' . $targetTableAlias . '.' . $targetColumn;
+                $joinSqlParts[] = $joinTableAlias.'.'.$joinColumn['name'].' = '.$targetTableAlias.'.'.$targetColumn;
             }
 
             $sql .= implode(' AND ', $joinSqlParts);
@@ -2003,7 +2003,7 @@ 
             foreach ($joinColumns as $joinColumn) {
                 $targetColumn = $this->quoteStrategy->getColumnName($class->fieldNames[$joinColumn['referencedColumnName']], $class, $this->platform);
 
-                $sqlParts[] = $joinTableAlias . '.' . $joinColumn['name'] . ' = ' . $sourceTableAlias . '.' . $targetColumn;
+                $sqlParts[] = $joinTableAlias.'.'.$joinColumn['name'].' = '.$sourceTableAlias.'.'.$targetColumn;
             }
 
             foreach ($this->quoteStrategy->getIdentifierColumnNames($targetClass, $this->platform) as $targetColumnName) {
@@ -2011,13 +2011,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $targetColumnName . ' IN (' . $entitySql . ')';
+                $sqlParts[] = $targetTableAlias.'.'.$targetColumnName.' IN ('.$entitySql.')';
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2028,7 +2028,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');
     }
 
     /**
@@ -2037,19 +2037,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;
     }
 
     /**
@@ -2057,7 +2057,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)
@@ -2084,10 +2084,10 @@ 
         }
 
         if ($this->useSqlTableAliases) {
-            $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias) . '.';
+            $sql .= $this->getSQLTableAlias($discrClass->getTableName(), $dqlAlias).'.';
         }
 
-        $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
+        $sql .= $class->discriminatorColumn['name'].($instanceOfExpr->not ? ' NOT IN ' : ' IN ');
         $sql .= $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr);
 
         return $sql;
@@ -2134,8 +2134,8 @@ 
             $sql .= ' NOT';
         }
 
-        $sql .= ' BETWEEN ' . $this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
-            . ' AND ' . $this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
+        $sql .= ' BETWEEN '.$this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
+            . ' AND '.$this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
 
         return $sql;
     }
@@ -2150,7 +2150,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);
@@ -2163,7 +2163,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2190,7 +2190,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)
@@ -2222,7 +2222,7 @@ 
     {
         return ($arithmeticExpr->isSimpleArithmeticExpression())
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2276,7 +2276,7 @@ 
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2289,7 +2289,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2353,6 +2353,6 @@ 
             $sqlParameterList[] = $this->conn->quote($dis);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }