doctrine / orm

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

Spacing +5 added lines, -5 removed lines

@@ -301,7 +301,7 @@ 
                 $fieldName = (string) $overrideElement['name'];
                 $property  = $classMetadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($classMetadata->getClassName(), $fieldName);
                 }
 
@@ -335,7 +335,7 @@ 
                 $fieldName = (string) $overrideElement['name'];
                 $property  = $classMetadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($classMetadata->getClassName(), $fieldName);
                 }
 
@@ -393,7 +393,7 @@ 
                 // 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'])
                     );
                 }
 
@@ -404,7 +404,7 @@ 
         // Evaluate <lifecycle-callbacks...>
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
-                $eventName  = constant(Events::class . '::' . (string) $lifecycleCallback['type']);
+                $eventName  = constant(Events::class.'::'.(string) $lifecycleCallback['type']);
                 $methodName = (string) $lifecycleCallback['method'];
 
                 $classMetadata->addLifecycleCallback($eventName, $methodName);
@@ -416,7 +416,7 @@ 
             foreach ($xmlRoot->{'entity-listeners'}->{'entity-listener'} as $listenerElement) {
                 $listenerClassName = (string) $listenerElement['class'];
 
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $classMetadata->getClassName()

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

Spacing +12 added lines, -12 removed lines

@@ -204,7 +204,7 @@ 
             return $this->classNames;
         }
 
-        if (! $this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -212,7 +212,7 @@ 
         $includedFiles = [];
 
         foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
+            if ( ! is_dir($path)) {
                 throw Mapping\MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -221,14 +221,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);
                 }
 
@@ -294,7 +294,7 @@ 
             ->withCacheAnnotation($classAnnotations[Annotation\Cache::class] ?? null)
             ->build();
 
-        if (! $classMetadata->isEmbeddedClass) {
+        if ( ! $classMetadata->isEmbeddedClass) {
             $this->attachLifecycleCallbacks($classAnnotations, $reflectionClass, $classMetadata);
             $this->attachEntityListeners($classAnnotations, $classMetadata);
         }
@@ -365,7 +365,7 @@ 
             ];
 
             foreach ($entityListenersAnnot->value as $listenerClassName) {
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -453,7 +453,7 @@ 
                 $fieldName = $associationOverrideAnnotation->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -506,7 +506,7 @@ 
 
                 // Check for fetch
                 if ($associationOverrideAnnotation->fetch) {
-                    $override->setFetchMode(constant(Mapping\FetchMode::class . '::' . $associationOverrideAnnotation->fetch));
+                    $override->setFetchMode(constant(Mapping\FetchMode::class.'::'.$associationOverrideAnnotation->fetch));
                 }
 
                 $metadata->setPropertyOverride($override);
@@ -527,7 +527,7 @@ 
                 $fieldName = $attributeOverrideAnnotation->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -556,7 +556,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -574,7 +574,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -592,7 +592,7 @@ 
         $methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
 
         foreach ($methodAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 

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

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
         $this->metadataBuildingContext            = $metadataBuildingContext;
         $this->tableMetadataBuilder               = $tableMetadataBuilder ?: new TableMetadataBuilder($metadataBuildingContext);
         $this->cacheMetadataBuilder               = $cacheMetadataBuilder ?: new CacheMetadataBuilder($metadataBuildingContext);
-        $this->discriminatorColumnMetadataBuilder = $discriminatorColumnMetadataBuilder?: new DiscriminatorColumnMetadataBuilder($metadataBuildingContext);
+        $this->discriminatorColumnMetadataBuilder = $discriminatorColumnMetadataBuilder ?: new DiscriminatorColumnMetadataBuilder($metadataBuildingContext);
     }
 
     public function withClassName(string $className) : ClassMetadataBuilder
@@ -233,7 +233,7 @@ 
             && $parentMetadata->inheritanceType === Mapping\InheritanceType::SINGLE_TABLE) {
             // Handle the case where a middle mapped super class inherits from a single table inheritance tree.
             do {
-                if (! $parentMetadata->isMappedSuperclass) {
+                if ( ! $parentMetadata->isMappedSuperclass) {
                     $tableMetadata = $parentMetadata->table;
                     break;
                 }

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

Spacing +24 added lines, -24 removed lines

@@ -53,7 +53,7 @@ 
      */
     protected function prepare()
     {
-        if (! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
+        if ( ! isset($this->hints[UnitOfWork::HINT_DEFEREAGERLOAD])) {
             $this->hints[UnitOfWork::HINT_DEFEREAGERLOAD] = true;
         }
 
@@ -63,13 +63,13 @@ 
 
             // Remember which associations are "fetch joined", so that we know where to inject
             // collection stubs or proxies and where not.
-            if (! isset($this->rsm->relationMap[$dqlAlias])) {
+            if ( ! isset($this->rsm->relationMap[$dqlAlias])) {
                 continue;
             }
 
             $parent = $this->rsm->parentAliasMap[$dqlAlias];
 
-            if (! isset($this->rsm->aliasMap[$parent])) {
+            if ( ! isset($this->rsm->aliasMap[$parent])) {
                 throw HydrationException::parentObjectOfRelationNotFound($dqlAlias, $parent);
             }
 
@@ -95,7 +95,7 @@ 
                 $class        = $this->getClassMetadata($className);
                 $inverseAssoc = $class->getProperty($association->getInversedBy());
 
-                if (! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
+                if ( ! ($inverseAssoc instanceof ToOneAssociationMetadata)) {
                     continue;
                 }
 
@@ -161,14 +161,14 @@ 
         $value       = $association->getValue($entity);
         $oid         = spl_object_id($entity);
 
-        if (! $value instanceof PersistentCollection) {
+        if ( ! $value instanceof PersistentCollection) {
             $value = $association->wrap($entity, $value, $this->em);
 
             $association->setValue($entity, $value);
 
             $this->uow->setOriginalEntityProperty($oid, $fieldName, $value);
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } elseif (isset($this->hints[Query::HINT_REFRESH]) ||
             (isset($this->hints['fetched'][$parentDqlAlias][$fieldName]) && ! $value->isInitialized())
         ) {
@@ -177,10 +177,10 @@ 
             $value->setInitialized(true);
             $value->unwrap()->clear();
 
-            $this->initializedCollections[$oid . $fieldName] = $value;
+            $this->initializedCollections[$oid.$fieldName] = $value;
         } else {
             // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN!
-            $this->existingCollections[$oid . $fieldName] = $value;
+            $this->existingCollections[$oid.$fieldName] = $value;
         }
 
         return $value;
@@ -203,13 +203,13 @@ 
         if (isset($this->rsm->discriminatorColumns[$dqlAlias])) {
             $fieldName = $this->rsm->discriminatorColumns[$dqlAlias];
 
-            if (! isset($this->rsm->metaMappings[$fieldName])) {
+            if ( ! isset($this->rsm->metaMappings[$fieldName])) {
                 throw HydrationException::missingDiscriminatorMetaMappingColumn($className, $fieldName, $dqlAlias);
             }
 
             $discrColumn = $this->rsm->metaMappings[$fieldName];
 
-            if (! isset($data[$discrColumn])) {
+            if ( ! isset($data[$discrColumn])) {
                 throw HydrationException::missingDiscriminatorColumn($className, $discrColumn, $dqlAlias);
             }
 
@@ -220,7 +220,7 @@ 
             $discrMap           = $this->metadataCache[$className]->discriminatorMap;
             $discriminatorValue = (string) $data[$discrColumn];
 
-            if (! isset($discrMap[$discriminatorValue])) {
+            if ( ! isset($discrMap[$discriminatorValue])) {
                 throw HydrationException::invalidDiscriminatorValue($discriminatorValue, array_keys($discrMap));
             }
 
@@ -296,10 +296,10 @@ 
                 $parentAlias = $this->rsm->parentAliasMap[$dqlAlias];
                 // we need the $path to save into the identifier map which entities were already
                 // seen for this parent-child relationship
-                $path = $parentAlias . '.' . $dqlAlias;
+                $path = $parentAlias.'.'.$dqlAlias;
 
                 // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs
-                if (! isset($nonemptyComponents[$parentAlias])) {
+                if ( ! isset($nonemptyComponents[$parentAlias])) {
                     // TODO: Add special case code where we hydrate the right join objects into identity map at least
                     continue;
                 }
@@ -330,15 +330,15 @@ 
                 $oid = spl_object_id($parentObject);
 
                 // Check the type of the relation (many or single-valued)
-                if (! ($association instanceof ToOneAssociationMetadata)) {
+                if ( ! ($association instanceof ToOneAssociationMetadata)) {
                     // PATH A: Collection-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
                     if (isset($nonemptyComponents[$dqlAlias])) {
-                        $collKey = $oid . $relationField;
+                        $collKey = $oid.$relationField;
                         if (isset($this->initializedCollections[$collKey])) {
                             $reflFieldValue = $this->initializedCollections[$collKey];
-                        } elseif (! isset($this->existingCollections[$collKey])) {
+                        } elseif ( ! isset($this->existingCollections[$collKey])) {
                             $reflFieldValue = $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
                         }
 
@@ -346,7 +346,7 @@ 
                         $index        = $indexExists ? $this->identifierMap[$path][$id[$parentAlias]][$id[$dqlAlias]] : false;
                         $indexIsValid = $index !== false ? isset($reflFieldValue[$index]) : false;
 
-                        if (! $indexExists || ! $indexIsValid) {
+                        if ( ! $indexExists || ! $indexIsValid) {
                             if (isset($this->existingCollections[$collKey])) {
                                 $element = $this->getEntityFromIdentityMap($entityName, $data);
 
@@ -375,7 +375,7 @@ 
                             // Update result pointer
                             $this->resultPointers[$dqlAlias] = $reflFieldValue[$index];
                         }
-                    } elseif (! $reflFieldValue) {
+                    } elseif ( ! $reflFieldValue) {
                         $this->initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
                     } elseif ($reflFieldValue instanceof PersistentCollection && $reflFieldValue->isInitialized() === false) {
                         $reflFieldValue->setInitialized(true);
@@ -384,7 +384,7 @@ 
                     // PATH B: Single-valued association
                     $reflFieldValue = $association->getValue($parentObject);
 
-                    if (! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
+                    if ( ! $reflFieldValue || isset($this->hints[Query::HINT_REFRESH]) ||
                         ($reflFieldValue instanceof GhostObjectInterface && ! $reflFieldValue->isProxyInitialized())) {
                         // we only need to take action if this value is null,
                         // we refresh the entity or its an uninitialized proxy.
@@ -445,7 +445,7 @@ 
                 $entityKey                    = $this->rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if (! isset($nonemptyComponents[$dqlAlias])) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     if ($this->rsm->isMixed) {
                         $result[] = [$entityKey => null];
                     } else {
@@ -457,7 +457,7 @@ 
                 }
 
                 // check for existing result from the iterations before
-                if (! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
+                if ( ! isset($this->identifierMap[$dqlAlias][$id[$dqlAlias]])) {
                     $element = $this->getEntity($data, $dqlAlias);
 
                     if ($this->rsm->isMixed) {
@@ -500,13 +500,13 @@ 
             }
         }
 
-        if (! isset($resultKey)) {
+        if ( ! isset($resultKey)) {
             $this->resultCounter++;
         }
 
         // Append scalar values to mixed result sets
         if (isset($rowData['scalars'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = isset($this->rsm->indexByMap['scalars'])
                     ? $row[$this->rsm->indexByMap['scalars']]
                     : $this->resultCounter - 1;
@@ -519,7 +519,7 @@ 
 
         // Append new object to mixed result sets
         if (isset($rowData['newObjects'])) {
-            if (! isset($resultKey)) {
+            if ( ! isset($resultKey)) {
                 $resultKey = $this->resultCounter - 1;
             }
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function testForeignKeyOnSTIWithMultipleMapping() : void
     {
-        if (! $this->em->getConnection()->getDatabasePlatform()->supportsForeignKeyConstraints()) {
+        if ( ! $this->em->getConnection()->getDatabasePlatform()->supportsForeignKeyConstraints()) {
             $this->markTestSkipped('Platform does not support foreign keys.');
         }
         $schema = $this->schemaTool->getSchemaFromMetadata(

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +21 added lines, -21 removed lines

@@ -180,11 +180,11 @@ 
                     $pkColumns = [];
 
                     foreach ($class->getPropertiesIterator() 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);
@@ -219,7 +219,7 @@ 
                             }
                         }
 
-                        if (! empty($inheritedKeyColumns)) {
+                        if ( ! empty($inheritedKeyColumns)) {
                             // Add a FK constraint on the ID column
                             $rootClass = $this->em->getClassMetadata($class->getRootClassName());
 
@@ -264,7 +264,7 @@ 
                 }
             }
 
-            if (! $table->hasIndex('primary')) {
+            if ( ! $table->hasIndex('primary')) {
                 $table->setPrimaryKey($pkColumns);
             }
 
@@ -324,7 +324,7 @@ 
             $processedClasses[$class->getClassName()] = true;
 
             foreach ($class->getPropertiesIterator() 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 @@ 
                 $generator  = $property->getValueGenerator()->getGenerator();
                 $quotedName = $generator->getSequenceName();
 
-                if (! $schema->hasSequence($quotedName)) {
+                if ( ! $schema->hasSequence($quotedName)) {
                     $schema->createSequence($quotedName, $generator->getAllocationSize());
                 }
             }
@@ -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->getPropertiesIterator() 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->getPropertiesIterator() 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 ($this->platform->supportsForeignKeyConstraints()) {
             if (isset($addedFks[$compositeName])
@@ -753,7 +753,7 @@ 
                 }
 
                 $blacklistedFks[$compositeName] = true;
-            } elseif (! isset($blacklistedFks[$compositeName])) {
+            } elseif ( ! isset($blacklistedFks[$compositeName])) {
                 $addedFks[$compositeName] = [
                     'foreignTableName' => $foreignTableName,
                     'foreignColumns' => $foreignColumns,
@@ -853,7 +853,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())) {
@@ -878,7 +878,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));
                         }