doctrine / orm

lib/Doctrine/ORM/UnitOfWork.php

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -390,7 +390,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
                     }
 
@@ -475,7 +475,7 @@ 
         $oid  = spl_object_id($entity);
         $data = [];
 
-        if (!isset($this->entityChangeSets[$oid])) {
+        if ( ! isset($this->entityChangeSets[$oid])) {
             return $data;
         }
 
@@ -558,7 +558,7 @@ 
                     || ! $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;
             }
         }
@@ -612,7 +612,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
                         }
 
@@ -650,7 +650,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
@@ -673,7 +673,7 @@ 
 
         // Look for changes in associations of the entity
         foreach ($class->getDeclaredPropertiesIterator() as $property) {
-            if (! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
+            if ( ! ($property instanceof AssociationMetadata) || ($value = $property->getValue($entity)) === null) {
                 continue;
             }
 
@@ -777,13 +777,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 ORMException::unexpectedAssociationValue(
                     $association->getSourceEntity(),
                     $association->getName(),
@@ -845,7 +845,7 @@ 
         $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));
             $this->entityIdentifiers[$oid] = $id;
         }
@@ -878,7 +878,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);
         }
 
@@ -900,7 +900,7 @@ 
                     break;
 
                 case ($property instanceof FieldMetadata):
-                    if (! $property->isPrimaryKey()
+                    if ( ! $property->isPrimaryKey()
                         || ! $property->getValueGenerator()
                         || $property->getValueGenerator()->getType() !== GeneratorType::IDENTITY) {
                         $actualData[$name] = $property->getValue($entity);
@@ -1053,7 +1053,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.
             //$this->entityStates[$oid] = self::STATE_NEW;
-            if (! $class->isIdentifierComposite()) {
+            if ( ! $class->isIdentifierComposite()) {
                 $property = $class->getProperty($class->getSingleIdentifierFieldName());
 
                 if ($property instanceof FieldMetadata && $property->hasValueGenerator()) {
@@ -1100,7 +1100,7 @@ 
         // Calculate dependencies for new nodes
         while ($class = array_pop($newNodes)) {
             foreach ($class->getDeclaredPropertiesIterator() as $property) {
-                if (! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
+                if ( ! ($property instanceof ToOneAssociationMetadata && $property->isOwningSide())) {
                     continue;
                 }
 
@@ -1114,7 +1114,7 @@ 
 
                 $weight = ! array_filter(
                     $property->getJoinColumns(),
-                    function (JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
+                    function(JoinColumnMetadata $joinColumn) { return $joinColumn->isNullable(); }
                 );
 
                 $calc->addDependency($targetClass->getClassName(), $class->getClassName(), $weight);
@@ -1408,7 +1408,7 @@ 
         $persister = $this->getEntityPersister($class->getClassName());
         $id        = $persister->getIdentifier($entity);
 
-        if (! $id) {
+        if ( ! $id) {
             return self::STATE_NEW;
         }
 
@@ -1640,7 +1640,7 @@ 
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
 
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
 
         $this->cascadePersist($entity, $visited);
@@ -1710,7 +1710,7 @@ 
             case self::STATE_DETACHED:
                 throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
             default:
-                throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
+                throw new UnexpectedValueException("Unexpected entity state: $entityState.".self::objToStr($entity));
         }
     }
 
@@ -1778,7 +1778,7 @@ 
         $class = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('refresh', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1827,7 +1827,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('persist', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1843,7 +1843,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,
@@ -1858,7 +1858,7 @@ 
                     break;
 
                 case ($relatedEntities !== null):
-                    if (! $relatedEntities instanceof $targetEntity) {
+                    if ( ! $relatedEntities instanceof $targetEntity) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($targetEntity),
                             $association,
@@ -1889,7 +1889,7 @@ 
         $class             = $this->em->getClassMetadata(get_class($entity));
 
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
+            if ( ! ($association instanceof AssociationMetadata && in_array('remove', $association->getCascade(), true))) {
                 continue;
             }
 
@@ -1973,7 +1973,7 @@ 
             case LockMode::NONE === $lockMode:
             case LockMode::PESSIMISTIC_READ === $lockMode:
             case LockMode::PESSIMISTIC_WRITE === $lockMode:
-                if (!$this->em->getConnection()->isTransactionActive()) {
+                if ( ! $this->em->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
 
@@ -2193,7 +2193,7 @@ 
         }
 
         foreach ($class->getDeclaredPropertiesIterator() as $field => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -2242,7 +2242,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])])) {
@@ -2292,7 +2292,7 @@ 
                 $associatedId[$targetField] = $joinColumnValue;
             }
 
-            if (! $associatedId) {
+            if ( ! $associatedId) {
                 // Foreign key is NULL
                 $association->setValue($entity, null);
                 $this->originalEntityData[$oid][$field] = null;
@@ -2301,7 +2301,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();
             }
 
@@ -2318,7 +2318,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 &&
@@ -2355,7 +2355,7 @@ 
                             break;
 
                         // Deferred eager load only works for single identifier classes
-                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && !$targetClass->isIdentifierComposite()):
+                        case (isset($hints[self::HINT_DEFEREAGERLOAD]) && ! $targetClass->isIdentifierComposite()):
                             // TODO: Is there a faster approach?
                             $this->eagerLoadingEntities[$targetClass->getRootClassName()][$relatedIdHash] = current($normalizedAssociatedId);
 
@@ -2762,7 +2762,7 @@ 
     {
         $class = $this->em->getClassMetadata(get_class($entity));
 
-        if (! $class->getProperty($propertyName)) {
+        if ( ! $class->getProperty($propertyName)) {
             return; // ignore non-persistent fields
         }
 
@@ -2902,7 +2902,7 @@ 
      */
     private function afterTransactionComplete()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionComplete();
         });
     }
@@ -2912,7 +2912,7 @@ 
      */
     private function afterTransactionRolledBack()
     {
-        $this->performCallbackOnCachedPersister(function (CachedPersister $persister) {
+        $this->performCallbackOnCachedPersister(function(CachedPersister $persister) {
             $persister->afterTransactionRolledBack();
         });
     }

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -81,7 +81,7 @@ 
         $ce = [];
 
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -89,7 +89,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());
@@ -111,7 +111,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 [
@@ -132,7 +132,7 @@ 
 
         /** @var ClassMetadata $targetMetadata */
         $targetMetadata    = $metadataFactory->getMetadataFor($targetEntity);
-        $containsForeignId = array_filter($targetMetadata->identifier, function ($identifier) use ($targetMetadata) {
+        $containsForeignId = array_filter($targetMetadata->identifier, function($identifier) use ($targetMetadata) {
             $targetProperty = $targetMetadata->getProperty($identifier);
 
             return $targetProperty instanceof AssociationMetadata;
@@ -148,7 +148,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);
@@ -172,7 +172,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);
@@ -216,7 +216,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());
@@ -225,7 +225,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, $joinColumn->getReferencedColumnName(), $targetMetadata->getClassName());
@@ -235,7 +235,7 @@ 
 
                 if (count($targetIdentifierColumns) !== count($joinTable->getInverseJoinColumns())) {
                     $columnNames = array_map(
-                        function (JoinColumnMetadata $joinColumn) {
+                        function(JoinColumnMetadata $joinColumn) {
                             return $joinColumn->getReferencedColumnName();
                         },
                         $joinTable->getInverseJoinColumns()
@@ -250,7 +250,7 @@ 
 
                 if (count($classIdentifierColumns) !== count($joinTable->getJoinColumns())) {
                     $columnNames = array_map(
-                        function (JoinColumnMetadata $joinColumn) {
+                        function(JoinColumnMetadata $joinColumn) {
                             return $joinColumn->getReferencedColumnName();
                         },
                         $joinTable->getJoinColumns()
@@ -267,7 +267,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());
@@ -298,7 +298,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/Pagination/LimitSubqueryOutputWalker.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools\Pagination;
 
@@ -194,11 +194,11 @@ 
 
         $innerSql           = $this->getInnerSQL($AST);
         $sqlIdentifier      = $this->getSQLIdentifier($AST);
-        $sqlAliasIdentifier = array_map(function ($info) { return $info['alias']; }, $sqlIdentifier);
+        $sqlAliasIdentifier = array_map(function($info) { return $info['alias']; }, $sqlIdentifier);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlAliasIdentifier);
-            $sqlPiece     = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlAliasIdentifier);
+            $sqlPiece     = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
 
             $sqlAliasIdentifier[] = $sqlPiece;
             $sqlIdentifier[] = [
@@ -211,7 +211,7 @@ 
         $sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result', implode(', ', $sqlAliasIdentifier), $innerSql);
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -256,7 +256,7 @@ 
 
         $innerSql           = $this->getInnerSQL($AST);
         $sqlIdentifier      = $this->getSQLIdentifier($AST);
-        $sqlAliasIdentifier = array_map(function ($info) { return $info['alias']; }, $sqlIdentifier);
+        $sqlAliasIdentifier = array_map(function($info) { return $info['alias']; }, $sqlIdentifier);
 
         // Build the counter query
         $sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result', implode(', ', $sqlAliasIdentifier), $innerSql);
@@ -364,7 +364,7 @@ 
         ?OrderByClause $orderByClause
     ) : string {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct statement
-        if (! $orderByClause) {
+        if ( ! $orderByClause) {
             return $sql;
         }
 
@@ -406,7 +406,7 @@ 
             $orderByItems[] = $orderByItemString;
             $identifier     = \substr($orderByItemString, 0, \strrpos($orderByItemString, ' '));
 
-            if (! \in_array($identifier, $identifiers, true)) {
+            if ( ! \in_array($identifier, $identifiers, true)) {
                 $identifiers[] = $identifier;
             }
         }
@@ -562,7 +562,7 @@ 
      */
     public function walkPathExpression($pathExpr)
     {
-        if (!$this->inSubSelect && !$this->platformSupportsRowNumber() && !in_array($pathExpr, $this->orderByPathExpressions, true)) {
+        if ( ! $this->inSubSelect && ! $this->platformSupportsRowNumber() && ! in_array($pathExpr, $this->orderByPathExpressions, true)) {
             $this->orderByPathExpressions[] = $pathExpr;
         }
 

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Tools;
 
@@ -180,11 +180,11 @@ 
                     $pkColumns = [];
 
                     foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                        if (! ($property instanceof FieldMetadata)) {
+                        if ( ! ($property instanceof FieldMetadata)) {
                             continue;
                         }
 
-                        if (! $class->isInheritedProperty($fieldName)) {
+                        if ( ! $class->isInheritedProperty($fieldName)) {
                             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
                             $this->gatherColumn($class, $property, $table);
@@ -324,7 +324,7 @@ 
             $processedClasses[$class->getClassName()] = true;
 
             foreach ($class->getDeclaredPropertiesIterator() as $property) {
-                if (! $property instanceof FieldMetadata
+                if ( ! $property instanceof FieldMetadata
                     || ! $property->hasValueGenerator()
                     || $property->getValueGenerator()->getType() !== GeneratorType::SEQUENCE
                     || $class->getClassName() !== $class->getRootClassName()) {
@@ -333,7 +333,7 @@ 
 
                 $quotedName = $this->platform->quoteIdentifier($property->getValueGenerator()->getDefinition()['sequenceName']);
 
-                if (! $schema->hasSequence($quotedName)) {
+                if ( ! $schema->hasSequence($quotedName)) {
                     $schema->createSequence($quotedName, $property->getValueGenerator()->getDefinition()['allocationSize']);
                 }
             }
@@ -388,7 +388,7 @@ 
                 break;
         }
 
-        if (!empty($discrColumn->getColumnDefinition())) {
+        if ( ! empty($discrColumn->getColumnDefinition())) {
             $options['columnDefinition'] = $discrColumn->getColumnDefinition();
         }
 
@@ -409,7 +409,7 @@ 
         $pkColumns = [];
 
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof FieldMetadata)) {
+            if ( ! ($property instanceof FieldMetadata)) {
                 continue;
             }
 
@@ -527,7 +527,7 @@ 
     private function gatherRelationsSql($class, $table, $schema, &$addedFks, &$blacklistedFks)
     {
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -535,7 +535,7 @@ 
                 continue;
             }
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -625,7 +625,7 @@ 
         $idColumns        = $class->getIdentifierColumns($this->em);
         $idColumnNameList = array_keys($idColumns);
 
-        if (! in_array($referencedColumnName, $idColumnNameList, true)) {
+        if ( ! in_array($referencedColumnName, $idColumnNameList, true)) {
             return null;
         }
 
@@ -633,7 +633,7 @@ 
         foreach ($class->getIdentifierFieldNames() as $fieldName) {
             $property = $class->getProperty($fieldName);
 
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -715,7 +715,7 @@ 
                 $property  = $definingClass->getProperty($referencedFieldName);
                 $columnDef = null;
 
-                if (!empty($joinColumn->getColumnDefinition())) {
+                if ( ! empty($joinColumn->getColumnDefinition())) {
                     $columnDef = $joinColumn->getColumnDefinition();
                 } elseif ($property->getColumnDefinition()) {
                     $columnDef = $property->getColumnDefinition();
@@ -749,7 +749,7 @@ 
                 $uniqueConstraints[] = ['columns' => [$quotedColumnName]];
             }
 
-            if (!empty($joinColumn->getOnDelete())) {
+            if ( ! empty($joinColumn->getOnDelete())) {
                 $fkOptions['onDelete'] = $joinColumn->getOnDelete();
             }
         }
@@ -888,7 +888,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }

lib/Doctrine/ORM/QueryBuilder.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -587,7 +587,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function (Query\Parameter $parameter) use ($key) : bool {
+            function(Query\Parameter $parameter) use ($key) : bool {
                 $parameterName = $parameter->getName();
 
                 return $key === $parameterName || (string) $key === (string) $parameterName;
@@ -669,7 +669,7 @@ 
         }
 
         $isMultiple = is_array($this->dqlParts[$dqlPartName])
-            && !($dqlPartName == 'join' && !$append);
+            && ! ($dqlPartName == 'join' && ! $append);
 
         // Allow adding any part retrieved from self::getDQLParts().
         if (is_array($dqlPart) && $dqlPartName != 'join') {
@@ -886,7 +886,7 @@ 
     {
         $rootAliases = $this->getRootAliases();
 
-        if (!in_array($alias, $rootAliases, true)) {
+        if ( ! in_array($alias, $rootAliases, true)) {
             throw new Query\QueryException(
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
             );
@@ -1286,14 +1286,14 @@ 
             foreach ($criteria->getOrderings() as $sort => $order) {
                 $hasValidAlias = false;
                 foreach ($allAliases as $alias) {
-                    if (strpos($sort . '.', $alias . '.') === 0) {
+                    if (strpos($sort.'.', $alias.'.') === 0) {
                         $hasValidAlias = true;
                         break;
                     }
                 }
 
-                if (!$hasValidAlias) {
-                    $sort = $allAliases[0] . '.' . $sort;
+                if ( ! $hasValidAlias) {
+                    $sort = $allAliases[0].'.'.$sort;
                 }
 
                 $this->addOrderBy($sort, $order);
@@ -1366,7 +1366,7 @@ 
     private function getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->dqlParts['distinct']===true ? ' DISTINCT' : '')
+             . ($this->dqlParts['distinct'] === true ? ' DISTINCT' : '')
              . $this->getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
@@ -1382,7 +1382,7 @@ 
 
                 if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
-                        $fromClause .= ' ' . ((string) $join);
+                        $fromClause .= ' '.((string) $join);
                     }
                 }
 

lib/Doctrine/ORM/Query/Parser.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -470,7 +470,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError(
             $message,
@@ -618,7 +618,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -667,13 +667,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->getClassName() . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->getClassName().".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->getClassName() . " must contain the identifier.",
+                    "The partial field selection of class ".$class->getClassName()." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -742,9 +742,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -783,8 +783,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= \count($expectedStringTypes) === 1
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -955,7 +955,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -1039,7 +1039,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1052,8 +1052,8 @@ 
         $qComp = $this->queryComponents[$identVariable];
         $class = $qComp['metadata'];
 
-        if (! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2475,7 +2475,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], ["=",  "<", "<=", "<>", ">", ">=", "!="], true) ||
+        if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="], true) ||
             in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS], true) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2580,7 +2580,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

lib/Doctrine/ORM/Query/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, true))) {
+                            if ($subClass->isInheritedProperty($fieldName) || ($partialFieldSet && ! in_array($fieldName, $partialFieldSet, true))) {
                                 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/Persisters/Entity/BasicEntityPersister.php

Spacing +75 added lines, -75 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Persisters\Entity;
 
@@ -300,14 +300,14 @@ 
         $tableName      = $versionedClass->table->getQuotedQualifiedName($this->platform);
         $columnName     = $this->platform->quoteIdentifier($versionProperty->getColumnName());
         $identifier     = array_map(
-            function ($columnName) { return $this->platform->quoteIdentifier($columnName); },
+            function($columnName) { return $this->platform->quoteIdentifier($columnName); },
             array_keys($versionedClass->getIdentifierColumns($this->em))
         );
 
         // FIXME: Order with composite keys might not be correct
-        $sql = 'SELECT ' . $columnName
-             . ' FROM '  . $tableName
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
+        $sql = 'SELECT '.$columnName
+             . ' FROM '.$tableName
+             . ' WHERE '.implode(' = ? AND ', $identifier).' = ?';
 
         $flattenedId = $this->em->getIdentifierFlattener()->flattenIdentifier($versionedClass, $id);
         $versionType = $versionProperty->getType();
@@ -393,7 +393,7 @@ 
 
             if (($value = $identifier[$field]) !== null) {
                 // @todo guilhermeblanco Make sure we do not have flat association values.
-                if (! is_array($value)) {
+                if ( ! is_array($value)) {
                     $value = [$targetClass->identifier[0] => $value];
                 }
 
@@ -406,7 +406,7 @@ 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
                 $targetField          = $targetClass->fieldNames[$referencedColumnName];
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -474,7 +474,7 @@ 
                         $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                         $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -501,18 +501,18 @@ 
                 case Type::SMALLINT:
                 case Type::INTEGER:
                 case Type::BIGINT:
-                    $set[] = $versionColumnName . ' = ' . $versionColumnName . ' + 1';
+                    $set[] = $versionColumnName.' = '.$versionColumnName.' + 1';
                     break;
 
                 case Type::DATETIME:
-                    $set[] = $versionColumnName . ' = CURRENT_TIMESTAMP';
+                    $set[] = $versionColumnName.' = CURRENT_TIMESTAMP';
                     break;
             }
         }
 
-        $sql = 'UPDATE ' . $quotedTableName
-             . ' SET ' . implode(', ', $set)
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
+        $sql = 'UPDATE '.$quotedTableName
+             . ' SET '.implode(', ', $set)
+             . ' WHERE '.implode(' = ? AND ', $where).' = ?';
 
         $result = $this->conn->executeUpdate($sql, $params, $types);
 
@@ -531,7 +531,7 @@ 
     protected function deleteJoinTableRecords($identifier)
     {
         foreach ($this->class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof ManyToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ManyToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -544,7 +544,7 @@ 
             $keys              = [];
 
             if ( ! $owningAssociation->isOwningSide()) {
-                $class       = $this->em->getClassMetadata($association->getTargetEntity());
+                $class = $this->em->getClassMetadata($association->getTargetEntity());
                 $owningAssociation = $class->getProperty($association->getMappedBy());
             }
 
@@ -656,7 +656,7 @@ 
             }
 
             // Only owning side of x-1 associations can have a FK column.
-            if (! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
+            if ( ! $property instanceof ToOneAssociationMetadata || ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -676,7 +676,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -705,7 +705,7 @@ 
         $propertyName = $this->class->fieldNames[$columnName];
         $property     = $this->class->getProperty($propertyName);
 
-        if (! $property) {
+        if ( ! $property) {
             return null;
         }
 
@@ -724,7 +724,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1061,7 +1061,7 @@ 
         $criteria       = [];
         $parameters     = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $class       = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssoc = $class->getProperty($association->getMappedBy());
         }
@@ -1089,7 +1089,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$joinTableName . '.' . $quotedColumnName] = $value;
+            $criteria[$joinTableName.'.'.$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -1140,11 +1140,11 @@ 
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
                 break;
         }
 
@@ -1155,14 +1155,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
-        $select = 'SELECT ' . $columnList;
-        $from   = ' FROM ' . $tableName . ' '. $tableAlias;
-        $join   = $this->currentPersisterContext->selectJoinSql . $joinSql;
-        $where  = ($conditionSql ? ' WHERE ' . $conditionSql : '');
+        $select = 'SELECT '.$columnList;
+        $from   = ' FROM '.$tableName.' '.$tableAlias;
+        $join   = $this->currentPersisterContext->selectJoinSql.$joinSql;
+        $where  = ($conditionSql ? ' WHERE '.$conditionSql : '');
         $lock   = $this->platform->appendLockHint($from, $lockMode);
         $query  = $select
             . $lock
@@ -1170,7 +1170,7 @@ 
             . $where
             . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -1189,13 +1189,13 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $tableAlias
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . 'FROM '.$tableName.' '.$tableAlias
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -1212,7 +1212,7 @@ 
      */
     protected final function getOrderBySQL(array $orderBy, $baseTableAlias)
     {
-        if (! $orderBy) {
+        if ( ! $orderBy) {
             return '';
         }
 
@@ -1221,7 +1221,7 @@ 
         foreach ($orderBy as $fieldName => $orientation) {
             $orientation = strtoupper(trim($orientation));
 
-            if (! in_array($orientation, ['ASC', 'DESC'], true)) {
+            if ( ! in_array($orientation, ['ASC', 'DESC'], true)) {
                 throw ORMException::invalidOrientation($this->class->getClassName(), $fieldName);
             }
 
@@ -1231,11 +1231,11 @@ 
                 $tableAlias = $this->getSQLTableAlias($property->getTableName());
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderByList[] = $tableAlias . '.' . $columnName . ' ' . $orientation;
+                $orderByList[] = $tableAlias.'.'.$columnName.' '.$orientation;
 
                 continue;
             } elseif ($property instanceof AssociationMetadata) {
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $fieldName);
                 }
 
@@ -1248,7 +1248,7 @@ 
                     /* @var JoinColumnMetadata $joinColumn */
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $orderByList[] = $tableAlias . '.' . $quotedColumnName . ' ' . $orientation;
+                    $orderByList[] = $tableAlias.'.'.$quotedColumnName.' '.$orientation;
                 }
 
                 continue;
@@ -1257,7 +1257,7 @@ 
             throw ORMException::unrecognizedField($fieldName);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByList);
+        return ' ORDER BY '.implode(', ', $orderByList);
     }
 
     /**
@@ -1279,7 +1279,7 @@ 
 
 
         $this->currentPersisterContext->rsm->addEntityResult($this->class->getClassName(), 'r'); // r for root
-        $this->currentPersisterContext->selectJoinSql    = '';
+        $this->currentPersisterContext->selectJoinSql = '';
 
         $eagerAliasCounter = 0;
         $columnList        = [];
@@ -1315,7 +1315,7 @@ 
                         break; // now this is why you shouldn't use inheritance
                     }
 
-                    $assocAlias = 'e' . ($eagerAliasCounter++);
+                    $assocAlias = 'e'.($eagerAliasCounter++);
 
                     $this->currentPersisterContext->rsm->addJoinedEntityResult($targetEntity, $assocAlias, 'r', $fieldName);
 
@@ -1340,14 +1340,14 @@ 
                         $this->currentPersisterContext->rsm->addIndexBy($assocAlias, $property->getIndexedBy());
                     }
 
-                    if (! $property->isOwningSide()) {
+                    if ( ! $property->isOwningSide()) {
                         $owningAssociation = $eagerEntity->getProperty($property->getMappedBy());
                     }
 
                     $joinTableAlias = $this->getSQLTableAlias($eagerEntity->getTableName(), $assocAlias);
                     $joinTableName  = $eagerEntity->table->getQuotedQualifiedName($this->platform);
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $this->getJoinSQLForAssociation($property);
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$this->getJoinSQLForAssociation($property);
 
                     $sourceClass      = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
                     $targetClass      = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
@@ -1369,7 +1369,7 @@ 
                         $joinCondition[] = $filterSql;
                     }
 
-                    $this->currentPersisterContext->selectJoinSql .= ' ' . $joinTableName . ' ' . $joinTableAlias . ' ON ';
+                    $this->currentPersisterContext->selectJoinSql .= ' '.$joinTableName.' '.$joinTableAlias.' ON ';
                     $this->currentPersisterContext->selectJoinSql .= implode(' AND ', $joinCondition);
 
                     break;
@@ -1393,7 +1393,7 @@ 
      */
     protected function getSelectColumnAssociationSQL($field, AssociationMetadata $association, ClassMetadata $class, $alias = 'r')
     {
-        if (! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
+        if ( ! ($association->isOwningSide() && $association instanceof ToOneAssociationMetadata)) {
             return '';
         }
 
@@ -1408,7 +1408,7 @@ 
             $referencedColumnName = $joinColumn->getReferencedColumnName();
             $resultColumnName     = $this->getSQLColumnAlias();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -1440,7 +1440,7 @@ 
         $owningAssociation = $association;
         $sourceTableAlias  = $this->getSQLTableAlias($this->class->getTableName());
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $targetEntity      = $this->em->getClassMetadata($association->getTargetEntity());
             $owningAssociation = $targetEntity->getProperty($association->getMappedBy());
         }
@@ -1462,7 +1462,7 @@ 
             );
         }
 
-        return ' INNER JOIN ' . $joinTableName . ' ON ' . implode(' AND ', $conditions);
+        return ' INNER JOIN '.$joinTableName.' ON '.implode(' AND ', $conditions);
     }
 
     /**
@@ -1557,7 +1557,7 @@ 
                             $columnName           = $joinColumn->getColumnName();
                             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                            if (! $joinColumn->getType()) {
+                            if ( ! $joinColumn->getType()) {
                                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                             }
 
@@ -1596,7 +1596,7 @@ 
 
         $this->currentPersisterContext->rsm->addFieldResult($alias, $columnAlias, $field, $class->getClassName());
 
-        return $property->getType()->convertToPHPValueSQL($sql, $this->platform) . ' AS ' . $columnAlias;
+        return $property->getType()->convertToPHPValueSQL($sql, $this->platform).' AS '.$columnAlias;
     }
 
     /**
@@ -1610,14 +1610,14 @@ 
     protected function getSQLTableAlias($tableName, $assocName = '')
     {
         if ($tableName) {
-            $tableName .= '#' . $assocName;
+            $tableName .= '#'.$assocName;
         }
 
         if (isset($this->currentPersisterContext->sqlTableAliases[$tableName])) {
             return $this->currentPersisterContext->sqlTableAliases[$tableName];
         }
 
-        $tableAlias = 't' . $this->currentPersisterContext->sqlAliasCounter++;
+        $tableAlias = 't'.$this->currentPersisterContext->sqlAliasCounter++;
 
         $this->currentPersisterContext->sqlTableAliases[$tableName] = $tableAlias;
 
@@ -1644,7 +1644,7 @@ 
         }
 
         $lock  = $this->getLockTablesSql($lockMode);
-        $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
+        $where = ($conditionSql ? ' WHERE '.$conditionSql : '').' ';
         $sql = 'SELECT 1 '
              . $lock
              . $where
@@ -1667,7 +1667,7 @@ 
         $tableName = $this->class->table->getQuotedQualifiedName($this->platform);
 
         return $this->platform->appendLockHint(
-            'FROM ' . $tableName . ' ' . $this->getSQLTableAlias($this->class->getTableName()),
+            'FROM '.$tableName.' '.$this->getSQLTableAlias($this->class->getTableName()),
             $lockMode
         );
     }
@@ -1720,19 +1720,19 @@ 
 
             if (null !== $comparison) {
                 // special case null value handling
-                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null ===$value) {
-                    $selectedColumns[] = $column . ' IS NULL';
+                if (($comparison === Comparison::EQ || $comparison === Comparison::IS) && null === $value) {
+                    $selectedColumns[] = $column.' IS NULL';
 
                     continue;
                 }
 
                 if ($comparison === Comparison::NEQ && null === $value) {
-                    $selectedColumns[] = $column . ' IS NOT NULL';
+                    $selectedColumns[] = $column.' IS NOT NULL';
 
                     continue;
                 }
 
-                $selectedColumns[] = $column . ' ' . sprintf(self::$comparisonMap[$comparison], $placeholder);
+                $selectedColumns[] = $column.' '.sprintf(self::$comparisonMap[$comparison], $placeholder);
 
                 continue;
             }
@@ -1781,7 +1781,7 @@ 
             $tableAlias = $this->getSQLTableAlias($property->getTableName());
             $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-            return [$tableAlias . '.' . $columnName];
+            return [$tableAlias.'.'.$columnName];
         }
 
         if ($property instanceof AssociationMetadata) {
@@ -1790,7 +1790,7 @@ 
 
             // Many-To-Many requires join table check for joinColumn
             if ($owningAssociation instanceof ManyToManyAssociationMetadata) {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     $owningAssociation = $association;
                 }
 
@@ -1804,14 +1804,14 @@ 
                 foreach ($joinColumns as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $joinTableName . '.' . $quotedColumnName;
+                    $columns[] = $joinTableName.'.'.$quotedColumnName;
                 }
             } else {
-                if (! $owningAssociation->isOwningSide()) {
+                if ( ! $owningAssociation->isOwningSide()) {
                     throw ORMException::invalidFindByInverseAssociation($this->class->getClassName(), $field);
                 }
 
-                $class      = $this->class->isInheritedProperty($field)
+                $class = $this->class->isInheritedProperty($field)
                     ? $owningAssociation->getDeclaringClass()
                     : $this->class
                 ;
@@ -1820,7 +1820,7 @@ 
                 foreach ($owningAssociation->getJoinColumns() as $joinColumn) {
                     $quotedColumnName = $this->platform->quoteIdentifier($joinColumn->getColumnName());
 
-                    $columns[] = $tableAlias . '.' . $quotedColumnName;
+                    $columns[] = $tableAlias.'.'.$quotedColumnName;
                 }
             }
 
@@ -1933,7 +1933,7 @@ 
                 $value = $value[$targetClass->identifier[0]];
             }
 
-            $criteria[$tableAlias . "." . $quotedColumnName] = $value;
+            $criteria[$tableAlias.".".$quotedColumnName] = $value;
             $parameters[] = [
                 'value' => $value,
                 'field' => $fieldName,
@@ -2020,7 +2020,7 @@ 
             case ($property instanceof AssociationMetadata):
                 $class = $this->em->getClassMetadata($property->getTargetEntity());
 
-                if (! $property->isOwningSide()) {
+                if ( ! $property->isOwningSide()) {
                     $property = $class->getProperty($property->getMappedBy());
                     $class    = $this->em->getClassMetadata($property->getTargetEntity());
                 }
@@ -2034,7 +2034,7 @@ 
                     /** @var JoinColumnMetadata $joinColumn */
                     $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
                     }
 
@@ -2049,7 +2049,7 @@ 
         }
 
         if (is_array($value)) {
-            return array_map(function ($type) {
+            return array_map(function($type) {
                 return $type->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
             }, $types);
         }
@@ -2128,12 +2128,12 @@ 
 
         $sql = 'SELECT 1 '
              . $this->getLockTablesSql(null)
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
+             . ' WHERE '.$this->getSelectConditionSQL($criteria);
 
         list($params, $types) = $this->expandParameters($criteria);
 
         if (null !== $extraConditions) {
-            $sql                                 .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions);
+            $sql                                 .= ' AND '.$this->getSelectConditionCriteriaSQL($extraConditions);
             list($criteriaParams, $criteriaTypes) = $this->expandCriteriaParameters($extraConditions);
 
             $params = array_merge($params, $criteriaParams);
@@ -2141,7 +2141,7 @@ 
         }
 
         if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) {
-            $sql .= ' AND ' . $filterSql;
+            $sql .= ' AND '.$filterSql;
         }
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
@@ -2156,13 +2156,13 @@ 
      */
     protected function getJoinSQLForAssociation(AssociationMetadata $association)
     {
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return 'LEFT JOIN';
         }
 
         // if one of the join columns is nullable, return left join
         foreach ($association->getJoinColumns() as $joinColumn) {
-            if (! $joinColumn->isNullable()) {
+            if ( ! $joinColumn->isNullable()) {
                 continue;
             }
 
@@ -2179,7 +2179,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->currentPersisterContext->sqlAliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->currentPersisterContext->sqlAliasCounter++);
     }
 
     /**
@@ -2196,13 +2196,13 @@ 
 
         foreach ($this->em->getFilters()->getEnabledFilters() as $filter) {
             if ('' !== $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias)) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
         $sql = implode(' AND ', $filterClauses);
 
-        return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
+        return $sql ? "(".$sql.")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
     }
 
     /**

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Spacing +45 added lines, -45 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping;
 
@@ -308,7 +308,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_id($this);
+        return __CLASS__.'@'.spl_object_id($this);
     }
 
     /**
@@ -411,7 +411,7 @@ 
         // Restore ReflectionClass and properties
         $this->reflectionClass = $reflectionService->getClass($this->className);
 
-        if (! $this->reflectionClass) {
+        if ( ! $this->reflectionClass) {
             return;
         }
 
@@ -437,11 +437,11 @@ 
         }
 
         // Verify & complete identifier mapping
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             throw MappingException::identifierRequired($this->className);
         }
 
-        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, function (Property $property) : bool {
+        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, function(Property $property) : bool {
             return $property instanceof FieldMetadata
                 && $property->isPrimaryKey()
                 && $property->hasValueGenerator();
@@ -462,14 +462,14 @@ 
     public function validateAssociations() : void
     {
         array_map(
-            function (Property $property) {
-                if (! ($property instanceof AssociationMetadata)) {
+            function(Property $property) {
+                if ( ! ($property instanceof AssociationMetadata)) {
                     return;
                 }
 
                 $targetEntity = $property->getTargetEntity();
 
-                if (! class_exists($targetEntity)) {
+                if ( ! class_exists($targetEntity)) {
                     throw MappingException::invalidTargetEntityClass($targetEntity, $this->className, $property->getName());
                 }
             },
@@ -491,7 +491,7 @@ 
         foreach ($this->lifecycleCallbacks as $callbacks) {
             /** @var array $callbacks */
             foreach ($callbacks as $callbackFuncName) {
-                if (! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
+                if ( ! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
                     throw MappingException::lifecycleCallbackMethodNotFound($this->className, $callbackFuncName);
                 }
             }
@@ -519,11 +519,11 @@ 
      */
     public function isIdentifier(string $fieldName) : bool
     {
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             return false;
         }
 
-        if (! $this->isIdentifierComposite()) {
+        if ( ! $this->isIdentifierComposite()) {
             return $fieldName === $this->identifier[0];
         }
 
@@ -551,7 +551,7 @@ 
      */
     public function getNamedQuery($queryName) : string
     {
-        if (! isset($this->namedQueries[$queryName])) {
+        if ( ! isset($this->namedQueries[$queryName])) {
             throw MappingException::queryNotFound($this->className, $queryName);
         }
 
@@ -611,7 +611,7 @@ 
      */
     public function getSqlResultSetMapping($name)
     {
-        if (! isset($this->sqlResultSetMappings[$name])) {
+        if ( ! isset($this->sqlResultSetMappings[$name])) {
             throw MappingException::resultMappingNotFound($this->className, $name);
         }
 
@@ -646,7 +646,7 @@ 
             $property->setColumnName($columnName);
         }
 
-        if (! $this->isMappedSuperclass) {
+        if ( ! $this->isMappedSuperclass) {
             $property->setTableName($this->getTableName());
         }
 
@@ -666,7 +666,7 @@ 
                 throw MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($property);
             }
 
-            if (! in_array($fieldName, $this->identifier, true)) {
+            if ( ! in_array($fieldName, $this->identifier, true)) {
                 $this->identifier[] = $fieldName;
             }
         }
@@ -720,7 +720,7 @@ 
         $fieldName    = $property->getName();
         $targetEntity = $property->getTargetEntity();
 
-        if (! $targetEntity) {
+        if ( ! $targetEntity) {
             throw MappingException::missingTargetEntity($fieldName);
         }
 
@@ -746,7 +746,7 @@ 
                 $this->identifier[] = $property->getName();
             }
 
-            if ($this->cache && !$property->getCache()) {
+            if ($this->cache && ! $property->getCache()) {
                 throw CacheException::nonCacheableEntityAssociation($this->className, $fieldName);
             }
 
@@ -800,7 +800,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 if ($property instanceof OneToOneAssociationMetadata && $this->inheritanceType !== InheritanceType::SINGLE_TABLE) {
                     if (1 === count($property->getJoinColumns())) {
-                        if (! $property->isPrimaryKey()) {
+                        if ( ! $property->isPrimaryKey()) {
                             $joinColumn->setUnique(true);
                         }
                     } else {
@@ -808,13 +808,13 @@ 
                     }
                 }
 
-                $joinColumn->setTableName(! $this->isMappedSuperclass ? $this->getTableName() : null);
+                $joinColumn->setTableName( ! $this->isMappedSuperclass ? $this->getTableName() : null);
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $joinColumn->setColumnName($this->namingStrategy->joinColumnName($fieldName, $this->className));
                 }
 
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
@@ -842,7 +842,7 @@ 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -908,14 +908,14 @@ 
         $property->setOwningSide(false);
 
         // OneToMany MUST have mappedBy
-        if (! $property->getMappedBy()) {
+        if ( ! $property->getMappedBy()) {
             throw MappingException::oneToManyRequiresMappedBy($property->getName());
         }
 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -938,7 +938,7 @@ 
 
             $property->setJoinTable($joinTable);
 
-            if (! $joinTable->getName()) {
+            if ( ! $joinTable->getName()) {
                 $joinTableName = $this->namingStrategy->joinTableName(
                     $property->getSourceEntity(),
                     $property->getTargetEntity(),
@@ -950,7 +950,7 @@ 
 
             $selfReferencingEntityWithoutJoinColumns = $property->getSourceEntity() == $property->getTargetEntity() && ! $joinTable->hasColumns();
 
-            if (! $joinTable->getJoinColumns()) {
+            if ( ! $joinTable->getJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $sourceReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'source' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getSourceEntity(), $sourceReferenceName);
@@ -963,7 +963,7 @@ 
                 $joinTable->addJoinColumn($joinColumn);
             }
 
-            if (! $joinTable->getInverseJoinColumns()) {
+            if ( ! $joinTable->getInverseJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $targetReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'target' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getTargetEntity(), $targetReferenceName);
@@ -978,13 +978,13 @@ 
 
             foreach ($joinTable->getJoinColumns() as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getSourceEntity(),
                         $referencedColumnName
@@ -996,13 +996,13 @@ 
 
             foreach ($joinTable->getInverseJoinColumns() as $inverseJoinColumn) {
                 /** @var JoinColumnMetadata $inverseJoinColumn */
-                if (! $inverseJoinColumn->getReferencedColumnName()) {
+                if ( ! $inverseJoinColumn->getReferencedColumnName()) {
                     $inverseJoinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $inverseJoinColumn->getReferencedColumnName();
 
-                if (! $inverseJoinColumn->getColumnName()) {
+                if ( ! $inverseJoinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getTargetEntity(),
                         $referencedColumnName
@@ -1099,7 +1099,7 @@ 
             // Association defined as Id field
             $targetClass = $em->getClassMetadata($property->getTargetEntity());
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 $property    = $targetClass->getProperty($property->getMappedBy());
                 $targetClass = $em->getClassMetadata($property->getTargetEntity());
             }
@@ -1114,7 +1114,7 @@ 
                 $columnName           = $joinColumn->getColumnName();
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $em));
                 }
 
@@ -1154,11 +1154,11 @@ 
     {
         $schema = null === $this->getSchemaName()
             ? ''
-            : $this->getSchemaName() . '_'
+            : $this->getSchemaName().'_'
         ;
 
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return $schema . $this->getTableName() . '_id_tmp';
+        return $schema.$this->getTableName().'_id_tmp';
     }
 
     /**
@@ -1218,7 +1218,7 @@ 
     {
         $fieldName = $property->getName();
 
-        if (! isset($this->declaredProperties[$fieldName])) {
+        if ( ! isset($this->declaredProperties[$fieldName])) {
             throw MappingException::invalidOverrideFieldName($this->className, $fieldName);
         }
 
@@ -1426,7 +1426,7 @@ 
         $declaringClass    = $property->getDeclaringClass();
 
         if ($inheritedProperty instanceof FieldMetadata) {
-            if (! $declaringClass->isMappedSuperclass) {
+            if ( ! $declaringClass->isMappedSuperclass) {
                 $inheritedProperty->setTableName($property->getTableName());
             }
 
@@ -1494,7 +1494,7 @@ 
             throw MappingException::duplicateQueryMapping($this->className, $name);
         }
 
-        if (! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
+        if ( ! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
             throw MappingException::missingQueryMapping($this->className, $name);
         }
 
@@ -1513,7 +1513,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->className);
         }
 
@@ -1523,7 +1523,7 @@ 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityResult) {
-                if (! isset($entityResult['entityClass'])) {
+                if ( ! isset($entityResult['entityClass'])) {
                     throw MappingException::missingResultSetMappingEntity($this->className, $resultMapping['name']);
                 }
 
@@ -1532,11 +1532,11 @@ 
 
                 if (isset($entityResult['fields'])) {
                     foreach ($entityResult['fields'] as $k => $field) {
-                        if (! isset($field['name'])) {
+                        if ( ! isset($field['name'])) {
                             throw MappingException::missingResultSetMappingFieldName($this->className, $resultMapping['name']);
                         }
 
-                        if (! isset($field['column'])) {
+                        if ( ! isset($field['column'])) {
                             $fieldName = $field['name'];
 
                             if (strpos($fieldName, '.')) {
@@ -1645,11 +1645,11 @@ 
             'method' => $method,
         ];
 
-        if (! class_exists($class)) {
+        if ( ! class_exists($class)) {
             throw MappingException::entityListenerClassNotFound($class, $this->className);
         }
 
-        if (! method_exists($class, $method)) {
+        if ( ! method_exists($class, $method)) {
             throw MappingException::entityListenerMethodNotFound($class, $method, $this->className);
         }
 
@@ -1725,7 +1725,7 @@ 
             return;
         }
 
-        if (! (class_exists($className) || interface_exists($className))) {
+        if ( ! (class_exists($className) || interface_exists($className))) {
             throw MappingException::invalidClassInDiscriminatorMap($className, $this->className);
         }