doctrine / orm

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +114 added lines, -114 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -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;
             }
 
             // Add filters on the root class
@@ -363,14 +363,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);
@@ -391,7 +391,7 @@ 
             $qComp       = $this->queryComponents[$dqlAlias];
             $association = $qComp['relation'];
 
-            if (! ($association instanceof ToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -399,7 +399,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])) {
@@ -407,7 +407,7 @@ 
                 }
 
                 $this->orderedColumnsMap[$orderedColumn] = $orientation;
-                $orderedColumns[] = $orderedColumn . ' ' . $orientation;
+                $orderedColumns[] = $orderedColumn.' '.$orientation;
             }
         }
 
@@ -447,19 +447,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;
     }
 
     /**
@@ -472,7 +472,7 @@ 
      */
     private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (! $this->em->hasFilters()) {
+        if ( ! $this->em->hasFilters()) {
             return '';
         }
 
@@ -503,7 +503,7 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -535,7 +535,7 @@ 
         }
 
         if ( ! $AST->orderByClause && ($orderBySql = $this->generateOrderedCollectionOrderByItems())) {
-            $sql .= ' ORDER BY ' . $orderBySql;
+            $sql .= ' ORDER BY '.$orderBySql;
         }
 
         if ($limit !== null || $offset !== null) {
@@ -547,11 +547,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) {
@@ -608,7 +608,7 @@ 
         foreach ($class->getIdentifierColumns($this->em) as $column) {
             $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-            $sqlParts[] = $tableAlias . '.' . $quotedColumnName;
+            $sqlParts[] = $tableAlias.'.'.$quotedColumnName;
         }
 
         return implode(', ', $sqlParts);
@@ -626,7 +626,7 @@ 
     {
         $class = $this->queryComponents[$identificationVariable]['metadata'];
 
-        if (!$fieldName) {
+        if ( ! $fieldName) {
             return $this->getSQLTableAlias($class->getTableName(), $identificationVariable);
         }
 
@@ -655,7 +655,7 @@ 
                 $property  = $class->getProperty($fieldName);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($property->getColumnName());
@@ -669,7 +669,7 @@ 
                 $class       = $this->queryComponents[$dqlAlias]['metadata'];
                 $association = $class->getProperty($fieldName);
 
-                if (! $association->isOwningSide()) {
+                if ( ! $association->isOwningSide()) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -683,7 +683,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());
@@ -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) {
@@ -744,7 +744,7 @@ 
 
                 $sqlSelectExpressions[] = sprintf(
                     '%s AS %s',
-                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . '.' . $quotedColumnName, $this->platform),
+                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.'.'.$quotedColumnName, $this->platform),
                     $sqlColumnAlias
                 );
 
@@ -754,12 +754,12 @@ 
 
             // 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;
                 }
 
-                $targetClass  = $this->em->getClassMetadata($association->getTargetEntity());
+                $targetClass = $this->em->getClassMetadata($association->getTargetEntity());
 
                 foreach ($association->getJoinColumns() as $joinColumn) {
                     /** @var JoinColumnMetadata $joinColumn */
@@ -769,7 +769,7 @@ 
                     $columnAlias          = $this->getSQLColumnAlias();
                     $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                     }
 
@@ -799,7 +799,7 @@ 
                         continue;
                     }
 
-                    if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
+                    if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
                         continue;
                     }
 
@@ -813,7 +813,7 @@ 
                         $columnAlias          = $this->getSQLColumnAlias();
                         $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -847,7 +847,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -927,7 +927,7 @@ 
         $tableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
         $sql = $this->platform->appendLockHint(
-            $tableName . ' ' . $tableAlias,
+            $tableName.' '.$tableAlias,
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
 
@@ -938,10 +938,10 @@ 
         $classTableInheritanceJoins = $this->generateClassTableInheritanceJoins($class, $dqlAlias);
 
         if ( ! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -978,7 +978,7 @@ 
         ;
 
         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) {
@@ -1060,7 +1060,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 ';
@@ -1099,7 +1099,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } else {
@@ -1107,23 +1107,23 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = (null === $condExpr) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = (null === $condExpr) ? '' : ('('.$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
@@ -1156,7 +1156,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1173,10 +1173,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1184,7 +1184,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1207,7 +1207,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1215,7 +1215,7 @@ 
                     ? ' AND '
                     : ' ON ';
 
-                $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, !$isUnconditionalJoin);
+                $sql .= $this->generateRangeVariableDeclarationSQL($joinDeclaration, ! $isUnconditionalJoin);
 
                 // Apply remaining inheritance restrictions
                 $discrSql = $this->generateDiscriminatorColumnConditionSQL([$dqlAlias]);
@@ -1232,7 +1232,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1262,7 +1262,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        $sql .= implode(', ', $scalarExpressions) . ')';
+        $sql .= implode(', ', $scalarExpressions).')';
 
         return $sql;
     }
@@ -1284,7 +1284,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1299,11 +1299,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;
     }
@@ -1317,14 +1317,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;
     }
@@ -1386,7 +1386,7 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
@@ -1401,7 +1401,7 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
@@ -1441,7 +1441,7 @@ 
 
                 // Select all fields from the queried class
                 foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                    if (! ($property instanceof FieldMetadata)) {
+                    if ( ! ($property instanceof FieldMetadata)) {
                         continue;
                     }
 
@@ -1476,11 +1476,11 @@ 
                         $subClass = $this->em->getClassMetadata($subClassName);
 
                         foreach ($subClass->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                            if (! ($property instanceof FieldMetadata)) {
+                            if ( ! ($property instanceof FieldMetadata)) {
                                 continue;
                             }
 
-                            if ($subClass->isInheritedProperty($fieldName) || ($partialFieldSet && !in_array($fieldName, $partialFieldSet))) {
+                            if ($subClass->isInheritedProperty($fieldName) || ($partialFieldSet && ! in_array($fieldName, $partialFieldSet))) {
                                 continue;
                             }
 
@@ -1515,7 +1515,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1555,7 +1555,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1563,7 +1563,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1582,7 +1582,7 @@ 
      * @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++;
@@ -1598,7 +1598,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):
@@ -1607,7 +1607,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):
@@ -1621,11 +1621,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;
             }
 
@@ -1658,10 +1658,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):
@@ -1678,7 +1678,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):
@@ -1698,8 +1698,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).')';
     }
 
     /**
@@ -1713,7 +1713,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1776,7 +1776,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);
 
@@ -1792,12 +1792,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;
 
-        $sql .= ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        $sql .= ' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
 
         return $sql;
     }
@@ -1810,7 +1810,7 @@ 
         $useTableAliasesBefore = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1853,7 +1853,7 @@ 
 
             if ($filterClauses) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1861,11 +1861,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 '';
@@ -1908,7 +1908,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);
     }
 
     /**
@@ -1923,7 +1923,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
     }
 
@@ -1934,7 +1934,7 @@ 
     {
         $sql = ($existsExpr->not) ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1983,7 +1983,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $targetTableName . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $targetTableName.' '.$targetTableAlias.' WHERE ';
 
             $sqlParts = [];
 
@@ -2004,7 +2004,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.'  . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -2018,7 +2018,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 = [];
@@ -2069,13 +2069,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2086,7 +2086,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');
     }
 
     /**
@@ -2095,19 +2095,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;
     }
 
     /**
@@ -2115,7 +2115,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)
@@ -2139,12 +2139,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)
         );
@@ -2191,8 +2191,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;
     }
@@ -2207,7 +2207,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);
@@ -2220,7 +2220,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2247,7 +2247,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)
@@ -2279,7 +2279,7 @@ 
     {
         return ($arithmeticExpr->isSimpleArithmeticExpression())
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2333,7 +2333,7 @@ 
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2346,7 +2346,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2407,7 +2407,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());
                 }
             }
@@ -2419,6 +2419,6 @@ 
             $sqlParameterList[] = $this->conn->quote($discriminator);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }

lib/Doctrine/ORM/Cache/Region/FileLockRegion.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Region;
 
@@ -103,7 +103,7 @@ 
      */
     private function getLockFileName(CacheKey $key)
     {
-        return $this->directory . DIRECTORY_SEPARATOR . $key->hash . '.' . self::LOCK_EXTENSION;
+        return $this->directory.DIRECTORY_SEPARATOR.$key->hash.'.'.self::LOCK_EXTENSION;
     }
 
     /**

tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

Spacing +34 added lines, -34 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -679,12 +679,12 @@ 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
 
         self::assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
-        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
+        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
 
         $countQuery = $class->getNamedNativeQuery('count');
 
         self::assertEquals('mapping-count', $countQuery['resultSetMapping']);
-        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
+        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
 
         // result set mapping
         self::assertCount(3, $class->sqlResultSetMappings);
@@ -695,9 +695,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
 
         self::assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
 
@@ -727,14 +727,14 @@ 
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                   $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],               $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],           $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'address.zip','column'=>'zip'],         $mapping['entities'][0]['fields'][3]);
-        self::assertEquals(['name'=>'address.city','column'=>'city'],       $mapping['entities'][0]['fields'][4]);
-        self::assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]);
-        self::assertEquals(['name'=>'address.id','column'=>'a_id'],         $mapping['entities'][0]['fields'][6]);
-        self::assertEquals('__CLASS__',                            $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
+        self::assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
+        self::assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
 
@@ -743,11 +743,11 @@ 
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
-        self::assertEquals($userMetadata->getClassName(),                             $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
 
@@ -756,10 +756,10 @@ 
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
-        self::assertEquals($userMetadata->getClassName(),         $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
 
@@ -768,17 +768,17 @@ 
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
-        self::assertEquals('__CLASS__',                      $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         self::assertNull($mapping['entities'][1]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
-        self::assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
-        self::assertEquals(CmsAddress::class,                $mapping['entities'][1]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
+        self::assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
+        self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
 
         //person asserts
         self::assertCount(1, $personMetadata->getSqlResultSetMappings());
@@ -790,9 +790,9 @@ 
 
         self::assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],     $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
-        self::assertEquals('__CLASS__',              $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
     }
 
     /*

tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -51,7 +51,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -254,7 +254,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -346,7 +346,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -394,7 +394,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)->setCacheable(true)
+        $result2 = $this->em->createQuery($dql)->setCacheable(true)
                 ->setParameter('name', $name)
                 ->getResult();
 
@@ -438,7 +438,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -500,7 +500,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -566,7 +566,7 @@ 
         $this->em->clear();
         $this->secondLevelCacheLogger->clearStats();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -626,7 +626,7 @@ 
 
         $this->cache->evictEntityRegion(State::class);
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -669,7 +669,7 @@ 
 
         $this->cache->evictEntityRegion(City::class);
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
                 ->setCacheable(true)
                 ->getResult();
 
@@ -720,7 +720,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createNativeQuery($sql, $rsm)
+        $result2 = $this->em->createNativeQuery($sql, $rsm)
             ->setCacheable(true)
             ->getResult();
 
@@ -775,7 +775,7 @@ 
 
         $this->em->clear();
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->setFirstResult(2)
             ->setMaxResults(1)
@@ -787,7 +787,7 @@ 
 
         $this->em->clear();
 
-        $result3  = $this->em->createQuery($dql)
+        $result3 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->getResult();
 
@@ -837,7 +837,7 @@ 
             ->getRegion()
             ->put($key, $entry);
 
-        $result2  = $this->em->createQuery($dql)
+        $result2 = $this->em->createQuery($dql)
             ->setCacheable(true)
             ->setLifetime(3600)
             ->getResult();

tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -49,7 +49,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p from ' . CompanyPerson::class . ' p order by p.name desc');
+        $query = $this->em->createQuery('select p from '.CompanyPerson::class.' p order by p.name desc');
 
         $entities = $query->getResult();
 
@@ -64,7 +64,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p from ' . CompanyEmployee::class . ' p');
+        $query = $this->em->createQuery('select p from '.CompanyEmployee::class.' p');
 
         $entities = $query->getResult();
 
@@ -83,7 +83,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery("update " . CompanyEmployee::class . " p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
+        $query = $this->em->createQuery("update ".CompanyEmployee::class." p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
 
         $query->setParameter(1, 'NewName', 'string');
         $query->setParameter(2, 'NewDepartment');
@@ -94,7 +94,7 @@ 
 
         self::assertEquals(1, $numUpdated);
 
-        $query = $this->em->createQuery('delete from ' . CompanyPerson::class . ' p');
+        $query = $this->em->createQuery('delete from '.CompanyPerson::class.' p');
 
         $numDeleted = $query->execute();
 
@@ -169,7 +169,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p, s from ' . CompanyPerson::class . ' p join p.spouse s where p.name=\'Mary Smith\'');
+        $query = $this->em->createQuery('select p, s from '.CompanyPerson::class.' p join p.spouse s where p.name=\'Mary Smith\'');
 
         $result = $query->getResult();
 
@@ -201,7 +201,7 @@ 
 
         $this->em->clear();
 
-        $query = $this->em->createQuery('select p, f from ' . CompanyPerson::class . ' p join p.friends f where p.name=?1');
+        $query = $this->em->createQuery('select p, f from '.CompanyPerson::class.' p join p.friends f where p.name=?1');
 
         $query->setParameter(1, 'Roman');
 
@@ -267,7 +267,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $q = $this->em->createQuery('select a from ' . CompanyEvent::class . ' a where a.id = ?1');
+        $q = $this->em->createQuery('select a from '.CompanyEvent::class.' a where a.id = ?1');
 
         $q->setParameter(1, $event1->getId());
 
@@ -278,7 +278,7 @@ 
 
         $this->em->clear();
 
-        $q = $this->em->createQuery('select a from ' . CompanyOrganization::class . ' a where a.id = ?1');
+        $q = $this->em->createQuery('select a from '.CompanyOrganization::class.' a where a.id = ?1');
 
         $q->setParameter(1, $org->getId());
 
@@ -299,10 +299,10 @@ 
      */
     public function testBulkUpdateIssueDDC368()
     {
-        $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1')
+        $this->em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.salary = 1')
                   ->execute();
 
-        $result = $this->em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1')
+        $result = $this->em->createQuery('SELECT count(p.id) FROM '.CompanyEmployee::class.' p WHERE p.salary = 1')
                             ->getResult();
 
         self::assertGreaterThan(0, $result);
@@ -313,7 +313,7 @@ 
      */
     public function testBulkUpdateNonScalarParameterDDC1341()
     {
-        $this->em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1')
+        $this->em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.startDate = ?0 WHERE p.department = ?1')
                   ->setParameter(0, new \DateTime())
                   ->setParameter(1, 'IT')
                   ->execute();
@@ -371,7 +371,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $dqlManager = $this->em->createQuery('SELECT m FROM ' . CompanyManager::class . ' m WHERE m.spouse = ?1')
+        $dqlManager = $this->em->createQuery('SELECT m FROM '.CompanyManager::class.' m WHERE m.spouse = ?1')
                                 ->setParameter(1, $person->getId())
                                 ->getSingleResult();
 

tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 

tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -676,7 +676,7 @@ 
     public function testCanRetrieveRepositoryFromClassNameWithLeadingBackslash()
     {
         self::assertSame(
-            $this->em->getRepository('\\' . CmsUser::class),
+            $this->em->getRepository('\\'.CmsUser::class),
             $this->em->getRepository(CmsUser::class)
         );
     }
@@ -714,7 +714,7 @@ 
         $data = $repo->findBy(['user' => [1, 2, 3]]);
 
         $query = array_pop($this->sqlLoggerStack->queries);
-        self::assertEquals([1,2,3], $query['params'][0]);
+        self::assertEquals([1, 2, 3], $query['params'][0]);
         self::assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]);
     }
 

tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -37,7 +37,7 @@ 
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->preFlushCalls  = [];
+        $this->listener->preFlushCalls = [];
 
         $this->em->persist($fix);
         $this->em->flush();
@@ -57,7 +57,7 @@ 
         $this->em->flush();
         $this->em->clear();
 
-        $this->listener->postLoadCalls  = [];
+        $this->listener->postLoadCalls = [];
 
         $dql = "SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1";
         $fix = $this->em->createQuery($dql)->setParameter(1, $fix->getId())->getSingleResult();
@@ -73,7 +73,7 @@ 
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->prePersistCalls  = [];
+        $this->listener->prePersistCalls = [];
 
         $this->em->persist($fix);
         $this->em->flush();

tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -1115,11 +1115,11 @@ 
 {
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (!in_array("LocaleAware", $targetEntity->getReflectionClass()->getInterfaceNames())) {
+        if ( ! in_array("LocaleAware", $targetEntity->getReflectionClass()->getInterfaceNames())) {
             return "";
         }
 
-        return $targetTableAlias.'.locale = ' . $this->getParameter('locale'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.locale = '.$this->getParameter('locale'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1131,7 +1131,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.country = ' . $this->getParameter('country'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.country = '.$this->getParameter('country'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1143,7 +1143,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('prefix'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('prefix'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1155,7 +1155,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.topic = ' . $this->getParameter('topic'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.topic = '.$this->getParameter('topic'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1167,7 +1167,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('name');
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('name');
     }
 }
 
@@ -1179,7 +1179,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'."completed" = ' . $this->getParameter('completed');
+        return $targetTableAlias.'."completed" = '.$this->getParameter('completed');
     }
 }
 
@@ -1191,6 +1191,6 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.id = ' . $this->getParameter('id');
+        return $targetTableAlias.'.id = '.$this->getParameter('id');
     }
 }