doctrine / orm

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +12 added lines, -12 removed lines

@@ -79,7 +79,7 @@ 
         $ce = [];
 
         foreach ($class->getPropertiesIterator() as $fieldName => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -87,7 +87,7 @@ 
         }
 
         foreach ($class->getSubClasses() as $subClass) {
-            if (! in_array($class->getClassName(), class_parents($subClass), true)) {
+            if ( ! in_array($class->getClassName(), class_parents($subClass), true)) {
                 $message = "According to the discriminator map class, '%s' has to be a child of '%s', but these entities are not related through inheritance.";
 
                 $ce[] = sprintf($message, $subClass, $class->getClassName());
@@ -106,7 +106,7 @@ 
         $fieldName       = $association->getName();
         $targetEntity    = $association->getTargetEntity();
 
-        if (! class_exists($targetEntity) || $metadataFactory->isTransient($targetEntity)) {
+        if ( ! class_exists($targetEntity) || $metadataFactory->isTransient($targetEntity)) {
             $message = "The target entity '%s' specified on %s#%s is unknown or not an entity.";
 
             return [sprintf($message, $targetEntity, $class->getClassName(), $fieldName)];
@@ -125,7 +125,7 @@ 
 
         /** @var ClassMetadata $targetMetadata */
         $targetMetadata    = $metadataFactory->getMetadataFor($targetEntity);
-        $containsForeignId = array_filter($targetMetadata->identifier, static function ($identifier) use ($targetMetadata) {
+        $containsForeignId = array_filter($targetMetadata->identifier, static function($identifier) use ($targetMetadata) {
             $targetProperty = $targetMetadata->getProperty($identifier);
 
             return $targetProperty instanceof AssociationMetadata;
@@ -141,7 +141,7 @@ 
             /** @var AssociationMetadata $targetAssociation */
             $targetAssociation = $targetMetadata->getProperty($mappedBy);
 
-            if (! $targetAssociation) {
+            if ( ! $targetAssociation) {
                 $message = 'The association %s#%s refers to the owning side property %s#%s which does not exist.';
 
                 $ce[] = sprintf($message, $class->getClassName(), $fieldName, $targetEntity, $mappedBy);
@@ -165,7 +165,7 @@ 
             /** @var AssociationMetadata $targetAssociation */
             $targetAssociation = $targetMetadata->getProperty($inversedBy);
 
-            if (! $targetAssociation) {
+            if ( ! $targetAssociation) {
                 $message = 'The association %s#%s refers to the inverse side property %s#%s which does not exist.';
 
                 $ce[] = sprintf($message, $class->getClassName(), $fieldName, $targetEntity, $inversedBy);
@@ -209,7 +209,7 @@ 
                 $joinTable               = $association->getJoinTable();
 
                 foreach ($joinTable->getJoinColumns() as $joinColumn) {
-                    if (! in_array($joinColumn->getReferencedColumnName(), $classIdentifierColumns, true)) {
+                    if ( ! in_array($joinColumn->getReferencedColumnName(), $classIdentifierColumns, true)) {
                         $message = "The referenced column name '%s' has to be a primary key column on the target entity class '%s'.";
 
                         $ce[] = sprintf($message, $joinColumn->getReferencedColumnName(), $class->getClassName());
@@ -218,7 +218,7 @@ 
                 }
 
                 foreach ($joinTable->getInverseJoinColumns() as $inverseJoinColumn) {
-                    if (! in_array($inverseJoinColumn->getReferencedColumnName(), $targetIdentifierColumns, true)) {
+                    if ( ! in_array($inverseJoinColumn->getReferencedColumnName(), $targetIdentifierColumns, true)) {
                         $message = "The referenced column name '%s' has to be a primary key column on the target entity class '%s'.";
 
                         $ce[] = sprintf($message, $inverseJoinColumn->getReferencedColumnName(), $targetMetadata->getClassName());
@@ -228,7 +228,7 @@ 
 
                 if (count($targetIdentifierColumns) !== count($joinTable->getInverseJoinColumns())) {
                     $columnNames = array_map(
-                        static function (JoinColumnMetadata $joinColumn) {
+                        static function(JoinColumnMetadata $joinColumn) {
                             return $joinColumn->getReferencedColumnName();
                         },
                         $joinTable->getInverseJoinColumns()
@@ -243,7 +243,7 @@ 
 
                 if (count($classIdentifierColumns) !== count($joinTable->getJoinColumns())) {
                     $columnNames = array_map(
-                        static function (JoinColumnMetadata $joinColumn) {
+                        static function(JoinColumnMetadata $joinColumn) {
                             return $joinColumn->getReferencedColumnName();
                         },
                         $joinTable->getJoinColumns()
@@ -260,7 +260,7 @@ 
                 $joinColumns       = $association->getJoinColumns();
 
                 foreach ($joinColumns as $joinColumn) {
-                    if (! in_array($joinColumn->getReferencedColumnName(), $identifierColumns, true)) {
+                    if ( ! in_array($joinColumn->getReferencedColumnName(), $identifierColumns, true)) {
                         $message = "The referenced column name '%s' has to be a primary key column on the target entity class '%s'.";
 
                         $ce[] = sprintf($message, $joinColumn->getReferencedColumnName(), $targetMetadata->getClassName());
@@ -291,7 +291,7 @@ 
                     continue;
                 }
 
-                if (! ($targetProperty instanceof AssociationMetadata)) {
+                if ( ! ($targetProperty instanceof AssociationMetadata)) {
                     $message = "The association %s#%s is ordered by a property '%s' that is non-existing field on the target entity '%s'.";
 
                     $ce[] = sprintf($message, $class->getClassName(), $fieldName, $orderField, $targetMetadata->getClassName());

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Spacing +12 added lines, -12 removed lines

@@ -62,28 +62,28 @@ 
         $fh = fopen($this->file, 'xb+');
 
         if (count($identityMap) === 0) {
-            fwrite($fh, 'Flush Operation [' . $this->context . "] - Empty identity map.\n");
+            fwrite($fh, 'Flush Operation ['.$this->context."] - Empty identity map.\n");
 
             return;
         }
 
-        fwrite($fh, 'Flush Operation [' . $this->context . "] - Dumping identity map:\n");
+        fwrite($fh, 'Flush Operation ['.$this->context."] - Dumping identity map:\n");
 
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, 'Class: ' . $className . "\n");
+            fwrite($fh, 'Class: '.$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, ' Entity: ' . $this->getIdString($entity, $uow) . ' ' . spl_object_id($entity) . "\n");
+                fwrite($fh, ' Entity: '.$this->getIdString($entity, $uow).' '.spl_object_id($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->getPropertiesIterator() as $field => $association) {
-                    if (! ($association instanceof AssociationMetadata)) {
+                    if ( ! ($association instanceof AssociationMetadata)) {
                         continue;
                     }
 
-                    fwrite($fh, '   ' . $field . ' ');
+                    fwrite($fh, '   '.$field.' ');
 
                     $value = $association->getValue($entity);
 
@@ -98,21 +98,21 @@ 
                             fwrite($fh, '[PROXY] ');
                         }
 
-                        fwrite($fh, $this->getIdString($value, $uow) . ' ' . spl_object_id($value) . "\n");
+                        fwrite($fh, $this->getIdString($value, $uow).' '.spl_object_id($value)."\n");
                     } else {
                         $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
 
                         if ($initialized) {
-                            fwrite($fh, '[INITIALIZED] ' . $this->getType($value) . ' ' . count($value) . " elements\n");
+                            fwrite($fh, '[INITIALIZED] '.$this->getType($value).' '.count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, '    ' . $this->getIdString($obj, $uow) . ' ' . spl_object_id($obj) . "\n");
+                                fwrite($fh, '    '.$this->getIdString($obj, $uow).' '.spl_object_id($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, '[PROXY] ' . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, '[PROXY] '.$this->getType($value)." unknown element size\n");
 
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, '    ' . $this->getIdString($obj, $uow) . ' ' . spl_object_id($obj) . "\n");
+                                fwrite($fh, '    '.$this->getIdString($obj, $uow).' '.spl_object_id($obj)."\n");
                             }
                         }
                     }
@@ -151,7 +151,7 @@ 
             $idstring = '';
 
             foreach ($ids as $k => $v) {
-                $idstring .= $k . '=' . $v;
+                $idstring .= $k.'='.$v;
             }
         } else {
             $idstring = 'NEWOBJECT ';

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +124 added lines, -124 removed lines

@@ -270,10 +270,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];
@@ -291,7 +291,7 @@ 
      */
     public function setSQLTableAlias($tableName, $alias, $dqlAlias = '')
     {
-        $tableName .= $dqlAlias ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= $dqlAlias ? '@['.$dqlAlias.']' : '';
 
         $this->tableAliasMap[$tableName] = $alias;
 
@@ -305,7 +305,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->aliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->aliasCounter++);
     }
 
     /**
@@ -332,14 +332,14 @@ 
 
             // If this is a joined association we must use left joins to preserve the correct result.
             $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER ';
-            $sql .= 'JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= 'JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($class->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $filterSql = $this->generateFilterConditionSQL($parentClass, $tableAlias);
@@ -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 '';
         }
 
@@ -505,7 +505,7 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -536,11 +536,11 @@ 
             $sql .= $this->walkOrderByClause($AST->orderByClause);
         }
 
-        if (! $AST->orderByClause) {
+        if ( ! $AST->orderByClause) {
             $orderBySql = $this->generateOrderedCollectionOrderByItems();
 
             if ($orderBySql) {
-                $sql .= ' ORDER BY ' . $orderBySql;
+                $sql .= ' ORDER BY '.$orderBySql;
             }
         }
 
@@ -553,11 +553,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) {
@@ -565,7 +565,7 @@ 
         }
 
         foreach ($this->selectedClasses as $selectedClass) {
-            if (! $selectedClass['class']->isVersioned()) {
+            if ( ! $selectedClass['class']->isVersioned()) {
                 throw OptimisticLockException::lockFailed($selectedClass['class']->getClassName());
             }
         }
@@ -614,7 +614,7 @@ 
         foreach ($class->getIdentifierColumns($this->em) as $column) {
             $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-            $sqlParts[] = $tableAlias . '.' . $quotedColumnName;
+            $sqlParts[] = $tableAlias.'.'.$quotedColumnName;
         }
 
         return implode(', ', $sqlParts);
@@ -632,7 +632,7 @@ 
     {
         $class = $this->queryComponents[$identificationVariable]['metadata'];
 
-        if (! $fieldName) {
+        if ( ! $fieldName) {
             return $this->getSQLTableAlias($class->getTableName(), $identificationVariable);
         }
 
@@ -661,7 +661,7 @@ 
                 $property  = $class->getProperty($fieldName);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($property->getColumnName());
@@ -675,7 +675,7 @@ 
                 $class       = $this->queryComponents[$dqlAlias]['metadata'];
                 $association = $class->getProperty($fieldName);
 
-                if (! $association->isOwningSide()) {
+                if ( ! $association->isOwningSide()) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -689,7 +689,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());
@@ -707,7 +707,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) {
@@ -750,7 +750,7 @@ 
 
                 $sqlSelectExpressions[] = sprintf(
                     '%s AS %s',
-                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . '.' . $quotedColumnName, $this->platform),
+                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.'.'.$quotedColumnName, $this->platform),
                     $sqlColumnAlias
                 );
 
@@ -760,7 +760,7 @@ 
 
             // Add foreign key columns of class and also parent classes
             foreach ($class->getPropertiesIterator() as $association) {
-                if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
+                if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
                     || ( ! $addMetaColumns && ! $association->isPrimaryKey())) {
                     continue;
                 }
@@ -775,7 +775,7 @@ 
                     $columnAlias          = $this->getSQLColumnAlias();
                     $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                     }
 
@@ -791,7 +791,7 @@ 
             }
 
             // Add foreign key columns to SQL, if necessary
-            if (! $addMetaColumns) {
+            if ( ! $addMetaColumns) {
                 continue;
             }
 
@@ -805,7 +805,7 @@ 
                         continue;
                     }
 
-                    if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
+                    if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
                         continue;
                     }
 
@@ -819,7 +819,7 @@ 
                         $columnAlias          = $this->getSQLColumnAlias();
                         $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -836,7 +836,7 @@ 
             }
         }
 
-        return $sql . implode(', ', $sqlSelectExpressions);
+        return $sql.implode(', ', $sqlSelectExpressions);
     }
 
     /**
@@ -851,7 +851,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -926,7 +926,7 @@ 
         $tableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
         $sql = $this->platform->appendLockHint(
-            $tableName . ' ' . $tableAlias,
+            $tableName.' '.$tableAlias,
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
 
@@ -936,11 +936,11 @@ 
 
         $classTableInheritanceJoins = $this->generateClassTableInheritanceJoins($class, $dqlAlias);
 
-        if (! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+        if ( ! $buildNestedJoins) {
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -976,7 +976,7 @@ 
             : $association;
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true &&
-            (! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
+            ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
             if ($association instanceof ToManyAssociationMetadata) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($owningAssociation);
             }
@@ -1030,7 +1030,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } elseif ($owningAssociation instanceof ManyToManyAssociationMetadata) {
@@ -1057,7 +1057,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 ';
@@ -1095,7 +1095,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } else {
@@ -1103,23 +1103,23 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = $condExpr === null ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = $condExpr === null ? '' : ('('.$this->walkConditionalExpression($condExpr).')');
 
         if ($targetClass->inheritanceType === InheritanceType::JOINED) {
             $ctiJoins = $this->generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
 
             // If we have WITH condition, we need to build nested joins for target class table and cti joins
             if ($withCondition) {
-                $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
+                $sql .= '('.$targetTableJoin['table'].$ctiJoins.') ON '.$targetTableJoin['condition'];
             } else {
-                $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
+                $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'].$ctiJoins;
             }
         } else {
-            $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
+            $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'];
         }
 
         if ($withCondition) {
-            $sql .= ' AND ' . $withCondition;
+            $sql .= ' AND '.$withCondition;
         }
 
         // Apply the indexes
@@ -1153,7 +1153,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1170,10 +1170,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1181,7 +1181,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1204,7 +1204,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1229,7 +1229,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1259,7 +1259,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        return $sql . implode(', ', $scalarExpressions) . ')';
+        return $sql.implode(', ', $scalarExpressions).')';
     }
 
     /**
@@ -1279,7 +1279,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1292,11 +1292,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;
     }
@@ -1310,14 +1310,14 @@ 
      */
     public function walkSimpleCaseExpression($simpleCaseExpression)
     {
-        $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
+        $sql = 'CASE '.$this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
 
         foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) {
-            $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1358,7 +1358,7 @@ 
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, $property->getType());
                     $this->scalarFields[$dqlAlias][$fieldName] = $columnAlias;
                 }
@@ -1379,11 +1379,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // Conceptually we could resolve field type here by traverse through AST to retrieve field type,
                     // but this is not a feasible solution; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
@@ -1394,11 +1394,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // We cannot resolve field type here; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
                 }
@@ -1422,7 +1422,7 @@ 
                 $class       = $queryComp['metadata'];
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: null;
 
-                if (! isset($this->selectedClasses[$dqlAlias])) {
+                if ( ! isset($this->selectedClasses[$dqlAlias])) {
                     $this->selectedClasses[$dqlAlias] = [
                         'class'       => $class,
                         'dqlAlias'    => $dqlAlias,
@@ -1434,7 +1434,7 @@ 
 
                 // Select all fields from the queried class
                 foreach ($class->getPropertiesIterator() as $fieldName => $property) {
-                    if (! ($property instanceof FieldMetadata)) {
+                    if ( ! ($property instanceof FieldMetadata)) {
                         continue;
                     }
 
@@ -1469,7 +1469,7 @@ 
                         $subClass = $this->em->getClassMetadata($subClassName);
 
                         foreach ($subClass->getPropertiesIterator() as $fieldName => $property) {
-                            if (! ($property instanceof FieldMetadata)) {
+                            if ( ! ($property instanceof FieldMetadata)) {
                                 continue;
                             }
 
@@ -1508,7 +1508,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1548,7 +1548,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1556,7 +1556,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1590,7 +1590,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:
@@ -1599,7 +1599,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:
@@ -1613,11 +1613,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;
             }
 
@@ -1650,10 +1650,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:
@@ -1670,7 +1670,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:
@@ -1690,8 +1690,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).')';
     }
 
     /**
@@ -1705,7 +1705,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1714,7 +1714,7 @@ 
     public function walkGroupByItem($groupByItem)
     {
         // StateFieldPathExpression
-        if (! is_string($groupByItem)) {
+        if ( ! is_string($groupByItem)) {
             return $this->walkPathExpression($groupByItem);
         }
 
@@ -1768,7 +1768,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);
 
@@ -1784,12 +1784,12 @@ 
     {
         $class     = $this->em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'UPDATE ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'UPDATE '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->rootAliases[] = $updateClause->aliasIdentificationVariable;
 
-        return $sql . ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        return $sql.' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
     }
 
     /**
@@ -1800,7 +1800,7 @@ 
         $useTableAliasesBefore    = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1844,7 +1844,7 @@ 
 
             if ($filterClauses) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1852,11 +1852,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 '';
@@ -1869,7 +1869,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalExpression
         // if only one ConditionalTerm is defined
-        if (! ($condExpr instanceof AST\ConditionalExpression)) {
+        if ( ! ($condExpr instanceof AST\ConditionalExpression)) {
             return $this->walkConditionalTerm($condExpr);
         }
 
@@ -1883,7 +1883,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalTerm
         // if only one ConditionalFactor is defined
-        if (! ($condTerm instanceof AST\ConditionalTerm)) {
+        if ( ! ($condTerm instanceof AST\ConditionalTerm)) {
             return $this->walkConditionalFactor($condTerm);
         }
 
@@ -1899,7 +1899,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);
     }
 
     /**
@@ -1914,7 +1914,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
 
         return '';
@@ -1927,7 +1927,7 @@ 
     {
         $sql = $existsExpr->not ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1975,7 +1975,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $targetTableName . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $targetTableName.' '.$targetTableAlias.' WHERE ';
 
             $sqlParts = [];
 
@@ -1996,7 +1996,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -2010,7 +2010,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 = [];
@@ -2059,13 +2059,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2076,7 +2076,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');
     }
 
     /**
@@ -2085,19 +2085,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;
     }
 
     /**
@@ -2105,7 +2105,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)
@@ -2130,12 +2130,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)
         );
@@ -2179,8 +2179,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;
     }
@@ -2195,7 +2195,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);
@@ -2208,7 +2208,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2235,7 +2235,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)
@@ -2271,7 +2271,7 @@ 
     {
         return $arithmeticExpr->isSimpleArithmeticExpression()
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2279,7 +2279,7 @@ 
      */
     public function walkSimpleArithmeticExpression($simpleArithmeticExpr)
     {
-        if (! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
+        if ( ! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
             return $this->walkArithmeticTerm($simpleArithmeticExpr);
         }
 
@@ -2299,7 +2299,7 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticTerm
         // if only one ArithmeticFactor is defined
-        if (! ($term instanceof AST\ArithmeticTerm)) {
+        if ( ! ($term instanceof AST\ArithmeticTerm)) {
             return $this->walkArithmeticFactor($term);
         }
 
@@ -2319,13 +2319,13 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticFactor
         // if only one ArithmeticPrimary is defined
-        if (! ($factor instanceof AST\ArithmeticFactor)) {
+        if ( ! ($factor instanceof AST\ArithmeticFactor)) {
             return $this->walkArithmeticPrimary($factor);
         }
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2338,7 +2338,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2396,7 +2396,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());
                 }
             }
@@ -2408,6 +2408,6 @@ 
             $sqlParameterList[] = $this->conn->quote($discriminator);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }

lib/Doctrine/ORM/Mapping/Exporter/ClassMetadataExporter.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
         $lines[] = null;
 
         if ($namespace) {
-            $lines[] = 'namespace ' . $namespace . ';';
+            $lines[] = 'namespace '.$namespace.';';
             $lines[] = null;
         }
 
@@ -64,31 +64,31 @@ 
     {
         $indentation     = str_repeat(self::INDENTATION, $indentationLevel);
         $bodyIndentation = str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
-        $lines[] = $indentation . 'public function __construct(';
-        $lines[] = $bodyIndentation . 'ClassMetadataBuildingContext $metadataBuildingContext,';
-        $lines[] = $bodyIndentation . '?ClassMetadata $parent = null';
-        $lines[] = $indentation . ')';
-        $lines[] = $indentation . '{';
-        $lines[] = $bodyIndentation . 'parent::__construct("' . $metadata->getClassName() . '", $parent, $metadataBuildingContext);';
+        $lines[] = $indentation.'public function __construct(';
+        $lines[] = $bodyIndentation.'ClassMetadataBuildingContext $metadataBuildingContext,';
+        $lines[] = $bodyIndentation.'?ClassMetadata $parent = null';
+        $lines[] = $indentation.')';
+        $lines[] = $indentation.'{';
+        $lines[] = $bodyIndentation.'parent::__construct("'.$metadata->getClassName().'", $parent, $metadataBuildingContext);';
 
         if ($metadata->getCustomRepositoryClassName()) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setCustomRepositoryClassName("' . $metadata->getCustomRepositoryClassName() . '");';
+            $lines[] = $objectReference.'->setCustomRepositoryClassName("'.$metadata->getCustomRepositoryClassName().'");';
         }
 
         if ($metadata->changeTrackingPolicy) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::' . strtoupper($metadata->changeTrackingPolicy) . ');';
+            $lines[] = $objectReference.'->setChangeTrackingPolicy(Mapping\ChangeTrackingPolicy::'.strtoupper($metadata->changeTrackingPolicy).');';
         }
 
         $lines[] = $this->exportInheritance($metadata, $indentationLevel);
         $lines[] = $this->exportTable($metadata, $indentationLevel);
         $lines[] = $this->exportProperties($metadata, $indentationLevel);
         $lines[] = $this->exportLifecycleCallbacks($metadata, $indentationLevel);
-        $lines[] = $indentation . '}';
+        $lines[] = $indentation.'}';
 
         return implode(PHP_EOL, $lines);
     }
@@ -96,17 +96,17 @@ 
     private function exportInheritance(Mapping\ClassMetadata $metadata, int $indentationLevel) : string
     {
         $bodyIndentation = str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
         if ($metadata->inheritanceType) {
             $lines[] = null;
-            $lines[] = $objectReference . '->setInheritanceType(Mapping\InheritanceType::' . strtoupper($metadata->inheritanceType) . ');';
+            $lines[] = $objectReference.'->setInheritanceType(Mapping\InheritanceType::'.strtoupper($metadata->inheritanceType).');';
         }
 
         if ($metadata->discriminatorColumn) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Discriminator mapping';
+            $lines[] = $bodyIndentation.'// Discriminator mapping';
             $lines[] = $this->exportDiscriminatorMetadata($metadata, $indentationLevel + 1);
         }
 
@@ -120,7 +120,7 @@ 
 
         if ($metadata->table) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Table';
+            $lines[] = $bodyIndentation.'// Table';
             $lines[] = $this->exportTableMetadata($metadata->table, $indentationLevel + 1);
         }
 
@@ -134,7 +134,7 @@ 
 
         foreach ($metadata->getPropertiesIterator() as $name => $property) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Property: ' . $name;
+            $lines[] = $bodyIndentation.'// Property: '.$name;
             $lines[] = $this->exportProperty($property, $indentationLevel + 1);
         }
 
@@ -144,16 +144,16 @@ 
     private function exportLifecycleCallbacks(Mapping\ClassMetadata $metadata, int $indentationLevel) : string
     {
         $bodyIndentation = str_repeat(self::INDENTATION, $indentationLevel + 1);
-        $objectReference = $bodyIndentation . self::VARIABLE;
+        $objectReference = $bodyIndentation.self::VARIABLE;
         $lines           = [];
 
         if ($metadata->lifecycleCallbacks) {
             $lines[] = null;
-            $lines[] = $bodyIndentation . '// Lifecycle callbacks';
+            $lines[] = $bodyIndentation.'// Lifecycle callbacks';
 
             foreach ($metadata->lifecycleCallbacks as $event => $callbacks) {
                 foreach ($callbacks as $callback) {
-                    $lines[] = $objectReference . '->addLifecycleCallback("' . $callback . '", "' . $event . '");';
+                    $lines[] = $objectReference.'->addLifecycleCallback("'.$callback.'", "'.$event.'");';
                 }
             }
         }
@@ -166,17 +166,17 @@ 
         $variableExporter      = new VariableExporter();
         $discriminatorExporter = new DiscriminatorColumnMetadataExporter();
         $indentation           = str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference       = $indentation . self::VARIABLE;
+        $objectReference       = $indentation.self::VARIABLE;
         $lines                 = [];
 
         $lines[] = $discriminatorExporter->export($metadata->discriminatorColumn, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->setDiscriminatorColumn(' . $discriminatorExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->setDiscriminatorColumn('.$discriminatorExporter::VARIABLE.');';
 
         if ($metadata->discriminatorMap) {
             $discriminatorMap = $variableExporter->export($metadata->discriminatorMap, $indentationLevel + 1);
 
-            $lines[] = $objectReference . '->setDiscriminatorMap(' . $discriminatorMap . ');';
+            $lines[] = $objectReference.'->setDiscriminatorMap('.$discriminatorMap.');';
         }
 
         return implode(PHP_EOL, $lines);
@@ -186,12 +186,12 @@ 
     {
         $tableExporter   = new TableMetadataExporter();
         $indentation     = str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         $lines[] = $tableExporter->export($table, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->setTable(' . $tableExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->setTable('.$tableExporter::VARIABLE.');';
 
         return implode(PHP_EOL, $lines);
     }
@@ -199,7 +199,7 @@ 
     private function exportProperty(Mapping\Property $property, int $indentationLevel) : string
     {
         $indentation     = str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference = $indentation . self::VARIABLE;
+        $objectReference = $indentation.self::VARIABLE;
         $lines           = [];
 
         switch (true) {
@@ -230,7 +230,7 @@ 
 
         $lines[] = $propertyExporter->export($property, $indentationLevel);
         $lines[] = null;
-        $lines[] = $objectReference . '->addProperty(' . $propertyExporter::VARIABLE . ');';
+        $lines[] = $objectReference.'->addProperty('.$propertyExporter::VARIABLE.');';
 
         return implode(PHP_EOL, $lines);
     }

lib/Doctrine/ORM/UnitOfWork.php

Spacing +54 added lines, -54 removed lines

@@ -339,7 +339,7 @@ 
 
         $this->computeChangeSets();
 
-        if (! ($this->entityInsertions ||
+        if ( ! ($this->entityInsertions ||
                 $this->entityDeletions ||
                 $this->entityUpdates ||
                 $this->collectionUpdates ||
@@ -400,7 +400,7 @@ 
             // Entity deletions come last and need to be in reverse commit order
             if ($this->entityDeletions) {
                 foreach (array_reverse($commitOrder) as $committedEntityName) {
-                    if (! $this->entityDeletions) {
+                    if ( ! $this->entityDeletions) {
                         break; // just a performance optimisation
                     }
 
@@ -484,7 +484,7 @@ 
         $oid  = spl_object_id($entity);
         $data = [];
 
-        if (! isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -564,12 +564,12 @@ 
                     || ! $class->getProperty($name) instanceof FieldMetadata
                     || ! $class->getProperty($name)->hasValueGenerator()
                     || $class->getProperty($name)->getValueGenerator()->getType() !== GeneratorType::IDENTITY
-                ) && (! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
+                ) && ( ! $class->isVersioned() || $name !== $class->versionProperty->getName())) {
                 $actualData[$name] = $value;
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             // Entity is either NEW or MANAGED but not yet fully persisted (only has an id).
             // These result in an INSERT.
             $this->originalEntityData[$oid] = $actualData;
@@ -596,7 +596,7 @@ 
 
             foreach ($actualData as $propName => $actualValue) {
                 // skip field, its a partially omitted one!
-                if (! (isset($originalData[$propName]) || array_key_exists($propName, $originalData))) {
+                if ( ! (isset($originalData[$propName]) || array_key_exists($propName, $originalData))) {
                     continue;
                 }
 
@@ -618,7 +618,7 @@ 
                     if ($owner === null) { // cloned
                         $actualValue->setOwner($entity, $property);
                     } elseif ($owner !== $entity) { // no clone, we have to fix
-                        if (! $actualValue->isInitialized()) {
+                        if ( ! $actualValue->isInitialized()) {
                             $actualValue->initialize(); // we have to do this otherwise the cols share state
                         }
 
@@ -656,7 +656,7 @@ 
                         // Check if original value exists
                         if ($orgValue instanceof PersistentCollection) {
                             // A PersistentCollection was de-referenced, so delete it.
-                            if (! $this->isCollectionScheduledForDeletion($orgValue)) {
+                            if ( ! $this->isCollectionScheduledForDeletion($orgValue)) {
                                 $this->scheduleCollectionDeletion($orgValue);
 
                                 $changeSet[$propName] = $orgValue; // Signal changeset, to-many associations will be ignored
@@ -679,7 +679,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getPropertiesIterator() as $property) {
-            if (! $property instanceof AssociationMetadata) {
+            if ( ! $property instanceof AssociationMetadata) {
                 continue;
             }
 
@@ -746,7 +746,7 @@ 
                 // Only MANAGED entities that are NOT SCHEDULED FOR INSERTION OR DELETION are processed here.
                 $oid = spl_object_id($entity);
 
-                if (! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
+                if ( ! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
                     $this->computeChangeSet($class, $entity);
                 }
             }
@@ -783,13 +783,13 @@ 
         $targetClass    = $this->em->getClassMetadata($targetEntity);
 
         foreach ($unwrappedValue as $key => $entry) {
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw ORMInvalidArgumentException::invalidAssociation($targetClass, $association, $entry);
             }
 
             $state = $this->getEntityState($entry, self::STATE_NEW);
 
-            if (! ($entry instanceof $targetEntity)) {
+            if ( ! ($entry instanceof $targetEntity)) {
                 throw UnexpectedAssociationValue::create(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -800,7 +800,7 @@ 
 
             switch ($state) {
                 case self::STATE_NEW:
-                    if (! in_array('persist', $association->getCascade(), true)) {
+                    if ( ! in_array('persist', $association->getCascade(), true)) {
                         $this->nonCascadedNewDetectedEntities[spl_object_id($entry)] = [$association, $entry];
 
                         break;
@@ -849,12 +849,12 @@ 
         $persister      = $this->getEntityPersister($class->getClassName());
         $generationPlan->executeImmediate($this->em, $entity);
 
-        if (! $generationPlan->containsDeferred()) {
+        if ( ! $generationPlan->containsDeferred()) {
             $id = $this->em->getIdentifierFlattener()->flattenIdentifier($class, $persister->getIdentifier($entity));
 
             // Some identifiers may be foreign keys to new entities.
             // In this case, we don't have the value yet and should treat it as if we have a post-insert generator
-            if (! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
+            if ( ! $this->hasMissingIdsWhichAreForeignKeys($class, $id)) {
                 $this->entityIdentifiers[$oid] = $id;
             }
         }
@@ -899,7 +899,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
+        if ( ! isset($this->entityStates[$oid]) || $this->entityStates[$oid] !== self::STATE_MANAGED) {
             throw ORMInvalidArgumentException::entityNotManaged($entity);
         }
 
@@ -922,7 +922,7 @@ 
                         break;
                     }
 
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -936,7 +936,7 @@ 
             }
         }
 
-        if (! isset($this->originalEntityData[$oid])) {
+        if ( ! isset($this->originalEntityData[$oid])) {
             throw new RuntimeException('Cannot call recomputeSingleEntityChangeSet before computeChangeSet on an entity.');
         }
 
@@ -954,7 +954,7 @@ 
         if ($changeSet) {
             if (isset($this->entityChangeSets[$oid])) {
                 $this->entityChangeSets[$oid] = array_merge($this->entityChangeSets[$oid], $changeSet);
-            } elseif (! isset($this->entityInsertions[$oid])) {
+            } elseif ( ! isset($this->entityInsertions[$oid])) {
                 $this->entityChangeSets[$oid] = $changeSet;
                 $this->entityUpdates[$oid]    = $entity;
             }
@@ -1024,7 +1024,7 @@ 
                 $this->recomputeSingleEntityChangeSet($class, $entity);
             }
 
-            if (! empty($this->entityChangeSets[$oid])) {
+            if ( ! empty($this->entityChangeSets[$oid])) {
                 $persister->update($entity);
             }
 
@@ -1063,7 +1063,7 @@ 
 
             // Entity with this $oid after deletion treated as NEW, even if the $oid
             // is obtained by a new entity because the old one went out of scope.
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1110,13 +1110,13 @@ 
         // Calculate dependencies for new nodes
         while ($class = array_pop($newNodes)) {
             foreach ($class->getPropertiesIterator() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
                 $targetClass = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $calc->hasNode($targetClass->getClassName())) {
+                if ( ! $calc->hasNode($targetClass->getClassName())) {
                     $calc->addNode($targetClass->getClassName(), $targetClass);
 
                     $newNodes[] = $targetClass;
@@ -1124,7 +1124,7 @@ 
 
                 $weight = ! array_filter(
                     $property->getJoinColumns(),
-                    static function (JoinColumnMetadata $joinColumn) {
+                    static function(JoinColumnMetadata $joinColumn) {
                         return $joinColumn->isNullable();
                     }
                 );
@@ -1132,14 +1132,14 @@ 
                 $calc->addDependency($targetClass->getClassName(), $class->getClassName(), $weight);
 
                 // If the target class has mapped subclasses, these share the same dependency.
-                if (! $targetClass->getSubClasses()) {
+                if ( ! $targetClass->getSubClasses()) {
                     continue;
                 }
 
                 foreach ($targetClass->getSubClasses() as $subClassName) {
                     $targetSubClass = $this->em->getClassMetadata($subClassName);
 
-                    if (! $calc->hasNode($subClassName)) {
+                    if ( ! $calc->hasNode($subClassName)) {
                         $calc->addNode($targetSubClass->getClassName(), $targetSubClass);
 
                         $newNodes[] = $targetSubClass;
@@ -1215,7 +1215,7 @@ 
     {
         $oid = spl_object_id($entity);
 
-        if (! isset($this->entityIdentifiers[$oid])) {
+        if ( ! isset($this->entityIdentifiers[$oid])) {
             throw ORMInvalidArgumentException::entityHasNoIdentity($entity, 'scheduling for update');
         }
 
@@ -1223,7 +1223,7 @@ 
             throw ORMInvalidArgumentException::entityIsRemoved($entity, 'schedule for update');
         }
 
-        if (! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
+        if ( ! isset($this->entityUpdates[$oid]) && ! isset($this->entityInsertions[$oid])) {
             $this->entityUpdates[$oid] = $entity;
         }
     }
@@ -1298,7 +1298,7 @@ 
             return; // entity has not been persisted yet, so nothing more to do.
         }
 
-        if (! $this->isInIdentityMap($entity)) {
+        if ( ! $this->isInIdentityMap($entity)) {
             return;
         }
 
@@ -1306,7 +1306,7 @@ 
 
         unset($this->entityUpdates[$oid]);
 
-        if (! isset($this->entityDeletions[$oid])) {
+        if ( ! isset($this->entityDeletions[$oid])) {
             $this->entityDeletions[$oid] = $entity;
             $this->entityStates[$oid]    = self::STATE_REMOVED;
         }
@@ -1408,7 +1408,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1766,7 +1766,7 @@ 
         $class = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1813,7 +1813,7 @@ 
         }
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1829,7 +1829,7 @@ 
 
                 case $relatedEntities instanceof Collection:
                 case is_array($relatedEntities):
-                    if (! ($association instanceof ToManyAssociationMetadata)) {
+                    if ( ! ($association instanceof ToManyAssociationMetadata)) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1844,7 +1844,7 @@ 
                     break;
 
                 case $relatedEntities !== null:
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1873,7 +1873,7 @@ 
         $class             = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1932,7 +1932,7 @@ 
 
         switch (true) {
             case $lockMode === LockMode::OPTIMISTIC:
-                if (! $class->isVersioned()) {
+                if ( ! $class->isVersioned()) {
                     throw OptimisticLockException::notVersioned($class->getClassName());
                 }
 
@@ -1955,7 +1955,7 @@ 
             case $lockMode === LockMode::NONE:
             case $lockMode === LockMode::PESSIMISTIC_READ:
             case $lockMode === LockMode::PESSIMISTIC_WRITE:
-                if (! $this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2113,7 +2113,7 @@ 
                     $entity->addPropertyChangedListener($this);
                 }
             } else {
-                if (! isset($hints[Query::HINT_REFRESH])
+                if ( ! isset($hints[Query::HINT_REFRESH])
                     || (isset($hints[Query::HINT_REFRESH_ENTITY]) && $hints[Query::HINT_REFRESH_ENTITY] !== $entity)) {
                     return $entity;
                 }
@@ -2161,7 +2161,7 @@ 
         }
 
         foreach ($class->getPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2210,7 +2210,7 @@ 
                 continue;
             }
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 // use the given entity association
                 if (isset($data[$field]) && is_object($data[$field]) &&
                     isset($this->entityStates[spl_object_id($data[$field])])) {
@@ -2260,7 +2260,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2269,7 +2269,7 @@ 
             }
 
             // @todo guilhermeblanco Can we remove the need of this somehow?
-            if (! isset($hints['fetchMode'][$class->getClassName()][$field])) {
+            if ( ! isset($hints['fetchMode'][$class->getClassName()][$field])) {
                 $hints['fetchMode'][$class->getClassName()][$field] = $association->getFetchMode();
             }
 
@@ -2286,7 +2286,7 @@ 
                     // If this is an uninitialized proxy, we are deferring eager loads,
                     // this association is marked as eager fetch, and its an uninitialized proxy (wtf!)
                     // then we can append this entity for eager loading!
-                    if (! $targetClass->isIdentifierComposite() &&
+                    if ( ! $targetClass->isIdentifierComposite() &&
                         $newValue instanceof GhostObjectInterface &&
                         isset($hints[self::HINT_DEFEREAGERLOAD]) &&
                         $hints['fetchMode'][$class->getClassName()][$field] === FetchMode::EAGER &&
@@ -2369,7 +2369,7 @@ 
 
     public function triggerEagerLoads()
     {
-        if (! $this->eagerLoadingEntities) {
+        if ( ! $this->eagerLoadingEntities) {
             return;
         }
 
@@ -2378,7 +2378,7 @@ 
         $this->eagerLoadingEntities = [];
 
         foreach ($eagerLoadingEntities as $entityName => $ids) {
-            if (! $ids) {
+            if ( ! $ids) {
                 continue;
             }
 
@@ -2676,7 +2676,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2685,7 +2685,7 @@ 
         // Update changeset and mark entity for synchronization
         $this->entityChangeSets[$oid][$propertyName] = [$oldValue, $newValue];
 
-        if (! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
+        if ( ! isset($this->scheduledForSynchronization[$class->getRootClassName()][$oid])) {
             $this->scheduleForSynchronization($entity);
         }
     }
@@ -2767,7 +2767,7 @@ 
      */
     private static function objToStr($obj)
     {
-        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj) . '@' . spl_object_id($obj);
+        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_id($obj);
     }
 
     /**
@@ -2782,7 +2782,7 @@ 
      */
     public function markReadOnly($object)
     {
-        if (! is_object($object) || ! $this->isInIdentityMap($object)) {
+        if ( ! is_object($object) || ! $this->isInIdentityMap($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2800,7 +2800,7 @@ 
      */
     public function isReadOnly($object)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw ORMInvalidArgumentException::readOnlyRequiresManagedEntity($object);
         }
 
@@ -2812,7 +2812,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2822,7 +2822,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(static function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(static function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }
@@ -2832,7 +2832,7 @@ 
      */
     private function performCallbackOnCachedPersister(callable $callback)
     {
-        if (! $this->hasCache) {
+        if ( ! $this->hasCache) {
             return;
         }
 

lib/Doctrine/ORM/Cache/DefaultCache.php

Spacing +15 added lines, -16 removed lines

@@ -55,7 +55,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return null;
         }
 
@@ -70,7 +70,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return null;
         }
 
@@ -85,7 +85,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return false;
         }
 
@@ -100,7 +100,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -115,7 +115,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -132,7 +132,7 @@ 
         foreach ($metadatas as $metadata) {
             $persister = $this->uow->getEntityPersister($metadata->getRootClassName());
 
-            if (! ($persister instanceof CachedPersister)) {
+            if ( ! ($persister instanceof CachedPersister)) {
                 continue;
             }
 
@@ -148,7 +148,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return false;
         }
 
@@ -163,7 +163,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -178,7 +178,7 @@ 
         $metadata  = $this->em->getClassMetadata($className);
         $persister = $this->uow->getCollectionPersister($metadata->getProperty($association));
 
-        if (! ($persister instanceof CachedPersister)) {
+        if ( ! ($persister instanceof CachedPersister)) {
             return;
         }
 
@@ -194,13 +194,13 @@ 
 
         foreach ($metadatas as $metadata) {
             foreach ($metadata->getPropertiesIterator() as $association) {
-                if (! $association instanceof ToManyAssociationMetadata) {
+                if ( ! $association instanceof ToManyAssociationMetadata) {
                     continue;
                 }
 
                 $persister = $this->uow->getCollectionPersister($association);
 
-                if (! ($persister instanceof CachedPersister)) {
+                if ( ! ($persister instanceof CachedPersister)) {
                     continue;
                 }
 
@@ -251,11 +251,10 @@ 
     public function getQueryCache($regionName = null)
     {
         if ($regionName === null) {
-            return $this->defaultQueryCache ?:
-                $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
+            return $this->defaultQueryCache ?: $this->defaultQueryCache = $this->cacheFactory->buildQueryCache($this->em);
         }
 
-        if (! isset($this->queryCaches[$regionName])) {
+        if ( ! isset($this->queryCaches[$regionName])) {
             $this->queryCaches[$regionName] = $this->cacheFactory->buildQueryCache($this->em, $regionName);
         }
 
@@ -270,7 +269,7 @@ 
      */
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
     {
-        if (! is_array($identifier)) {
+        if ( ! is_array($identifier)) {
             $identifier = $this->toIdentifierArray($metadata, $identifier);
         }
 
@@ -286,7 +285,7 @@ 
      */
     private function buildCollectionCacheKey(ClassMetadata $metadata, $association, $ownerIdentifier)
     {
-        if (! is_array($ownerIdentifier)) {
+        if ( ! is_array($ownerIdentifier)) {
             $ownerIdentifier = $this->toIdentifierArray($metadata, $ownerIdentifier);
         }
 

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

Spacing +5 added lines, -5 removed lines

@@ -54,11 +54,11 @@ 
         }
 
         foreach ($metadata->getPropertiesIterator() as $name => $association) {
-            if (! isset($data[$name]) || $association instanceof FieldMetadata) {
+            if ( ! isset($data[$name]) || $association instanceof FieldMetadata) {
                 continue;
             }
 
-            if (! $association instanceof ToOneAssociationMetadata) {
+            if ( ! $association instanceof ToOneAssociationMetadata) {
                 unset($data[$name]);
 
                 continue;
@@ -68,7 +68,7 @@ 
             $targetClassMetadata = $this->em->getClassMetadata($targetEntity);
             $targetPersister     = $this->uow->getEntityPersister($targetEntity);
 
-            if (! $association->getCache()) {
+            if ( ! $association->getCache()) {
                 $owningAssociation = ! $association->isOwningSide()
                     ? $targetClassMetadata->getProperty($association->getMappedBy())
                     : $association;
@@ -116,7 +116,7 @@ 
                 continue;
             }
 
-            if (! $association->isPrimaryKey()) {
+            if ( ! $association->isPrimaryKey()) {
                 $targetClass = StaticClassNameConverter::getClass($data[$name]);
                 $targetId    = $this->uow->getEntityIdentifier($data[$name]);
                 $data[$name] = new AssociationCacheEntry($targetClass, $targetId);
@@ -165,7 +165,7 @@ 
                 ($association instanceof OneToOneAssociationMetadata && ! $association->isOwningSide())
             );
 
-            if (! $isEagerLoad) {
+            if ( ! $isEagerLoad) {
                 $data[$name] = $this->em->getReference($assocClass, $assocId);
 
                 continue;

lib/Doctrine/ORM/Mapping/Builder/JoinTableMetadataBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -82,11 +82,11 @@ 
         $joinTableMetadata->setName($namingStrategy->joinTableName($souceEntity, $this->targetEntity, $this->fieldName));
 
         if ($this->joinTableAnnotation !== null) {
-            if (! empty($this->joinTableAnnotation->name)) {
+            if ( ! empty($this->joinTableAnnotation->name)) {
                 $joinTableMetadata->setName($this->joinTableAnnotation->name);
             }
 
-            if (! empty($this->joinTableAnnotation->schema)) {
+            if ( ! empty($this->joinTableAnnotation->schema)) {
                 $joinTableMetadata->setSchema($this->joinTableAnnotation->schema);
             }
 
@@ -122,7 +122,7 @@ 
 
         $selfReferenceEntity = $souceEntity === $this->targetEntity;
 
-        if (! $joinTableMetadata->getJoinColumns()) {
+        if ( ! $joinTableMetadata->getJoinColumns()) {
             $joinColumnAnnotation = new Annotation\JoinColumn();
 
             $joinColumnAnnotation->onDelete             = 'CASCADE';
@@ -137,7 +137,7 @@ 
             $joinTableMetadata->addJoinColumn($this->joinColumnMetadataBuilder->build());
         }
 
-        if (! $joinTableMetadata->getInverseJoinColumns()) {
+        if ( ! $joinTableMetadata->getInverseJoinColumns()) {
             $joinColumnAnnotation = new Annotation\JoinColumn();
 
             $joinColumnAnnotation->onDelete             = 'CASCADE';

lib/Doctrine/ORM/Mapping/Builder/JoinColumnMetadataBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
         $namingStrategy     = $this->metadataBuildingContext->getNamingStrategy();
         $joinColumnMetadata = new Mapping\JoinColumnMetadata();
 
-        if (! $this->componentMetadata->isMappedSuperclass) {
+        if ( ! $this->componentMetadata->isMappedSuperclass) {
             $joinColumnMetadata->setTableName($this->componentMetadata->getTableName());
         }
 
@@ -73,19 +73,19 @@ 
         $joinColumnMetadata->setNullable($this->joinColumnAnnotation->nullable);
         $joinColumnMetadata->setUnique($this->joinColumnAnnotation->unique);
 
-        if (! empty($this->joinColumnAnnotation->name)) {
+        if ( ! empty($this->joinColumnAnnotation->name)) {
             $joinColumnMetadata->setColumnName($this->joinColumnAnnotation->name);
         }
 
-        if (! empty($this->joinColumnAnnotation->referencedColumnName)) {
+        if ( ! empty($this->joinColumnAnnotation->referencedColumnName)) {
             $joinColumnMetadata->setReferencedColumnName($this->joinColumnAnnotation->referencedColumnName);
         }
 
-        if (! empty($this->joinColumnAnnotation->fieldName)) {
+        if ( ! empty($this->joinColumnAnnotation->fieldName)) {
             $joinColumnMetadata->setAliasedName($this->joinColumnAnnotation->fieldName);
         }
 
-        if (! empty($this->joinColumnAnnotation->columnDefinition)) {
+        if ( ! empty($this->joinColumnAnnotation->columnDefinition)) {
             $joinColumnMetadata->setColumnDefinition($this->joinColumnAnnotation->columnDefinition);
         }