doctrine / orm

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

Spacing +2 added lines, -2 removed lines

@@ -25,11 +25,11 @@
         /** @var FieldMetadata $value */
         $variableExporter = new VariableExporter();
         $indentation      = str_repeat(self::INDENTATION, $indentationLevel);
-        $objectReference  = $indentation . self::VARIABLE;
+        $objectReference  = $indentation.self::VARIABLE;
 
         $lines   = [];
         $lines[] = parent::export($value, $indentationLevel);
-        $lines[] = $objectReference . '->setVersioned(' . ltrim($variableExporter->export($value->isVersioned(), $indentationLevel + 1)) . ');';
+        $lines[] = $objectReference.'->setVersioned('.ltrim($variableExporter->export($value->isVersioned(), $indentationLevel + 1)).');';
 
         return implode(PHP_EOL, $lines);
     }

lib/Doctrine/ORM/UnitOfWork.php

Spacing +54 added lines, -54 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 use function strtoupper;
 use function unserialize;
 
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
 class ClassMetadataTest extends OrmTestCase
 {
@@ -182,7 +182,7 @@ 
      */
     public function testMapAssociationInGlobalNamespace() : void
     {
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
         $cm = new ClassMetadata(DoctrineGlobalArticle::class, null, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_article'));
@@ -278,7 +278,7 @@ 
      */
     public function testSetDiscriminatorMapInGlobalNamespace() : void
     {
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
         $cm = new ClassMetadata('DoctrineGlobalUser', null, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_user'));
@@ -294,7 +294,7 @@ 
      */
     public function testSetSubClassesInGlobalNamespace() : void
     {
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
         $cm = new ClassMetadata('DoctrineGlobalUser', null, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_user'));
@@ -775,7 +775,7 @@ 
     public function testEmptyFieldNameThrowsException() : void
     {
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'.");
+        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '".CMS\CmsUser::class."'.");
 
         $cm = new ClassMetadata(CMS\CmsUser::class, null, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('cms_users'));
@@ -825,7 +825,7 @@ 
         $cm->addLifecycleCallback('postLoad', 'notfound');
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no public method 'notfound' to be registered as lifecycle callback.");
+        $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no public method 'notfound' to be registered as lifecycle callback.");
 
         $cm->validateLifecycleCallbacks(new RuntimeReflectionService());
     }
@@ -845,7 +845,7 @@ 
         $cm->addProperty($association);
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '" . CMS\CmsUser::class . "#address'.");
+        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '".CMS\CmsUser::class."#address'.");
 
         $cm->validateAssociations();
     }
@@ -1089,6 +1089,6 @@ 
      */
     public function propertyToColumnName(string $propertyName, ?string $className = null) : string
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
     }
 }

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +21 added lines, -21 removed lines

@@ -181,11 +181,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);
@@ -220,7 +220,7 @@ 
                             }
                         }
 
-                        if (! empty($inheritedKeyColumns)) {
+                        if ( ! empty($inheritedKeyColumns)) {
                             // Add a FK constraint on the ID column
                             $rootClass = $this->em->getClassMetadata($class->getRootClassName());
 
@@ -265,7 +265,7 @@ 
                 }
             }
 
-            if (! $table->hasIndex('primary')) {
+            if ( ! $table->hasIndex('primary')) {
                 $table->setPrimaryKey($pkColumns);
             }
 
@@ -325,7 +325,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()) {
@@ -334,7 +334,7 @@ 
 
                 $quotedName = $this->platform->quoteIdentifier($property->getValueGenerator()->getDefinition()['sequenceName']);
 
-                if (! $schema->hasSequence($quotedName)) {
+                if ( ! $schema->hasSequence($quotedName)) {
                     $schema->createSequence($quotedName, $property->getValueGenerator()->getDefinition()['allocationSize']);
                 }
             }
@@ -347,7 +347,7 @@ 
             }
         }
 
-        if (! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
+        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
             $schema->visit(new RemoveNamespacedAssets());
         }
 
@@ -386,7 +386,7 @@ 
                 break;
         }
 
-        if (! empty($discrColumn->getColumnDefinition())) {
+        if ( ! empty($discrColumn->getColumnDefinition())) {
             $options['columnDefinition'] = $discrColumn->getColumnDefinition();
         }
 
@@ -404,7 +404,7 @@ 
         $pkColumns = [];
 
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof FieldMetadata)) {
+            if ( ! ($property instanceof FieldMetadata)) {
                 continue;
             }
 
@@ -508,7 +508,7 @@ 
     private function gatherRelationsSql($class, $table, $schema, &$addedFks, &$blacklistedFks)
     {
         foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -516,7 +516,7 @@ 
                 continue;
             }
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 continue;
             }
 
@@ -606,7 +606,7 @@ 
         $idColumns        = $class->getIdentifierColumns($this->em);
         $idColumnNameList = array_keys($idColumns);
 
-        if (! in_array($referencedColumnName, $idColumnNameList, true)) {
+        if ( ! in_array($referencedColumnName, $idColumnNameList, true)) {
             return null;
         }
 
@@ -614,7 +614,7 @@ 
         foreach ($class->getIdentifierFieldNames() as $fieldName) {
             $property = $class->getProperty($fieldName);
 
-            if (! ($property instanceof AssociationMetadata)) {
+            if ( ! ($property instanceof AssociationMetadata)) {
                 continue;
             }
 
@@ -670,7 +670,7 @@ 
                 $joinColumn->getReferencedColumnName()
             );
 
-            if (! $definingClass) {
+            if ( ! $definingClass) {
                 throw MissingColumnException::fromColumnSourceAndTarget(
                     $joinColumn->getReferencedColumnName(),
                     $mapping->getSourceEntity(),
@@ -685,14 +685,14 @@ 
             $localColumns[]      = $quotedColumnName;
             $foreignColumns[]    = $quotedReferencedColumnName;
 
-            if (! $theJoinTable->hasColumn($quotedColumnName)) {
+            if ( ! $theJoinTable->hasColumn($quotedColumnName)) {
                 // Only add the column to the table if it does not exist already.
                 // It might exist already if the foreign key is mapped into a regular
                 // property as well.
                 $property  = $definingClass->getProperty($referencedFieldName);
                 $columnDef = null;
 
-                if (! empty($joinColumn->getColumnDefinition())) {
+                if ( ! empty($joinColumn->getColumnDefinition())) {
                     $columnDef = $joinColumn->getColumnDefinition();
                 } elseif ($property->getColumnDefinition()) {
                     $columnDef = $property->getColumnDefinition();
@@ -724,7 +724,7 @@ 
                 $uniqueConstraints[] = ['columns' => [$quotedColumnName]];
             }
 
-            if (! empty($joinColumn->getOnDelete())) {
+            if ( ! empty($joinColumn->getOnDelete())) {
                 $fkOptions['onDelete'] = $joinColumn->getOnDelete();
             }
         }
@@ -735,7 +735,7 @@ 
             $theJoinTable->addUniqueIndex($unique['columns'], is_numeric($indexName) ? null : $indexName);
         }
 
-        $compositeName = $theJoinTable->getName() . '.' . implode('', $localColumns);
+        $compositeName = $theJoinTable->getName().'.'.implode('', $localColumns);
 
         if (isset($addedFks[$compositeName])
             && ($foreignTableName !== $addedFks[$compositeName]['foreignTableName']
@@ -752,7 +752,7 @@ 
             }
 
             $blacklistedFks[$compositeName] = true;
-        } elseif (! isset($blacklistedFks[$compositeName])) {
+        } elseif ( ! isset($blacklistedFks[$compositeName])) {
             $addedFks[$compositeName] = [
                 'foreignTableName' => $foreignTableName,
                 'foreignColumns'   => $foreignColumns,
@@ -851,7 +851,7 @@ 
         $fullSchema = $sm->createSchema();
 
         foreach ($fullSchema->getTables() as $table) {
-            if (! $schema->hasTable($table->getName())) {
+            if ( ! $schema->hasTable($table->getName())) {
                 foreach ($table->getForeignKeys() as $foreignKey) {
                     /** @var $foreignKey ForeignKeyConstraint */
                     if ($schema->hasTable($foreignKey->getForeignTableName())) {
@@ -876,7 +876,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/Tools/AttachEntityListenersListener.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         /** @var Mapping\ClassMetadata $metadata */
         $metadata = $event->getClassMetadata();
 
-        if (! isset($this->entityListeners[$metadata->getClassName()])) {
+        if ( ! isset($this->entityListeners[$metadata->getClassName()])) {
             return;
         }
 

lib/Doctrine/ORM/Query/SqlWalker.php

Spacing +124 added lines, -124 removed lines

@@ -270,10 +270,10 @@ 
      */
     public function getSQLTableAlias($tableName, $dqlAlias = '')
     {
-        $tableName .= $dqlAlias ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= $dqlAlias ? '@['.$dqlAlias.']' : '';
 
-        if (! isset($this->tableAliasMap[$tableName])) {
-            $this->tableAliasMap[$tableName] = 't' . $this->tableAliasCounter++;
+        if ( ! isset($this->tableAliasMap[$tableName])) {
+            $this->tableAliasMap[$tableName] = 't'.$this->tableAliasCounter++;
         }
 
         return $this->tableAliasMap[$tableName];
@@ -291,7 +291,7 @@ 
      */
     public function setSQLTableAlias($tableName, $alias, $dqlAlias = '')
     {
-        $tableName .= $dqlAlias ? '@[' . $dqlAlias . ']' : '';
+        $tableName .= $dqlAlias ? '@['.$dqlAlias.']' : '';
 
         $this->tableAliasMap[$tableName] = $alias;
 
@@ -305,7 +305,7 @@ 
      */
     public function getSQLColumnAlias()
     {
-        return $this->platform->getSQLResultCasing('c' . $this->aliasCounter++);
+        return $this->platform->getSQLResultCasing('c'.$this->aliasCounter++);
     }
 
     /**
@@ -332,14 +332,14 @@ 
 
             // If this is a joined association we must use left joins to preserve the correct result.
             $sql .= isset($this->queryComponents[$dqlAlias]['relation']) ? ' LEFT ' : ' INNER ';
-            $sql .= 'JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= 'JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($class->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $filterSql = $this->generateFilterConditionSQL($parentClass, $tableAlias);
@@ -363,14 +363,14 @@ 
             $tableName  = $subClass->table->getQuotedQualifiedName($this->platform);
             $tableAlias = $this->getSQLTableAlias($subClass->getTableName(), $dqlAlias);
 
-            $sql .= ' LEFT JOIN ' . $tableName . ' ' . $tableAlias . ' ON ';
+            $sql .= ' LEFT JOIN '.$tableName.' '.$tableAlias.' ON ';
 
             $sqlParts = [];
 
             foreach ($subClass->getIdentifierColumns($this->em) as $column) {
                 $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-                $sqlParts[] = $baseTableAlias . '.' . $quotedColumnName . ' = ' . $tableAlias . '.' . $quotedColumnName;
+                $sqlParts[] = $baseTableAlias.'.'.$quotedColumnName.' = '.$tableAlias.'.'.$quotedColumnName;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -391,7 +391,7 @@ 
             $qComp       = $this->queryComponents[$dqlAlias];
             $association = $qComp['relation'];
 
-            if (! ($association instanceof ToManyAssociationMetadata)) {
+            if ( ! ($association instanceof ToManyAssociationMetadata)) {
                 continue;
             }
 
@@ -399,7 +399,7 @@ 
                 $property      = $qComp['metadata']->getProperty($fieldName);
                 $tableName     = $property->getTableName();
                 $columnName    = $this->platform->quoteIdentifier($property->getColumnName());
-                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias) . '.' . $columnName;
+                $orderedColumn = $this->getSQLTableAlias($tableName, $dqlAlias).'.'.$columnName;
 
                 // OrderByClause should replace an ordered relation. see - DDC-2475
                 if (isset($this->orderedColumnsMap[$orderedColumn])) {
@@ -407,7 +407,7 @@ 
                 }
 
                 $this->orderedColumnsMap[$orderedColumn] = $orientation;
-                $orderedColumns[]                        = $orderedColumn . ' ' . $orientation;
+                $orderedColumns[]                        = $orderedColumn.' '.$orientation;
             }
         }
 
@@ -447,19 +447,19 @@ 
             $discrColumnType  = $discrColumn->getType();
             $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
             $sqlTableAlias    = $this->useSqlTableAliases
-                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+                ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
                 : '';
 
             $sqlParts[] = sprintf(
                 '%s IN (%s)',
-                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+                $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
                 implode(', ', $values)
             );
         }
 
         $sql = implode(' AND ', $sqlParts);
 
-        return isset($sqlParts[1]) ? '(' . $sql . ')' : $sql;
+        return isset($sqlParts[1]) ? '('.$sql.')' : $sql;
     }
 
     /**
@@ -472,7 +472,7 @@ 
      */
     private function generateFilterConditionSQL(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (! $this->em->hasFilters()) {
+        if ( ! $this->em->hasFilters()) {
             return '';
         }
 
@@ -505,7 +505,7 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr !== '') {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
@@ -536,11 +536,11 @@ 
             $sql .= $this->walkOrderByClause($AST->orderByClause);
         }
 
-        if (! $AST->orderByClause) {
+        if ( ! $AST->orderByClause) {
             $orderBySql = $this->generateOrderedCollectionOrderByItems();
 
             if ($orderBySql) {
-                $sql .= ' ORDER BY ' . $orderBySql;
+                $sql .= ' ORDER BY '.$orderBySql;
             }
         }
 
@@ -553,11 +553,11 @@ 
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_READ) {
-            return $sql . ' ' . $this->platform->getReadLockSQL();
+            return $sql.' '.$this->platform->getReadLockSQL();
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_WRITE) {
-            return $sql . ' ' . $this->platform->getWriteLockSQL();
+            return $sql.' '.$this->platform->getWriteLockSQL();
         }
 
         if ($lockMode !== LockMode::OPTIMISTIC) {
@@ -565,7 +565,7 @@ 
         }
 
         foreach ($this->selectedClasses as $selectedClass) {
-            if (! $selectedClass['class']->isVersioned()) {
+            if ( ! $selectedClass['class']->isVersioned()) {
                 throw OptimisticLockException::lockFailed($selectedClass['class']->getClassName());
             }
         }
@@ -614,7 +614,7 @@ 
         foreach ($class->getIdentifierColumns($this->em) as $column) {
             $quotedColumnName = $this->platform->quoteIdentifier($column->getColumnName());
 
-            $sqlParts[] = $tableAlias . '.' . $quotedColumnName;
+            $sqlParts[] = $tableAlias.'.'.$quotedColumnName;
         }
 
         return implode(', ', $sqlParts);
@@ -632,7 +632,7 @@ 
     {
         $class = $this->queryComponents[$identificationVariable]['metadata'];
 
-        if (! $fieldName) {
+        if ( ! $fieldName) {
             return $this->getSQLTableAlias($class->getTableName(), $identificationVariable);
         }
 
@@ -661,7 +661,7 @@ 
                 $property  = $class->getProperty($fieldName);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName) . '.';
+                    $sql .= $this->walkIdentificationVariable($dqlAlias, $fieldName).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($property->getColumnName());
@@ -675,7 +675,7 @@ 
                 $class       = $this->queryComponents[$dqlAlias]['metadata'];
                 $association = $class->getProperty($fieldName);
 
-                if (! $association->isOwningSide()) {
+                if ( ! $association->isOwningSide()) {
                     throw QueryException::associationPathInverseSideNotSupported($pathExpr);
                 }
 
@@ -689,7 +689,7 @@ 
                 $joinColumn = reset($joinColumns);
 
                 if ($this->useSqlTableAliases) {
-                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias) . '.';
+                    $sql .= $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias).'.';
                 }
 
                 $sql .= $this->platform->quoteIdentifier($joinColumn->getColumnName());
@@ -707,7 +707,7 @@ 
      */
     public function walkSelectClause($selectClause)
     {
-        $sql                  = 'SELECT ' . ($selectClause->isDistinct ? 'DISTINCT ' : '');
+        $sql                  = 'SELECT '.($selectClause->isDistinct ? 'DISTINCT ' : '');
         $sqlSelectExpressions = array_filter(array_map([$this, 'walkSelectExpression'], $selectClause->selectExpressions));
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true && $selectClause->isDistinct) {
@@ -750,7 +750,7 @@ 
 
                 $sqlSelectExpressions[] = sprintf(
                     '%s AS %s',
-                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . '.' . $quotedColumnName, $this->platform),
+                    $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.'.'.$quotedColumnName, $this->platform),
                     $sqlColumnAlias
                 );
 
@@ -760,7 +760,7 @@ 
 
             // Add foreign key columns of class and also parent classes
             foreach ($class->getDeclaredPropertiesIterator() as $association) {
-                if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
+                if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())
                     || ( ! $addMetaColumns && ! $association->isPrimaryKey())) {
                     continue;
                 }
@@ -775,7 +775,7 @@ 
                     $columnAlias          = $this->getSQLColumnAlias();
                     $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                    if (! $joinColumn->getType()) {
+                    if ( ! $joinColumn->getType()) {
                         $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                     }
 
@@ -791,7 +791,7 @@ 
             }
 
             // Add foreign key columns to SQL, if necessary
-            if (! $addMetaColumns) {
+            if ( ! $addMetaColumns) {
                 continue;
             }
 
@@ -805,7 +805,7 @@ 
                         continue;
                     }
 
-                    if (! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
+                    if ( ! ($association instanceof ToOneAssociationMetadata && $association->isOwningSide())) {
                         continue;
                     }
 
@@ -819,7 +819,7 @@ 
                         $columnAlias          = $this->getSQLColumnAlias();
                         $sqlTableAlias        = $this->getSQLTableAlias($joinColumn->getTableName(), $dqlAlias);
 
-                        if (! $joinColumn->getType()) {
+                        if ( ! $joinColumn->getType()) {
                             $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                         }
 
@@ -836,7 +836,7 @@ 
             }
         }
 
-        return $sql . implode(', ', $sqlSelectExpressions);
+        return $sql.implode(', ', $sqlSelectExpressions);
     }
 
     /**
@@ -851,7 +851,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($identificationVariableDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -926,7 +926,7 @@ 
         $tableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
         $sql = $this->platform->appendLockHint(
-            $tableName . ' ' . $tableAlias,
+            $tableName.' '.$tableAlias,
             $this->query->getHint(Query::HINT_LOCK_MODE)
         );
 
@@ -936,11 +936,11 @@ 
 
         $classTableInheritanceJoins = $this->generateClassTableInheritanceJoins($class, $dqlAlias);
 
-        if (! $buildNestedJoins) {
-            return $sql . $classTableInheritanceJoins;
+        if ( ! $buildNestedJoins) {
+            return $sql.$classTableInheritanceJoins;
         }
 
-        return $classTableInheritanceJoins === '' ? $sql : '(' . $sql . $classTableInheritanceJoins . ')';
+        return $classTableInheritanceJoins === '' ? $sql : '('.$sql.$classTableInheritanceJoins.')';
     }
 
     /**
@@ -976,7 +976,7 @@ 
             : $association;
 
         if ($this->query->getHint(Query::HINT_INTERNAL_ITERATION) === true &&
-            (! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
+            ( ! $this->query->getHint(self::HINT_DISTINCT) || isset($this->selectedClasses[$joinedDqlAlias]))) {
             if ($association instanceof ToManyAssociationMetadata) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($owningAssociation);
             }
@@ -1030,7 +1030,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } elseif ($owningAssociation instanceof ManyToManyAssociationMetadata) {
@@ -1057,7 +1057,7 @@ 
                 );
             }
 
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' ON ' . implode(' AND ', $conditions);
+            $sql .= $joinTableName.' '.$joinTableAlias.' ON '.implode(' AND ', $conditions);
 
             // Join target table
             $sql .= $joinType === AST\Join::JOIN_TYPE_LEFT || $joinType === AST\Join::JOIN_TYPE_LEFTOUTER ? ' LEFT JOIN ' : ' INNER JOIN ';
@@ -1095,7 +1095,7 @@ 
             }
 
             $targetTableJoin = [
-                'table' => $targetTableName . ' ' . $targetTableAlias,
+                'table' => $targetTableName.' '.$targetTableAlias,
                 'condition' => implode(' AND ', $conditions),
             ];
         } else {
@@ -1103,23 +1103,23 @@ 
         }
 
         // Handle WITH clause
-        $withCondition = $condExpr === null ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
+        $withCondition = $condExpr === null ? '' : ('('.$this->walkConditionalExpression($condExpr).')');
 
         if ($targetClass->inheritanceType === InheritanceType::JOINED) {
             $ctiJoins = $this->generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
 
             // If we have WITH condition, we need to build nested joins for target class table and cti joins
             if ($withCondition) {
-                $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
+                $sql .= '('.$targetTableJoin['table'].$ctiJoins.') ON '.$targetTableJoin['condition'];
             } else {
-                $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
+                $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'].$ctiJoins;
             }
         } else {
-            $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
+            $sql .= $targetTableJoin['table'].' ON '.$targetTableJoin['condition'];
         }
 
         if ($withCondition) {
-            $sql .= ' AND ' . $withCondition;
+            $sql .= ' AND '.$withCondition;
         }
 
         // Apply the indexes
@@ -1153,7 +1153,7 @@ 
             $orderByItems = array_merge($orderByItems, (array) $collectionOrderByItems);
         }
 
-        return ' ORDER BY ' . implode(', ', $orderByItems);
+        return ' ORDER BY '.implode(', ', $orderByItems);
     }
 
     /**
@@ -1170,10 +1170,10 @@ 
         $this->orderedColumnsMap[$sql] = $type;
 
         if ($expr instanceof AST\Subselect) {
-            return '(' . $sql . ') ' . $type;
+            return '('.$sql.') '.$type;
         }
 
-        return $sql . ' ' . $type;
+        return $sql.' '.$type;
     }
 
     /**
@@ -1181,7 +1181,7 @@ 
      */
     public function walkHavingClause($havingClause)
     {
-        return ' HAVING ' . $this->walkConditionalExpression($havingClause->conditionalExpression);
+        return ' HAVING '.$this->walkConditionalExpression($havingClause->conditionalExpression);
     }
 
     /**
@@ -1204,7 +1204,7 @@ 
                 $conditions = [];
 
                 if ($join->conditionalExpression) {
-                    $conditions[] = '(' . $this->walkConditionalExpression($join->conditionalExpression) . ')';
+                    $conditions[] = '('.$this->walkConditionalExpression($join->conditionalExpression).')';
                 }
 
                 $isUnconditionalJoin = empty($conditions);
@@ -1229,7 +1229,7 @@ 
                 }
 
                 if ($conditions) {
-                    $sql .= $condExprConjunction . implode(' AND ', $conditions);
+                    $sql .= $condExprConjunction.implode(' AND ', $conditions);
                 }
 
                 break;
@@ -1259,7 +1259,7 @@ 
             $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression);
         }
 
-        return $sql . implode(', ', $scalarExpressions) . ')';
+        return $sql.implode(', ', $scalarExpressions).')';
     }
 
     /**
@@ -1279,7 +1279,7 @@ 
             ? $this->conn->quote($nullIfExpression->secondExpression)
             : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression);
 
-        return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')';
+        return 'NULLIF('.$firstExpression.', '.$secondExpression.')';
     }
 
     /**
@@ -1292,11 +1292,11 @@ 
         $sql = 'CASE';
 
         foreach ($generalCaseExpression->whenClauses as $whenClause) {
-            $sql .= ' WHEN ' . $this->walkConditionalExpression($whenClause->caseConditionExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkConditionalExpression($whenClause->caseConditionExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($whenClause->thenScalarExpression);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($generalCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1310,14 +1310,14 @@ 
      */
     public function walkSimpleCaseExpression($simpleCaseExpression)
     {
-        $sql = 'CASE ' . $this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
+        $sql = 'CASE '.$this->walkStateFieldPathExpression($simpleCaseExpression->caseOperand);
 
         foreach ($simpleCaseExpression->simpleWhenClauses as $simpleWhenClause) {
-            $sql .= ' WHEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
-            $sql .= ' THEN ' . $this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
+            $sql .= ' WHEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->caseScalarExpression);
+            $sql .= ' THEN '.$this->walkSimpleArithmeticExpression($simpleWhenClause->thenScalarExpression);
         }
 
-        $sql .= ' ELSE ' . $this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression) . ' END';
+        $sql .= ' ELSE '.$this->walkSimpleArithmeticExpression($simpleCaseExpression->elseScalarExpression).' END';
 
         return $sql;
     }
@@ -1358,7 +1358,7 @@ 
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, $property->getType());
                     $this->scalarFields[$dqlAlias][$fieldName] = $columnAlias;
                 }
@@ -1379,11 +1379,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // Conceptually we could resolve field type here by traverse through AST to retrieve field type,
                     // but this is not a feasible solution; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
@@ -1394,11 +1394,11 @@ 
                 $columnAlias = $this->getSQLColumnAlias();
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
 
                 $this->scalarResultAliasMap[$resultAlias] = $columnAlias;
 
-                if (! $hidden) {
+                if ( ! $hidden) {
                     // We cannot resolve field type here; assume 'string'.
                     $this->rsm->addScalarResult($columnAlias, $resultAlias, Type::getType('string'));
                 }
@@ -1422,7 +1422,7 @@ 
                 $class       = $queryComp['metadata'];
                 $resultAlias = $selectExpression->fieldIdentificationVariable ?: null;
 
-                if (! isset($this->selectedClasses[$dqlAlias])) {
+                if ( ! isset($this->selectedClasses[$dqlAlias])) {
                     $this->selectedClasses[$dqlAlias] = [
                         'class'       => $class,
                         'dqlAlias'    => $dqlAlias,
@@ -1434,7 +1434,7 @@ 
 
                 // Select all fields from the queried class
                 foreach ($class->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                    if (! ($property instanceof FieldMetadata)) {
+                    if ( ! ($property instanceof FieldMetadata)) {
                         continue;
                     }
 
@@ -1469,7 +1469,7 @@ 
                         $subClass = $this->em->getClassMetadata($subClassName);
 
                         foreach ($subClass->getDeclaredPropertiesIterator() as $fieldName => $property) {
-                            if (! ($property instanceof FieldMetadata)) {
+                            if ( ! ($property instanceof FieldMetadata)) {
                                 continue;
                             }
 
@@ -1508,7 +1508,7 @@ 
      */
     public function walkQuantifiedExpression($qExpr)
     {
-        return ' ' . strtoupper($qExpr->type) . '(' . $this->walkSubselect($qExpr->subselect) . ')';
+        return ' '.strtoupper($qExpr->type).'('.$this->walkSubselect($qExpr->subselect).')';
     }
 
     /**
@@ -1548,7 +1548,7 @@ 
             $sqlParts[] = $this->walkIdentificationVariableDeclaration($subselectIdVarDecl);
         }
 
-        return ' FROM ' . implode(', ', $sqlParts);
+        return ' FROM '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1556,7 +1556,7 @@ 
      */
     public function walkSimpleSelectClause($simpleSelectClause)
     {
-        return 'SELECT' . ($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
+        return 'SELECT'.($simpleSelectClause->isDistinct ? ' DISTINCT' : '')
             . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
     }
 
@@ -1590,7 +1590,7 @@ 
                     break;
 
                 case $e instanceof AST\Subselect:
-                    $sqlSelectExpressions[] = '(' . $e->dispatch($this) . ') AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = '('.$e->dispatch($this).') AS '.$columnAlias;
                     break;
 
                 case $e instanceof AST\PathExpression:
@@ -1599,7 +1599,7 @@ 
                     $class     = $qComp['metadata'];
                     $fieldType = $class->getProperty($e->field)->getType();
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 case $e instanceof AST\Literal:
@@ -1613,11 +1613,11 @@ 
                             break;
                     }
 
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
 
                 default:
-                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)) . ' AS ' . $columnAlias;
+                    $sqlSelectExpressions[] = trim((string) $e->dispatch($this)).' AS '.$columnAlias;
                     break;
             }
 
@@ -1650,10 +1650,10 @@ 
             case $expr instanceof AST\Subselect:
                 $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++;
 
-                $columnAlias                        = 'sclr' . $this->aliasCounter++;
+                $columnAlias                        = 'sclr'.$this->aliasCounter++;
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= '(' . $this->walkSubselect($expr) . ') AS ' . $columnAlias;
+                $sql .= '('.$this->walkSubselect($expr).') AS '.$columnAlias;
                 break;
 
             case $expr instanceof AST\Functions\FunctionNode:
@@ -1670,7 +1670,7 @@ 
                 $columnAlias                        = $this->getSQLColumnAlias();
                 $this->scalarResultAliasMap[$alias] = $columnAlias;
 
-                $sql .= $expr->dispatch($this) . ' AS ' . $columnAlias;
+                $sql .= $expr->dispatch($this).' AS '.$columnAlias;
                 break;
 
             case $expr instanceof AST\ParenthesisExpression:
@@ -1690,8 +1690,8 @@ 
      */
     public function walkAggregateExpression($aggExpression)
     {
-        return $aggExpression->functionName . '(' . ($aggExpression->isDistinct ? 'DISTINCT ' : '')
-            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression) . ')';
+        return $aggExpression->functionName.'('.($aggExpression->isDistinct ? 'DISTINCT ' : '')
+            . $this->walkSimpleArithmeticExpression($aggExpression->pathExpression).')';
     }
 
     /**
@@ -1705,7 +1705,7 @@ 
             $sqlParts[] = $this->walkGroupByItem($groupByItem);
         }
 
-        return ' GROUP BY ' . implode(', ', $sqlParts);
+        return ' GROUP BY '.implode(', ', $sqlParts);
     }
 
     /**
@@ -1714,7 +1714,7 @@ 
     public function walkGroupByItem($groupByItem)
     {
         // StateFieldPathExpression
-        if (! is_string($groupByItem)) {
+        if ( ! is_string($groupByItem)) {
             return $this->walkPathExpression($groupByItem);
         }
 
@@ -1768,7 +1768,7 @@ 
     {
         $class     = $this->em->getClassMetadata($deleteClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'DELETE FROM ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'DELETE FROM '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $deleteClause->aliasIdentificationVariable);
 
@@ -1784,12 +1784,12 @@ 
     {
         $class     = $this->em->getClassMetadata($updateClause->abstractSchemaName);
         $tableName = $class->getTableName();
-        $sql       = 'UPDATE ' . $class->table->getQuotedQualifiedName($this->platform);
+        $sql       = 'UPDATE '.$class->table->getQuotedQualifiedName($this->platform);
 
         $this->setSQLTableAlias($tableName, $tableName, $updateClause->aliasIdentificationVariable);
         $this->rootAliases[] = $updateClause->aliasIdentificationVariable;
 
-        return $sql . ' SET ' . implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
+        return $sql.' SET '.implode(', ', array_map([$this, 'walkUpdateItem'], $updateClause->updateItems));
     }
 
     /**
@@ -1800,7 +1800,7 @@ 
         $useTableAliasesBefore    = $this->useSqlTableAliases;
         $this->useSqlTableAliases = false;
 
-        $sql      = $this->walkPathExpression($updateItem->pathExpression) . ' = ';
+        $sql      = $this->walkPathExpression($updateItem->pathExpression).' = ';
         $newValue = $updateItem->newValue;
 
         switch (true) {
@@ -1844,7 +1844,7 @@ 
 
             if ($filterClauses) {
                 if ($condSql) {
-                    $condSql = '(' . $condSql . ') AND ';
+                    $condSql = '('.$condSql.') AND ';
                 }
 
                 $condSql .= implode(' AND ', $filterClauses);
@@ -1852,11 +1852,11 @@ 
         }
 
         if ($condSql) {
-            return ' WHERE ' . (! $discrSql ? $condSql : '(' . $condSql . ') AND ' . $discrSql);
+            return ' WHERE '.( ! $discrSql ? $condSql : '('.$condSql.') AND '.$discrSql);
         }
 
         if ($discrSql) {
-            return ' WHERE ' . $discrSql;
+            return ' WHERE '.$discrSql;
         }
 
         return '';
@@ -1869,7 +1869,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalExpression
         // if only one ConditionalTerm is defined
-        if (! ($condExpr instanceof AST\ConditionalExpression)) {
+        if ( ! ($condExpr instanceof AST\ConditionalExpression)) {
             return $this->walkConditionalTerm($condExpr);
         }
 
@@ -1883,7 +1883,7 @@ 
     {
         // Phase 2 AST optimization: Skip processing of ConditionalTerm
         // if only one ConditionalFactor is defined
-        if (! ($condTerm instanceof AST\ConditionalTerm)) {
+        if ( ! ($condTerm instanceof AST\ConditionalTerm)) {
             return $this->walkConditionalFactor($condTerm);
         }
 
@@ -1899,7 +1899,7 @@ 
         // if only one ConditionalPrimary is defined
         return ! ($factor instanceof AST\ConditionalFactor)
             ? $this->walkConditionalPrimary($factor)
-            : ($factor->not ? 'NOT ' : '') . $this->walkConditionalPrimary($factor->conditionalPrimary);
+            : ($factor->not ? 'NOT ' : '').$this->walkConditionalPrimary($factor->conditionalPrimary);
     }
 
     /**
@@ -1914,7 +1914,7 @@ 
         if ($primary->isConditionalExpression()) {
             $condExpr = $primary->conditionalExpression;
 
-            return '(' . $this->walkConditionalExpression($condExpr) . ')';
+            return '('.$this->walkConditionalExpression($condExpr).')';
         }
 
         return '';
@@ -1927,7 +1927,7 @@ 
     {
         $sql = $existsExpr->not ? 'NOT ' : '';
 
-        $sql .= 'EXISTS (' . $this->walkSubselect($existsExpr->subselect) . ')';
+        $sql .= 'EXISTS ('.$this->walkSubselect($existsExpr->subselect).')';
 
         return $sql;
     }
@@ -1975,7 +1975,7 @@ 
             $targetTableAlias = $this->getSQLTableAlias($targetClass->getTableName());
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
-            $sql .= $targetTableName . ' ' . $targetTableAlias . ' WHERE ';
+            $sql .= $targetTableName.' '.$targetTableAlias.' WHERE ';
 
             $sqlParts = [];
 
@@ -1996,7 +1996,7 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
@@ -2010,7 +2010,7 @@ 
             $sourceTableAlias = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
 
             // join to target table
-            $sql .= $joinTableName . ' ' . $joinTableAlias . ' INNER JOIN ' . $targetTableName . ' ' . $targetTableAlias . ' ON ';
+            $sql .= $joinTableName.' '.$joinTableAlias.' INNER JOIN '.$targetTableName.' '.$targetTableAlias.' ON ';
 
             // join conditions
             $joinSqlParts = [];
@@ -2059,13 +2059,13 @@ 
                     $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++);
                 }
 
-                $sqlParts[] = $targetTableAlias . '.' . $quotedTargetColumnName . ' = ' . $entitySql;
+                $sqlParts[] = $targetTableAlias.'.'.$quotedTargetColumnName.' = '.$entitySql;
             }
 
             $sql .= implode(' AND ', $sqlParts);
         }
 
-        return $sql . ')';
+        return $sql.')';
     }
 
     /**
@@ -2076,7 +2076,7 @@ 
         $sizeFunc                           = new AST\Functions\SizeFunction('size');
         $sizeFunc->collectionPathExpression = $emptyCollCompExpr->expression;
 
-        return $sizeFunc->getSql($this) . ($emptyCollCompExpr->not ? ' > 0' : ' = 0');
+        return $sizeFunc->getSql($this).($emptyCollCompExpr->not ? ' > 0' : ' = 0');
     }
 
     /**
@@ -2085,19 +2085,19 @@ 
     public function walkNullComparisonExpression($nullCompExpr)
     {
         $expression = $nullCompExpr->expression;
-        $comparison = ' IS' . ($nullCompExpr->not ? ' NOT' : '') . ' NULL';
+        $comparison = ' IS'.($nullCompExpr->not ? ' NOT' : '').' NULL';
 
         // Handle ResultVariable
         if (is_string($expression) && isset($this->queryComponents[$expression]['resultVariable'])) {
-            return $this->walkResultVariable($expression) . $comparison;
+            return $this->walkResultVariable($expression).$comparison;
         }
 
         // Handle InputParameter mapping inclusion to ParserResult
         if ($expression instanceof AST\InputParameter) {
-            return $this->walkInputParameter($expression) . $comparison;
+            return $this->walkInputParameter($expression).$comparison;
         }
 
-        return $expression->dispatch($this) . $comparison;
+        return $expression->dispatch($this).$comparison;
     }
 
     /**
@@ -2105,7 +2105,7 @@ 
      */
     public function walkInExpression($inExpr)
     {
-        $sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';
+        $sql = $this->walkArithmeticExpression($inExpr->expression).($inExpr->not ? ' NOT' : '').' IN (';
 
         $sql .= $inExpr->subselect
             ? $this->walkSubselect($inExpr->subselect)
@@ -2130,12 +2130,12 @@ 
         $discrColumnType  = $discrColumn->getType();
         $quotedColumnName = $this->platform->quoteIdentifier($discrColumn->getColumnName());
         $sqlTableAlias    = $this->useSqlTableAliases
-            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias) . '.'
+            ? $this->getSQLTableAlias($discrColumn->getTableName(), $dqlAlias).'.'
             : '';
 
         return sprintf(
             '%s %sIN %s',
-            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias . $quotedColumnName, $this->platform),
+            $discrColumnType->convertToDatabaseValueSQL($sqlTableAlias.$quotedColumnName, $this->platform),
             ($instanceOfExpr->not ? 'NOT ' : ''),
             $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr)
         );
@@ -2179,8 +2179,8 @@ 
             $sql .= ' NOT';
         }
 
-        $sql .= ' BETWEEN ' . $this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
-            . ' AND ' . $this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
+        $sql .= ' BETWEEN '.$this->walkArithmeticExpression($betweenExpr->leftBetweenExpression)
+            . ' AND '.$this->walkArithmeticExpression($betweenExpr->rightBetweenExpression);
 
         return $sql;
     }
@@ -2195,7 +2195,7 @@ 
             ? $this->walkResultVariable($stringExpr)
             : $stringExpr->dispatch($this);
 
-        $sql = $leftExpr . ($likeExpr->not ? ' NOT' : '') . ' LIKE ';
+        $sql = $leftExpr.($likeExpr->not ? ' NOT' : '').' LIKE ';
 
         if ($likeExpr->stringPattern instanceof AST\InputParameter) {
             $sql .= $this->walkInputParameter($likeExpr->stringPattern);
@@ -2208,7 +2208,7 @@ 
         }
 
         if ($likeExpr->escapeChar) {
-            $sql .= ' ESCAPE ' . $this->walkLiteral($likeExpr->escapeChar);
+            $sql .= ' ESCAPE '.$this->walkLiteral($likeExpr->escapeChar);
         }
 
         return $sql;
@@ -2235,7 +2235,7 @@ 
             ? $leftExpr->dispatch($this)
             : (is_numeric($leftExpr) ? $leftExpr : $this->conn->quote($leftExpr));
 
-        $sql .= ' ' . $compExpr->operator . ' ';
+        $sql .= ' '.$compExpr->operator.' ';
 
         $sql .= $rightExpr instanceof AST\Node
             ? $rightExpr->dispatch($this)
@@ -2271,7 +2271,7 @@ 
     {
         return $arithmeticExpr->isSimpleArithmeticExpression()
             ? $this->walkSimpleArithmeticExpression($arithmeticExpr->simpleArithmeticExpression)
-            : '(' . $this->walkSubselect($arithmeticExpr->subselect) . ')';
+            : '('.$this->walkSubselect($arithmeticExpr->subselect).')';
     }
 
     /**
@@ -2279,7 +2279,7 @@ 
      */
     public function walkSimpleArithmeticExpression($simpleArithmeticExpr)
     {
-        if (! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
+        if ( ! ($simpleArithmeticExpr instanceof AST\SimpleArithmeticExpression)) {
             return $this->walkArithmeticTerm($simpleArithmeticExpr);
         }
 
@@ -2299,7 +2299,7 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticTerm
         // if only one ArithmeticFactor is defined
-        if (! ($term instanceof AST\ArithmeticTerm)) {
+        if ( ! ($term instanceof AST\ArithmeticTerm)) {
             return $this->walkArithmeticFactor($term);
         }
 
@@ -2319,13 +2319,13 @@ 
 
         // Phase 2 AST optimization: Skip processing of ArithmeticFactor
         // if only one ArithmeticPrimary is defined
-        if (! ($factor instanceof AST\ArithmeticFactor)) {
+        if ( ! ($factor instanceof AST\ArithmeticFactor)) {
             return $this->walkArithmeticPrimary($factor);
         }
 
         $sign = $factor->isNegativeSigned() ? '-' : ($factor->isPositiveSigned() ? '+' : '');
 
-        return $sign . $this->walkArithmeticPrimary($factor->arithmeticPrimary);
+        return $sign.$this->walkArithmeticPrimary($factor->arithmeticPrimary);
     }
 
     /**
@@ -2338,7 +2338,7 @@ 
     public function walkArithmeticPrimary($primary)
     {
         if ($primary instanceof AST\SimpleArithmeticExpression) {
-            return '(' . $this->walkSimpleArithmeticExpression($primary) . ')';
+            return '('.$this->walkSimpleArithmeticExpression($primary).')';
         }
 
         if ($primary instanceof AST\Node) {
@@ -2396,7 +2396,7 @@ 
             $entityClassName = $entityClass->getClassName();
 
             if ($entityClassName !== $rootClass->getClassName()) {
-                if (! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
+                if ( ! $entityClass->getReflectionClass()->isSubclassOf($rootClass->getClassName())) {
                     throw QueryException::instanceOfUnrelatedClass($entityClassName, $rootClass->getClassName());
                 }
             }
@@ -2408,6 +2408,6 @@ 
             $sqlParameterList[] = $this->conn->quote($discriminator);
         }
 
-        return '(' . implode(', ', $sqlParameterList) . ')';
+        return '('.implode(', ', $sqlParameterList).')';
     }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
         $entityClassName = $this->entityClassMetadata->getRootClassName();
         $baseRegion      = strtolower(str_replace('\\', '_', $entityClassName));
-        $defaultRegion   = $baseRegion . ($this->fieldName ? '__' . $this->fieldName : '');
+        $defaultRegion   = $baseRegion.($this->fieldName ? '__'.$this->fieldName : '');
 
         $usage  = constant(sprintf('%s::%s', Mapping\CacheUsage::class, strtoupper($this->cacheAnnotation->usage)));
         $region = $this->cacheAnnotation->region ?: $defaultRegion;

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

Spacing +37 added lines, -37 removed lines

@@ -213,7 +213,7 @@ 
             return $this->classNames;
         }
 
-        if (! $this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -221,7 +221,7 @@ 
         $includedFiles = [];
 
         foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
+            if ( ! is_dir($path)) {
                 throw Mapping\MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -230,14 +230,14 @@ 
                     new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
                     RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 RecursiveRegexIterator::GET_MATCH
             );
 
             foreach ($iterator as $file) {
                 $sourceFile = $file[0];
 
-                if (! preg_match('(^phar:)i', $sourceFile)) {
+                if ( ! preg_match('(^phar:)i', $sourceFile)) {
                     $sourceFile = realpath($sourceFile);
                 }
 
@@ -563,15 +563,15 @@ 
         $fieldMetadata->setVersioned($isVersioned);
         $fieldMetadata->setColumnName($columnName);
 
-        if (! $metadata->isMappedSuperclass) {
+        if ( ! $metadata->isMappedSuperclass) {
             $fieldMetadata->setTableName($metadata->getTableName());
         }
 
-        if (! empty($columnAnnot->columnDefinition)) {
+        if ( ! empty($columnAnnot->columnDefinition)) {
             $fieldMetadata->setColumnDefinition($columnAnnot->columnDefinition);
         }
 
-        if (! empty($columnAnnot->length)) {
+        if ( ! empty($columnAnnot->length)) {
             $fieldMetadata->setLength($columnAnnot->length);
         }
 
@@ -632,13 +632,13 @@ 
                             'arguments' => $customGeneratorAnnot->arguments,
                         ];
 
-                        if (! isset($idGeneratorDefinition['class'])) {
+                        if ( ! isset($idGeneratorDefinition['class'])) {
                             throw new Mapping\MappingException(
                                 sprintf('Cannot instantiate custom generator, no class has been defined')
                             );
                         }
 
-                        if (! class_exists($idGeneratorDefinition['class'])) {
+                        if ( ! class_exists($idGeneratorDefinition['class'])) {
                             throw new Mapping\MappingException(
                                 sprintf('Cannot instantiate custom generator : %s', var_export($idGeneratorDefinition, true))
                             );
@@ -680,12 +680,12 @@ 
         $assocMetadata->setOrphanRemoval($oneToOneAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $oneToOneAnnot->fetch));
 
-        if (! empty($oneToOneAnnot->mappedBy)) {
+        if ( ! empty($oneToOneAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($oneToOneAnnot->mappedBy);
             $assocMetadata->setOwningSide(false);
         }
 
-        if (! empty($oneToOneAnnot->inversedBy)) {
+        if ( ! empty($oneToOneAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($oneToOneAnnot->inversedBy);
         }
 
@@ -751,7 +751,7 @@ 
         $assocMetadata->setCascade($this->getCascade($className, $fieldName, $manyToOneAnnot->cascade));
         $assocMetadata->setFetchMode($this->getFetchMode($className, $manyToOneAnnot->fetch));
 
-        if (! empty($manyToOneAnnot->inversedBy)) {
+        if ( ! empty($manyToOneAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($manyToOneAnnot->inversedBy);
         }
 
@@ -822,7 +822,7 @@ 
         $assocMetadata->setOwningSide(false);
         $assocMetadata->setMappedBy($oneToManyAnnot->mappedBy);
 
-        if (! empty($oneToManyAnnot->indexBy)) {
+        if ( ! empty($oneToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($oneToManyAnnot->indexBy);
         }
 
@@ -875,16 +875,16 @@ 
         $assocMetadata->setOrphanRemoval($manyToManyAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $manyToManyAnnot->fetch));
 
-        if (! empty($manyToManyAnnot->mappedBy)) {
+        if ( ! empty($manyToManyAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($manyToManyAnnot->mappedBy);
             $assocMetadata->setOwningSide(false);
         }
 
-        if (! empty($manyToManyAnnot->inversedBy)) {
+        if ( ! empty($manyToManyAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($manyToManyAnnot->inversedBy);
         }
 
-        if (! empty($manyToManyAnnot->indexBy)) {
+        if ( ! empty($manyToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($manyToManyAnnot->indexBy);
         }
 
@@ -936,15 +936,15 @@ 
         $fieldMetadata->setType(Type::getType($columnAnnot->type));
         $fieldMetadata->setVersioned($isVersioned);
 
-        if (! empty($columnAnnot->name)) {
+        if ( ! empty($columnAnnot->name)) {
             $fieldMetadata->setColumnName($columnAnnot->name);
         }
 
-        if (! empty($columnAnnot->columnDefinition)) {
+        if ( ! empty($columnAnnot->columnDefinition)) {
             $fieldMetadata->setColumnDefinition($columnAnnot->columnDefinition);
         }
 
-        if (! empty($columnAnnot->length)) {
+        if ( ! empty($columnAnnot->length)) {
             $fieldMetadata->setLength($columnAnnot->length);
         }
 
@@ -967,11 +967,11 @@ 
         Annotation\Table $tableAnnot,
         Mapping\TableMetadata $tableMetadata
     ) : Mapping\TableMetadata {
-        if (! empty($tableAnnot->name)) {
+        if ( ! empty($tableAnnot->name)) {
             $tableMetadata->setName($tableAnnot->name);
         }
 
-        if (! empty($tableAnnot->schema)) {
+        if ( ! empty($tableAnnot->schema)) {
             $tableMetadata->setSchema($tableAnnot->schema);
         }
 
@@ -1009,11 +1009,11 @@ 
     ) : Mapping\JoinTableMetadata {
         $joinTable = new Mapping\JoinTableMetadata();
 
-        if (! empty($joinTableAnnot->name)) {
+        if ( ! empty($joinTableAnnot->name)) {
             $joinTable->setName($joinTableAnnot->name);
         }
 
-        if (! empty($joinTableAnnot->schema)) {
+        if ( ! empty($joinTableAnnot->schema)) {
             $joinTable->setSchema($joinTableAnnot->schema);
         }
 
@@ -1041,22 +1041,22 @@ 
         $joinColumn = new Mapping\JoinColumnMetadata();
 
         // @todo Remove conditionals for name and referencedColumnName once naming strategy is brought into drivers
-        if (! empty($joinColumnAnnot->name)) {
+        if ( ! empty($joinColumnAnnot->name)) {
             $joinColumn->setColumnName($joinColumnAnnot->name);
         }
 
-        if (! empty($joinColumnAnnot->referencedColumnName)) {
+        if ( ! empty($joinColumnAnnot->referencedColumnName)) {
             $joinColumn->setReferencedColumnName($joinColumnAnnot->referencedColumnName);
         }
 
         $joinColumn->setNullable($joinColumnAnnot->nullable);
         $joinColumn->setUnique($joinColumnAnnot->unique);
 
-        if (! empty($joinColumnAnnot->fieldName)) {
+        if ( ! empty($joinColumnAnnot->fieldName)) {
             $joinColumn->setAliasedName($joinColumnAnnot->fieldName);
         }
 
-        if (! empty($joinColumnAnnot->columnDefinition)) {
+        if ( ! empty($joinColumnAnnot->columnDefinition)) {
             $joinColumn->setColumnDefinition($joinColumnAnnot->columnDefinition);
         }
 
@@ -1081,7 +1081,7 @@ 
         if ($parent && $parent->inheritanceType === Mapping\InheritanceType::SINGLE_TABLE) {
             // Handle the case where a middle mapped super class inherits from a single table inheritance tree.
             do {
-                if (! $parent->isMappedSuperclass) {
+                if ( ! $parent->isMappedSuperclass) {
                     $metadata->setTable($parent->table);
 
                     break;
@@ -1137,11 +1137,11 @@ 
             $discriminatorColumn->setType(Type::getType($typeName));
             $discriminatorColumn->setColumnName($discriminatorColumnAnnotation->name);
 
-            if (! empty($discriminatorColumnAnnotation->columnDefinition)) {
+            if ( ! empty($discriminatorColumnAnnotation->columnDefinition)) {
                 $discriminatorColumn->setColumnDefinition($discriminatorColumnAnnotation->columnDefinition);
             }
 
-            if (! empty($discriminatorColumnAnnotation->length)) {
+            if ( ! empty($discriminatorColumnAnnotation->length)) {
                 $discriminatorColumn->setLength($discriminatorColumnAnnotation->length);
             }
         }
@@ -1217,7 +1217,7 @@ 
             ];
 
             foreach ($entityListenersAnnot->value as $listenerClassName) {
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -1259,7 +1259,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1293,7 +1293,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1360,7 +1360,7 @@ 
     {
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
 
-        if (! defined($fetchModeConstant)) {
+        if ( ! defined($fetchModeConstant)) {
             throw Mapping\MappingException::invalidFetchMode($className, $fetchMode);
         }
 
@@ -1375,7 +1375,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1393,7 +1393,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1411,7 +1411,7 @@ 
         $methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
 
         foreach ($methodAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

Spacing +80 added lines, -80 removed lines

@@ -59,7 +59,7 @@ 
 
         if ($xmlRoot->getName() === 'entity') {
             if (isset($xmlRoot['repository-class'])) {
-                $metadata->setCustomRepositoryClassName((string)$xmlRoot['repository-class']);
+                $metadata->setCustomRepositoryClassName((string) $xmlRoot['repository-class']);
             }
 
             if (isset($xmlRoot['read-only']) && $this->evaluateBoolean($xmlRoot['read-only'])) {
@@ -67,7 +67,7 @@ 
             }
         } elseif ($xmlRoot->getName() === 'mapped-superclass') {
             if (isset($xmlRoot['repository-class'])) {
-                $metadata->setCustomRepositoryClassName((string)$xmlRoot['repository-class']);
+                $metadata->setCustomRepositoryClassName((string) $xmlRoot['repository-class']);
             }
 
             $metadata->isMappedSuperclass = true;
@@ -90,11 +90,11 @@ 
 
             // Evaluate <entity...> attributes
             if (isset($xmlRoot['table'])) {
-                $tableMetadata->setName((string)$xmlRoot['table']);
+                $tableMetadata->setName((string) $xmlRoot['table']);
             }
 
             if (isset($xmlRoot['schema'])) {
-                $tableMetadata->setSchema((string)$xmlRoot['schema']);
+                $tableMetadata->setSchema((string) $xmlRoot['schema']);
             }
 
             if (isset($xmlRoot->options)) {
@@ -108,11 +108,11 @@ 
             // Evaluate <indexes...>
             if (isset($xmlRoot->indexes)) {
                 foreach ($xmlRoot->indexes->index as $indexXml) {
-                    $indexName = isset($indexXml['name']) ? (string)$indexXml['name'] : null;
-                    $columns = explode(',', (string)$indexXml['columns']);
+                    $indexName = isset($indexXml['name']) ? (string) $indexXml['name'] : null;
+                    $columns = explode(',', (string) $indexXml['columns']);
                     $isUnique = isset($indexXml['unique']) && $indexXml['unique'];
                     $options = isset($indexXml->options) ? $this->parseOptions($indexXml->options->children()) : [];
-                    $flags = isset($indexXml['flags']) ? explode(',', (string)$indexXml['flags']) : [];
+                    $flags = isset($indexXml['flags']) ? explode(',', (string) $indexXml['flags']) : [];
 
                     $tableMetadata->addIndex([
                         'name' => $indexName,
@@ -128,10 +128,10 @@ 
 
             if (isset($xmlRoot->{'unique-constraints'})) {
                 foreach ($xmlRoot->{'unique-constraints'}->{'unique-constraint'} as $uniqueXml) {
-                    $indexName = isset($uniqueXml['name']) ? (string)$uniqueXml['name'] : null;
-                    $columns = explode(',', (string)$uniqueXml['columns']);
+                    $indexName = isset($uniqueXml['name']) ? (string) $uniqueXml['name'] : null;
+                    $columns = explode(',', (string) $uniqueXml['columns']);
                     $options = isset($uniqueXml->options) ? $this->parseOptions($uniqueXml->options->children()) : [];
-                    $flags = isset($uniqueXml['flags']) ? explode(',', (string)$uniqueXml['flags']) : [];
+                    $flags = isset($uniqueXml['flags']) ? explode(',', (string) $uniqueXml['flags']) : [];
 
                     $tableMetadata->addUniqueConstraint([
                         'name' => $indexName,
@@ -157,7 +157,7 @@ 
         }
 
         if (isset($xmlRoot['inheritance-type'])) {
-            $inheritanceType = strtoupper((string)$xmlRoot['inheritance-type']);
+            $inheritanceType = strtoupper((string) $xmlRoot['inheritance-type']);
 
             $metadata->setInheritanceType(
                 constant(sprintf('%s::%s', Mapping\InheritanceType::class, $inheritanceType))
@@ -174,17 +174,17 @@ 
                 // Evaluate <discriminator-column...>
                 if (isset($xmlRoot->{'discriminator-column'})) {
                     $discriminatorColumnMapping = $xmlRoot->{'discriminator-column'};
-                    $typeName = (string)($discriminatorColumnMapping['type'] ?? 'string');
+                    $typeName = (string) ($discriminatorColumnMapping['type'] ?? 'string');
 
                     $discriminatorColumn->setType(Type::getType($typeName));
-                    $discriminatorColumn->setColumnName((string)$discriminatorColumnMapping['name']);
+                    $discriminatorColumn->setColumnName((string) $discriminatorColumnMapping['name']);
 
                     if (isset($discriminatorColumnMapping['column-definition'])) {
-                        $discriminatorColumn->setColumnDefinition((string)$discriminatorColumnMapping['column-definition']);
+                        $discriminatorColumn->setColumnDefinition((string) $discriminatorColumnMapping['column-definition']);
                     }
 
                     if (isset($discriminatorColumnMapping['length'])) {
-                        $discriminatorColumn->setLength((int)$discriminatorColumnMapping['length']);
+                        $discriminatorColumn->setLength((int) $discriminatorColumnMapping['length']);
                     }
                 }
 
@@ -195,7 +195,7 @@ 
                     $map = [];
 
                     foreach ($xmlRoot->{'discriminator-map'}->{'discriminator-mapping'} as $discrMapElement) {
-                        $map[(string)$discrMapElement['value']] = (string)$discrMapElement['class'];
+                        $map[(string) $discrMapElement['value']] = (string) $discrMapElement['class'];
                     }
 
                     $metadata->setDiscriminatorMap($map);
@@ -205,7 +205,7 @@ 
 
         // Evaluate <change-tracking-policy...>
         if (isset($xmlRoot['change-tracking-policy'])) {
-            $changeTrackingPolicy = strtoupper((string)$xmlRoot['change-tracking-policy']);
+            $changeTrackingPolicy = strtoupper((string) $xmlRoot['change-tracking-policy']);
 
             $metadata->setChangeTrackingPolicy(
                 constant(sprintf('%s::%s', Mapping\ChangeTrackingPolicy::class, $changeTrackingPolicy))
@@ -215,7 +215,7 @@ 
         // Evaluate <field ...> mappings
         if (isset($xmlRoot->field)) {
             foreach ($xmlRoot->field as $fieldElement) {
-                $fieldName = (string)$fieldElement['name'];
+                $fieldName = (string) $fieldElement['name'];
                 $fieldMetadata = $this->convertFieldElementToFieldMetadata($fieldElement, $fieldName, $metadata, $metadataBuildingContext);
 
                 $metadata->addProperty($fieldMetadata);
@@ -225,7 +225,7 @@ 
         if (isset($xmlRoot->embedded)) {
             foreach ($xmlRoot->embedded as $embeddedMapping) {
                 $columnPrefix = isset($embeddedMapping['column-prefix'])
-                    ? (string)$embeddedMapping['column-prefix']
+                    ? (string) $embeddedMapping['column-prefix']
                     : null;
 
                 $useColumnPrefix = isset($embeddedMapping['use-column-prefix'])
@@ -233,8 +233,8 @@ 
                     : true;
 
                 $mapping = [
-                    'fieldName' => (string)$embeddedMapping['name'],
-                    'class' => (string)$embeddedMapping['class'],
+                    'fieldName' => (string) $embeddedMapping['name'],
+                    'class' => (string) $embeddedMapping['class'],
                     'columnPrefix' => $useColumnPrefix ? $columnPrefix : false,
                 ];
 
@@ -246,7 +246,7 @@ 
         $associationIds = [];
 
         foreach ($xmlRoot->id as $idElement) {
-            $fieldName = (string)$idElement['name'];
+            $fieldName = (string) $idElement['name'];
 
             if (isset($idElement['association-key']) && $this->evaluateBoolean($idElement['association-key'])) {
                 $associationIds[$fieldName] = true;
@@ -264,7 +264,7 @@ 
             }
 
             if (isset($idElement->generator)) {
-                $strategy = (string)($idElement->generator['strategy'] ?? 'AUTO');
+                $strategy = (string) ($idElement->generator['strategy'] ?? 'AUTO');
 
                 $idGeneratorType = constant(sprintf('%s::%s', Mapping\GeneratorType::class, strtoupper($strategy)));
 
@@ -275,24 +275,24 @@ 
                     if (isset($idElement->{'sequence-generator'})) {
                         $seqGenerator = $idElement->{'sequence-generator'};
                         $idGeneratorDefinition = [
-                            'sequenceName' => (string)$seqGenerator['sequence-name'],
-                            'allocationSize' => (string)$seqGenerator['allocation-size'],
+                            'sequenceName' => (string) $seqGenerator['sequence-name'],
+                            'allocationSize' => (string) $seqGenerator['allocation-size'],
                         ];
                     } elseif (isset($idElement->{'custom-id-generator'})) {
                         $customGenerator = $idElement->{'custom-id-generator'};
 
                         $idGeneratorDefinition = [
-                            'class' => (string)$customGenerator['class'],
+                            'class' => (string) $customGenerator['class'],
                             'arguments' => [],
                         ];
 
-                        if (!isset($idGeneratorDefinition['class'])) {
+                        if ( ! isset($idGeneratorDefinition['class'])) {
                             throw new Mapping\MappingException(
                                 sprintf('Cannot instantiate custom generator, no class has been defined')
                             );
                         }
 
-                        if (!class_exists($idGeneratorDefinition['class'])) {
+                        if ( ! class_exists($idGeneratorDefinition['class'])) {
                             throw new Mapping\MappingException(
                                 sprintf('Cannot instantiate custom generator : %s', var_export($idGeneratorDefinition, true))
                             );
@@ -313,8 +313,8 @@ 
         // Evaluate <one-to-one ...> mappings
         if (isset($xmlRoot->{'one-to-one'})) {
             foreach ($xmlRoot->{'one-to-one'} as $oneToOneElement) {
-                $association = new Mapping\OneToOneAssociationMetadata((string)$oneToOneElement['field']);
-                $targetEntity = (string)$oneToOneElement['target-entity'];
+                $association = new Mapping\OneToOneAssociationMetadata((string) $oneToOneElement['field']);
+                $targetEntity = (string) $oneToOneElement['target-entity'];
 
                 $association->setTargetEntity($targetEntity);
 
@@ -324,16 +324,16 @@ 
 
                 if (isset($oneToOneElement['fetch'])) {
                     $association->setFetchMode(
-                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string)$oneToOneElement['fetch']))
+                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string) $oneToOneElement['fetch']))
                     );
                 }
 
                 if (isset($oneToOneElement['mapped-by'])) {
-                    $association->setMappedBy((string)$oneToOneElement['mapped-by']);
+                    $association->setMappedBy((string) $oneToOneElement['mapped-by']);
                     $association->setOwningSide(false);
                 } else {
                     if (isset($oneToOneElement['inversed-by'])) {
-                        $association->setInversedBy((string)$oneToOneElement['inversed-by']);
+                        $association->setInversedBy((string) $oneToOneElement['inversed-by']);
                     }
 
                     $joinColumns = [];
@@ -376,12 +376,12 @@ 
         // Evaluate <one-to-many ...> mappings
         if (isset($xmlRoot->{'one-to-many'})) {
             foreach ($xmlRoot->{'one-to-many'} as $oneToManyElement) {
-                $association = new Mapping\OneToManyAssociationMetadata((string)$oneToManyElement['field']);
-                $targetEntity = (string)$oneToManyElement['target-entity'];
+                $association = new Mapping\OneToManyAssociationMetadata((string) $oneToManyElement['field']);
+                $targetEntity = (string) $oneToManyElement['target-entity'];
 
                 $association->setTargetEntity($targetEntity);
                 $association->setOwningSide(false);
-                $association->setMappedBy((string)$oneToManyElement['mapped-by']);
+                $association->setMappedBy((string) $oneToManyElement['mapped-by']);
 
                 if (isset($associationIds[$association->getName()])) {
                     throw Mapping\MappingException::illegalToManyIdentifierAssociation($className, $association->getName());
@@ -389,7 +389,7 @@ 
 
                 if (isset($oneToManyElement['fetch'])) {
                     $association->setFetchMode(
-                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string)$oneToManyElement['fetch']))
+                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string) $oneToManyElement['fetch']))
                     );
                 }
 
@@ -405,8 +405,8 @@ 
                     $orderBy = [];
 
                     foreach ($oneToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
-                        $orderBy[(string)$orderByField['name']] = isset($orderByField['direction'])
-                            ? (string)$orderByField['direction']
+                        $orderBy[(string) $orderByField['name']] = isset($orderByField['direction'])
+                            ? (string) $orderByField['direction']
                             : Criteria::ASC;
                     }
 
@@ -414,7 +414,7 @@ 
                 }
 
                 if (isset($oneToManyElement['index-by'])) {
-                    $association->setIndexedBy((string)$oneToManyElement['index-by']);
+                    $association->setIndexedBy((string) $oneToManyElement['index-by']);
                 } elseif (isset($oneToManyElement->{'index-by'})) {
                     throw new InvalidArgumentException('<index-by /> is not a valid tag');
                 }
@@ -438,8 +438,8 @@ 
         // Evaluate <many-to-one ...> mappings
         if (isset($xmlRoot->{'many-to-one'})) {
             foreach ($xmlRoot->{'many-to-one'} as $manyToOneElement) {
-                $association = new Mapping\ManyToOneAssociationMetadata((string)$manyToOneElement['field']);
-                $targetEntity = (string)$manyToOneElement['target-entity'];
+                $association = new Mapping\ManyToOneAssociationMetadata((string) $manyToOneElement['field']);
+                $targetEntity = (string) $manyToOneElement['target-entity'];
 
                 $association->setTargetEntity($targetEntity);
 
@@ -449,12 +449,12 @@ 
 
                 if (isset($manyToOneElement['fetch'])) {
                     $association->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string)$manyToOneElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $manyToOneElement['fetch'])
                     );
                 }
 
                 if (isset($manyToOneElement['inversed-by'])) {
-                    $association->setInversedBy((string)$manyToOneElement['inversed-by']);
+                    $association->setInversedBy((string) $manyToOneElement['inversed-by']);
                 }
 
                 $joinColumns = [];
@@ -492,8 +492,8 @@ 
         // Evaluate <many-to-many ...> mappings
         if (isset($xmlRoot->{'many-to-many'})) {
             foreach ($xmlRoot->{'many-to-many'} as $manyToManyElement) {
-                $association = new Mapping\ManyToManyAssociationMetadata((string)$manyToManyElement['field']);
-                $targetEntity = (string)$manyToManyElement['target-entity'];
+                $association = new Mapping\ManyToManyAssociationMetadata((string) $manyToManyElement['field']);
+                $targetEntity = (string) $manyToManyElement['target-entity'];
 
                 $association->setTargetEntity($targetEntity);
 
@@ -503,7 +503,7 @@ 
 
                 if (isset($manyToManyElement['fetch'])) {
                     $association->setFetchMode(
-                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string)$manyToManyElement['fetch']))
+                        constant(sprintf('%s::%s', Mapping\FetchMode::class, (string) $manyToManyElement['fetch']))
                     );
                 }
 
@@ -512,22 +512,22 @@ 
                 }
 
                 if (isset($manyToManyElement['mapped-by'])) {
-                    $association->setMappedBy((string)$manyToManyElement['mapped-by']);
+                    $association->setMappedBy((string) $manyToManyElement['mapped-by']);
                     $association->setOwningSide(false);
                 } elseif (isset($manyToManyElement->{'join-table'})) {
                     if (isset($manyToManyElement['inversed-by'])) {
-                        $association->setInversedBy((string)$manyToManyElement['inversed-by']);
+                        $association->setInversedBy((string) $manyToManyElement['inversed-by']);
                     }
 
                     $joinTableElement = $manyToManyElement->{'join-table'};
                     $joinTable = new Mapping\JoinTableMetadata();
 
                     if (isset($joinTableElement['name'])) {
-                        $joinTable->setName((string)$joinTableElement['name']);
+                        $joinTable->setName((string) $joinTableElement['name']);
                     }
 
                     if (isset($joinTableElement['schema'])) {
-                        $joinTable->setSchema((string)$joinTableElement['schema']);
+                        $joinTable->setSchema((string) $joinTableElement['schema']);
                     }
 
                     if (isset($joinTableElement->{'join-columns'})) {
@@ -557,8 +557,8 @@ 
                     $orderBy = [];
 
                     foreach ($manyToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
-                        $orderBy[(string)$orderByField['name']] = isset($orderByField['direction'])
-                            ? (string)$orderByField['direction']
+                        $orderBy[(string) $orderByField['name']] = isset($orderByField['direction'])
+                            ? (string) $orderByField['direction']
                             : Criteria::ASC;
                     }
 
@@ -566,7 +566,7 @@ 
                 }
 
                 if (isset($manyToManyElement['index-by'])) {
-                    $association->setIndexedBy((string)$manyToManyElement['index-by']);
+                    $association->setIndexedBy((string) $manyToManyElement['index-by']);
                 } elseif (isset($manyToManyElement->{'index-by'})) {
                     throw new InvalidArgumentException('<index-by /> is not a valid tag');
                 }
@@ -590,7 +590,7 @@ 
         // Evaluate association-overrides
         if (isset($xmlRoot->{'attribute-overrides'})) {
             foreach ($xmlRoot->{'attribute-overrides'}->{'attribute-override'} as $overrideElement) {
-                $fieldName = (string)$overrideElement['name'];
+                $fieldName = (string) $overrideElement['name'];
 
                 foreach ($overrideElement->field as $fieldElement) {
                     $fieldMetadata = $this->convertFieldElementToFieldMetadata($fieldElement, $fieldName, $metadata, $metadataBuildingContext);
@@ -603,10 +603,10 @@ 
         // Evaluate association-overrides
         if (isset($xmlRoot->{'association-overrides'})) {
             foreach ($xmlRoot->{'association-overrides'}->{'association-override'} as $overrideElement) {
-                $fieldName = (string)$overrideElement['name'];
+                $fieldName = (string) $overrideElement['name'];
                 $property = $metadata->getProperty($fieldName);
 
-                if (!$property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -630,11 +630,11 @@ 
                     $joinTable = new Mapping\JoinTableMetadata();
 
                     if (isset($joinTableElement['name'])) {
-                        $joinTable->setName((string)$joinTableElement['name']);
+                        $joinTable->setName((string) $joinTableElement['name']);
                     }
 
                     if (isset($joinTableElement['schema'])) {
-                        $joinTable->setSchema((string)$joinTableElement['schema']);
+                        $joinTable->setSchema((string) $joinTableElement['schema']);
                     }
 
                     if (isset($joinTableElement->{'join-columns'})) {
@@ -658,13 +658,13 @@ 
 
                 // Check for inversed-by
                 if (isset($overrideElement->{'inversed-by'})) {
-                    $override->setInversedBy((string)$overrideElement->{'inversed-by'}['name']);
+                    $override->setInversedBy((string) $overrideElement->{'inversed-by'}['name']);
                 }
 
                 // Check for fetch
                 if (isset($overrideElement['fetch'])) {
                     $override->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string)$overrideElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $overrideElement['fetch'])
                     );
                 }
 
@@ -675,8 +675,8 @@ 
         // Evaluate <lifecycle-callbacks...>
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
-                $eventName = constant(Events::class . '::' . (string)$lifecycleCallback['type']);
-                $methodName = (string)$lifecycleCallback['method'];
+                $eventName = constant(Events::class.'::'.(string) $lifecycleCallback['type']);
+                $methodName = (string) $lifecycleCallback['method'];
 
                 $metadata->addLifecycleCallback($eventName, $methodName);
             }
@@ -685,9 +685,9 @@ 
         // Evaluate entity listener
         if (isset($xmlRoot->{'entity-listeners'})) {
             foreach ($xmlRoot->{'entity-listeners'}->{'entity-listener'} as $listenerElement) {
-                $listenerClassName = (string)$listenerElement['class'];
+                $listenerClassName = (string) $listenerElement['class'];
 
-                if (!class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -695,8 +695,8 @@ 
                 }
 
                 foreach ($listenerElement as $callbackElement) {
-                    $eventName = (string)$callbackElement['type'];
-                    $methodName = (string)$callbackElement['method'];
+                    $eventName = (string) $callbackElement['type'];
+                    $methodName = (string) $callbackElement['method'];
 
                     $metadata->addEntityListener($eventName, $listenerClassName, $methodName);
                 }
@@ -722,13 +722,13 @@ 
             if ($option->count()) {
                 $value = $this->parseOptions($option->children());
             } else {
-                $value = (string)$option;
+                $value = (string) $option;
             }
 
             $attributes = $option->attributes();
 
             if (isset($attributes->name)) {
-                $nameAttribute = (string)$attributes->name;
+                $nameAttribute = (string) $attributes->name;
                 $array[$nameAttribute] = in_array($nameAttribute, ['unsigned', 'fixed'], true)
                     ? $this->evaluateBoolean($value)
                     : $value;
@@ -755,9 +755,9 @@ 
         $className = $metadata->getClassName();
         $isVersioned = isset($fieldElement['version']) && $fieldElement['version'];
         $fieldMetadata = new Mapping\FieldMetadata($fieldName);
-        $fieldType = isset($fieldElement['type']) ? (string)$fieldElement['type'] : 'string';
+        $fieldType = isset($fieldElement['type']) ? (string) $fieldElement['type'] : 'string';
         $columnName = isset($fieldElement['column'])
-            ? (string)$fieldElement['column']
+            ? (string) $fieldElement['column']
             : $metadataBuildingContext->getNamingStrategy()->propertyToColumnName($fieldName, $className);
 
         $fieldMetadata->setType(Type::getType($fieldType));
@@ -765,15 +765,15 @@ 
         $fieldMetadata->setColumnName($columnName);
 
         if (isset($fieldElement['length'])) {
-            $fieldMetadata->setLength((int)$fieldElement['length']);
+            $fieldMetadata->setLength((int) $fieldElement['length']);
         }
 
         if (isset($fieldElement['precision'])) {
-            $fieldMetadata->setPrecision((int)$fieldElement['precision']);
+            $fieldMetadata->setPrecision((int) $fieldElement['precision']);
         }
 
         if (isset($fieldElement['scale'])) {
-            $fieldMetadata->setScale((int)$fieldElement['scale']);
+            $fieldMetadata->setScale((int) $fieldElement['scale']);
         }
 
         if (isset($fieldElement['unique'])) {
@@ -785,7 +785,7 @@ 
         }
 
         if (isset($fieldElement['column-definition'])) {
-            $fieldMetadata->setColumnDefinition((string)$fieldElement['column-definition']);
+            $fieldMetadata->setColumnDefinition((string) $fieldElement['column-definition']);
         }
 
         if (isset($fieldElement->options)) {
@@ -812,15 +812,15 @@ 
     {
         $joinColumnMetadata = new Mapping\JoinColumnMetadata();
 
-        $joinColumnMetadata->setColumnName((string)$joinColumnElement['name']);
-        $joinColumnMetadata->setReferencedColumnName((string)$joinColumnElement['referenced-column-name']);
+        $joinColumnMetadata->setColumnName((string) $joinColumnElement['name']);
+        $joinColumnMetadata->setReferencedColumnName((string) $joinColumnElement['referenced-column-name']);
 
         if (isset($joinColumnElement['column-definition'])) {
-            $joinColumnMetadata->setColumnDefinition((string)$joinColumnElement['column-definition']);
+            $joinColumnMetadata->setColumnDefinition((string) $joinColumnElement['column-definition']);
         }
 
         if (isset($joinColumnElement['field-name'])) {
-            $joinColumnMetadata->setAliasedName((string)$joinColumnElement['field-name']);
+            $joinColumnMetadata->setAliasedName((string) $joinColumnElement['field-name']);
         }
 
         if (isset($joinColumnElement['nullable'])) {
@@ -832,7 +832,7 @@ 
         }
 
         if (isset($joinColumnElement['on-delete'])) {
-            $joinColumnMetadata->setOnDelete(strtoupper((string)$joinColumnElement['on-delete']));
+            $joinColumnMetadata->setOnDelete(strtoupper((string) $joinColumnElement['on-delete']));
         }
 
         return $joinColumnMetadata;