doctrine / orm

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

Spacing +35 added lines, -35 removed lines

@@ -208,7 +208,7 @@ 
             return $this->classNames;
         }
 
-        if (! $this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -216,7 +216,7 @@ 
         $includedFiles = [];
 
         foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
+            if ( ! is_dir($path)) {
                 throw Mapping\MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -225,14 +225,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);
                 }
 
@@ -281,7 +281,7 @@ 
     ) : Mapping\ClassMetadata {
         $reflectionClass = $metadata->getReflectionClass();
 
-        if (! $reflectionClass) {
+        if ( ! $reflectionClass) {
             // this happens when running annotation driver in combination with
             // static reflection services. This is not the nicest fix
             $reflectionClass = new ReflectionClass($metadata->getClassName());
@@ -326,7 +326,7 @@ 
                 );
             }
 
-            if (! $property) {
+            if ( ! $property) {
                 continue;
             }
 
@@ -619,12 +619,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);
         }
 
@@ -681,7 +681,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);
         }
 
@@ -741,7 +741,7 @@ 
         $assocMetadata->setOwningSide(false);
         $assocMetadata->setMappedBy($oneToManyAnnot->mappedBy);
 
-        if (! empty($oneToManyAnnot->indexBy)) {
+        if ( ! empty($oneToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($oneToManyAnnot->indexBy);
         }
 
@@ -783,16 +783,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);
         }
 
@@ -835,15 +835,15 @@ 
 
         $fieldMetadata->setType(Type::getType($columnAnnot->type));
 
-        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);
         }
 
@@ -866,11 +866,11 @@ 
         Annotation\Table $tableAnnot,
         Mapping\TableMetadata $tableMetadata
     ) : void {
-        if (! empty($tableAnnot->name)) {
+        if ( ! empty($tableAnnot->name)) {
             $tableMetadata->setName($tableAnnot->name);
         }
 
-        if (! empty($tableAnnot->schema)) {
+        if ( ! empty($tableAnnot->schema)) {
             $tableMetadata->setSchema($tableAnnot->schema);
         }
 
@@ -906,11 +906,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);
         }
 
@@ -938,22 +938,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);
         }
 
@@ -975,7 +975,7 @@ 
         $fieldName = null
     ) : Mapping\CacheMetadata {
         $baseRegion    = strtolower(str_replace('\\', '_', $metadata->getRootClassName()));
-        $defaultRegion = $baseRegion . ($fieldName ? '__' . $fieldName : '');
+        $defaultRegion = $baseRegion.($fieldName ? '__'.$fieldName : '');
 
         $usage  = constant(sprintf('%s::%s', Mapping\CacheUsage::class, $cacheAnnot->usage));
         $region = $cacheAnnot->region ?: $defaultRegion;
@@ -997,7 +997,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;
@@ -1052,11 +1052,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);
             }
         }
@@ -1108,7 +1108,7 @@ 
             $entityListenersAnnot = $classAnnotations[Annotation\EntityListeners::class];
 
             foreach ($entityListenersAnnot->value as $listenerClassName) {
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -1145,7 +1145,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1179,7 +1179,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1268,7 +1268,7 @@ 
     {
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
 
-        if (! defined($fetchModeConstant)) {
+        if ( ! defined($fetchModeConstant)) {
             throw Mapping\MappingException::invalidFetchMode($className, $fetchMode);
         }
 
@@ -1314,7 +1314,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1332,7 +1332,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1350,7 +1350,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 +7 added lines, -7 removed lines

@@ -416,7 +416,7 @@ 
 
                 if (isset($manyToOneElement['fetch'])) {
                     $association->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string) $manyToOneElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $manyToOneElement['fetch'])
                     );
                 }
 
@@ -569,7 +569,7 @@ 
                 $fieldName = (string) $overrideElement['name'];
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -627,7 +627,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'])
                     );
                 }
 
@@ -638,7 +638,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'];
 
                 $metadata->addLifecycleCallback($methodName, $eventName);
@@ -650,7 +650,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,
                         $metadata->getClassName()
@@ -816,7 +816,7 @@ 
         $fieldName = null
     ) {
         $baseRegion    = strtolower(str_replace('\\', '_', $metadata->getRootClassName()));
-        $defaultRegion = $baseRegion . ($fieldName ? '__' . $fieldName : '');
+        $defaultRegion = $baseRegion.($fieldName ? '__'.$fieldName : '');
 
         $region = (string) ($cacheMapping['region'] ?? $defaultRegion);
         $usage  = isset($cacheMapping['usage'])
@@ -844,7 +844,7 @@ 
             Events::preFlush,
         ];
 
-        return array_filter($events, static function ($eventName) use ($method) {
+        return array_filter($events, static function($eventName) use ($method) {
             return $eventName === $method->getName();
         });
     }

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Spacing +40 added lines, -40 removed lines

@@ -262,7 +262,7 @@ 
      */
     public function __toString()
     {
-        return self::class . '@' . spl_object_id($this);
+        return self::class.'@'.spl_object_id($this);
     }
 
     /**
@@ -349,7 +349,7 @@ 
         // Restore ReflectionClass and properties
         $this->reflectionClass = $reflectionService->getClass($this->className);
 
-        if (! $this->reflectionClass) {
+        if ( ! $this->reflectionClass) {
             return;
         }
 
@@ -373,11 +373,11 @@ 
         }
 
         // Verify & complete identifier mapping
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             throw MappingException::identifierRequired($this->className);
         }
 
-        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, static function (Property $property) : bool {
+        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, static function(Property $property) : bool {
             return $property instanceof FieldMetadata
                 && $property->isPrimaryKey()
                 && $property->hasValueGenerator();
@@ -396,14 +396,14 @@ 
     public function validateAssociations() : void
     {
         array_map(
-            function (Property $property) {
-                if (! ($property instanceof AssociationMetadata)) {
+            function(Property $property) {
+                if ( ! ($property instanceof AssociationMetadata)) {
                     return;
                 }
 
                 $targetEntity = $property->getTargetEntity();
 
-                if (! class_exists($targetEntity)) {
+                if ( ! class_exists($targetEntity)) {
                     throw MappingException::invalidTargetEntityClass($targetEntity, $this->className, $property->getName());
                 }
             },
@@ -421,7 +421,7 @@ 
         foreach ($this->lifecycleCallbacks as $callbacks) {
             /** @var array $callbacks */
             foreach ($callbacks as $callbackFuncName) {
-                if (! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
+                if ( ! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
                     throw MappingException::lifecycleCallbackMethodNotFound($this->className, $callbackFuncName);
                 }
             }
@@ -445,11 +445,11 @@ 
      */
     public function isIdentifier(string $fieldName) : bool
     {
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             return false;
         }
 
-        if (! $this->isIdentifierComposite()) {
+        if ( ! $this->isIdentifierComposite()) {
             return $fieldName === $this->identifier[0];
         }
 
@@ -477,7 +477,7 @@ 
             $property->setColumnName($columnName);
         }
 
-        if (! $this->isMappedSuperclass) {
+        if ( ! $this->isMappedSuperclass) {
             $property->setTableName($this->getTableName());
         }
 
@@ -497,7 +497,7 @@ 
                 throw MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($this->className, $property);
             }
 
-            if (! in_array($fieldName, $this->identifier, true)) {
+            if ( ! in_array($fieldName, $this->identifier, true)) {
                 $this->identifier[] = $fieldName;
             }
         }
@@ -547,7 +547,7 @@ 
         $fieldName    = $property->getName();
         $targetEntity = $property->getTargetEntity();
 
-        if (! $targetEntity) {
+        if ( ! $targetEntity) {
             throw MappingException::missingTargetEntity($fieldName);
         }
 
@@ -560,7 +560,7 @@ 
                 throw MappingException::illegalOrphanRemovalOnIdentifierAssociation($this->className, $fieldName);
             }
 
-            if (! in_array($property->getName(), $this->identifier, true)) {
+            if ( ! in_array($property->getName(), $this->identifier, true)) {
                 if ($property instanceof ToOneAssociationMetadata && count($property->getJoinColumns()) >= 2) {
                     throw MappingException::cannotMapCompositePrimaryKeyEntitiesAsForeignId(
                         $property->getTargetEntity(),
@@ -622,7 +622,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 if ($property instanceof OneToOneAssociationMetadata && $this->inheritanceType !== InheritanceType::SINGLE_TABLE) {
                     if (count($property->getJoinColumns()) === 1) {
-                        if (! $property->isPrimaryKey()) {
+                        if ( ! $property->isPrimaryKey()) {
                             $joinColumn->setUnique(true);
                         }
                     } else {
@@ -630,13 +630,13 @@ 
                     }
                 }
 
-                $joinColumn->setTableName(! $this->isMappedSuperclass ? $this->getTableName() : null);
+                $joinColumn->setTableName( ! $this->isMappedSuperclass ? $this->getTableName() : null);
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $joinColumn->setColumnName($this->namingStrategy->joinColumnName($fieldName, $this->className));
                 }
 
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
@@ -644,7 +644,7 @@ 
             }
 
             if ($uniqueConstraintColumns) {
-                if (! $this->table) {
+                if ( ! $this->table) {
                     throw new RuntimeException(
                         'ClassMetadata::setTable() has to be called before defining a one to one relationship.'
                     );
@@ -664,7 +664,7 @@ 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -727,14 +727,14 @@ 
     protected function validateAndCompleteOneToManyMapping(OneToManyAssociationMetadata $property)
     {
         // OneToMany MUST have mappedBy
-        if (! $property->getMappedBy()) {
+        if ( ! $property->getMappedBy()) {
             throw MappingException::oneToManyRequiresMappedBy($property->getName());
         }
 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades, true)) {
+            if ( ! in_array('remove', $cascades, true)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -757,7 +757,7 @@ 
 
             $property->setJoinTable($joinTable);
 
-            if (! $joinTable->getName()) {
+            if ( ! $joinTable->getName()) {
                 $joinTableName = $this->namingStrategy->joinTableName(
                     $property->getSourceEntity(),
                     $property->getTargetEntity(),
@@ -769,7 +769,7 @@ 
 
             $selfReferencingEntityWithoutJoinColumns = $property->getSourceEntity() === $property->getTargetEntity() && ! $joinTable->hasColumns();
 
-            if (! $joinTable->getJoinColumns()) {
+            if ( ! $joinTable->getJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $sourceReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'source' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getSourceEntity(), $sourceReferenceName);
@@ -782,7 +782,7 @@ 
                 $joinTable->addJoinColumn($joinColumn);
             }
 
-            if (! $joinTable->getInverseJoinColumns()) {
+            if ( ! $joinTable->getInverseJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $targetReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'target' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getTargetEntity(), $targetReferenceName);
@@ -797,13 +797,13 @@ 
 
             foreach ($joinTable->getJoinColumns() as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getSourceEntity(),
                         $referencedColumnName
@@ -815,13 +815,13 @@ 
 
             foreach ($joinTable->getInverseJoinColumns() as $inverseJoinColumn) {
                 /** @var JoinColumnMetadata $inverseJoinColumn */
-                if (! $inverseJoinColumn->getReferencedColumnName()) {
+                if ( ! $inverseJoinColumn->getReferencedColumnName()) {
                     $inverseJoinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $inverseJoinColumn->getReferencedColumnName();
 
-                if (! $inverseJoinColumn->getColumnName()) {
+                if ( ! $inverseJoinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getTargetEntity(),
                         $referencedColumnName
@@ -855,7 +855,7 @@ 
             throw MappingException::singleIdNotAllowedOnCompositePrimaryKey($this->className);
         }
 
-        if (! isset($this->identifier[0])) {
+        if ( ! isset($this->identifier[0])) {
             throw MappingException::noIdDefined($this->className);
         }
 
@@ -914,7 +914,7 @@ 
             // Association defined as Id field
             $targetClass = $em->getClassMetadata($property->getTargetEntity());
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 $property    = $targetClass->getProperty($property->getMappedBy());
                 $targetClass = $em->getClassMetadata($property->getTargetEntity());
             }
@@ -928,7 +928,7 @@ 
                 $columnName           = $joinColumn->getColumnName();
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $em));
                 }
 
@@ -962,10 +962,10 @@ 
     {
         $schema = $this->getSchemaName() === null
             ? ''
-            : $this->getSchemaName() . '_';
+            : $this->getSchemaName().'_';
 
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return $schema . $this->getTableName() . '_id_tmp';
+        return $schema.$this->getTableName().'_id_tmp';
     }
 
     /**
@@ -999,7 +999,7 @@ 
      */
     public function setInheritanceType($type) : void
     {
-        if (! $this->isInheritanceType($type)) {
+        if ( ! $this->isInheritanceType($type)) {
             throw MappingException::invalidInheritanceType($this->className, $type);
         }
 
@@ -1017,7 +1017,7 @@ 
     {
         $fieldName = $property->getName();
 
-        if (! isset($this->declaredProperties[$fieldName])) {
+        if ( ! isset($this->declaredProperties[$fieldName])) {
             throw MappingException::invalidOverrideFieldName($this->className, $fieldName);
         }
 
@@ -1214,7 +1214,7 @@ 
         $declaringClass    = $property->getDeclaringClass();
 
         if ($inheritedProperty instanceof FieldMetadata) {
-            if (! $declaringClass->isMappedSuperclass) {
+            if ( ! $declaringClass->isMappedSuperclass) {
                 $inheritedProperty->setTableName($property->getTableName());
             }
 
@@ -1325,11 +1325,11 @@ 
             'method' => $method,
         ];
 
-        if (! class_exists($class)) {
+        if ( ! class_exists($class)) {
             throw MappingException::entityListenerClassNotFound($class, $this->className);
         }
 
-        if (! method_exists($class, $method)) {
+        if ( ! method_exists($class, $method)) {
             throw MappingException::entityListenerMethodNotFound($class, $method, $this->className);
         }
 
@@ -1396,7 +1396,7 @@ 
             return;
         }
 
-        if (! (class_exists($className) || interface_exists($className))) {
+        if ( ! (class_exists($className) || interface_exists($className))) {
             throw MappingException::invalidClassInDiscriminatorMap($className, $this->className);
         }
 

lib/Doctrine/ORM/Mapping/MappingException.php

Spacing +44 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
      */
     public static function pathRequired()
     {
-        return new self('Specifying the paths to your entities is required ' .
+        return new self('Specifying the paths to your entities is required '.
             'in the AnnotationDriver to retrieve all class names.');
     }
 
@@ -214,7 +214,7 @@ 
      */
     public static function missingQueryMapping($entity, $queryName)
     {
-        return new self('Query named "' . $queryName . '" in "' . $entity . ' requires a result class or result set mapping.');
+        return new self('Query named "'.$queryName.'" in "'.$entity.' requires a result class or result set mapping.');
     }
 
     /**
@@ -225,7 +225,7 @@ 
      */
     public static function missingResultSetMappingEntity($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . ' requires a entity class name.');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a entity class name.');
     }
 
     /**
@@ -236,7 +236,7 @@ 
      */
     public static function missingResultSetMappingFieldName($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . ' requires a field name.');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.' requires a field name.');
     }
 
     /**
@@ -283,8 +283,8 @@ 
     {
         $message = sprintf("The mapping of field '%s' is invalid: The option '%s' is required.", $field, $expectedOption);
 
-        if (! empty($hint)) {
-            $message .= ' (Hint: ' . $hint . ')';
+        if ( ! empty($hint)) {
+            $message .= ' (Hint: '.$hint.')';
         }
 
         return new self($message);
@@ -313,7 +313,7 @@ 
      */
     public static function reflectionFailure($entity, ReflectionException $previousException)
     {
-        return new self('An error occurred in ' . $entity, 0, $previousException);
+        return new self('An error occurred in '.$entity, 0, $previousException);
     }
 
     /**
@@ -324,8 +324,8 @@ 
      */
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
     {
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
-            . $className . ' since it is referenced by a join column of another class.');
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
+            . $className.' since it is referenced by a join column of another class.');
     }
 
     /**
@@ -359,7 +359,7 @@ 
      */
     public static function propertyTypeIsRequired($className, $propertyName)
     {
-        return new self("The attribute 'type' is required for the column description of property " . $className . '::$' . $propertyName . '.');
+        return new self("The attribute 'type' is required for the column description of property ".$className.'::$'.$propertyName.'.');
     }
 
     /**
@@ -369,7 +369,7 @@ 
      */
     public static function tableIdGeneratorNotImplemented($className)
     {
-        return new self('TableIdGenerator is not yet implemented for use with class ' . $className);
+        return new self('TableIdGenerator is not yet implemented for use with class '.$className);
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     public static function duplicateQueryMapping($entity, $queryName)
     {
-        return new self('Query named "' . $queryName . '" in "' . $entity . '" was already declared, but it must be declared only once');
+        return new self('Query named "'.$queryName.'" in "'.$entity.'" was already declared, but it must be declared only once');
     }
 
     /**
@@ -406,7 +406,7 @@ 
      */
     public static function duplicateResultSetMapping($entity, $resultName)
     {
-        return new self('Result set mapping named "' . $resultName . '" in "' . $entity . '" was already declared, but it must be declared only once');
+        return new self('Result set mapping named "'.$resultName.'" in "'.$entity.'" was already declared, but it must be declared only once');
     }
 
     /**
@@ -416,7 +416,7 @@ 
      */
     public static function singleIdNotAllowedOnCompositePrimaryKey($entity)
     {
-        return new self('Single id is not allowed on composite primary key in entity ' . $entity);
+        return new self('Single id is not allowed on composite primary key in entity '.$entity);
     }
 
     /**
@@ -426,7 +426,7 @@ 
      */
     public static function noIdDefined($entity)
     {
-        return new self('No ID defined for entity ' . $entity);
+        return new self('No ID defined for entity '.$entity);
     }
 
     /**
@@ -436,7 +436,7 @@ 
      */
     public static function unsupportedOptimisticLockingType($unsupportedType)
     {
-        return new self('Locking type "' . $unsupportedType . '" is not supported by Doctrine.');
+        return new self('Locking type "'.$unsupportedType.'" is not supported by Doctrine.');
     }
 
     /**
@@ -446,13 +446,13 @@ 
      */
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
     {
-        if (! empty($path)) {
-            $path = '[' . $path . ']';
+        if ( ! empty($path)) {
+            $path = '['.$path.']';
         }
 
         return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
+            'File mapping drivers must have a valid directory path, '.
+            'however the given path '.$path.' seems to be incorrect!'
         );
     }
 
@@ -468,7 +468,7 @@ 
     public static function invalidClassInDiscriminatorMap($className, $owningClass)
     {
         return new self(sprintf(
-            "Entity class '%s' used in the discriminator map of class '%s' " .
+            "Entity class '%s' used in the discriminator map of class '%s' ".
             'does not exist.',
             $className,
             $owningClass
@@ -485,15 +485,15 @@ 
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
     {
         return new self(
-            'The entries ' . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
-            'If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ' .
-            'The entries of the current map are: @DiscriminatorMap({' . implode(', ', array_map(
-                static function ($a, $b) {
+            'The entries '.implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
+            'If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. '.
+            'The entries of the current map are: @DiscriminatorMap({'.implode(', ', array_map(
+                static function($a, $b) {
                     return sprintf("'%s': '%s'", $a, $b);
                 },
                 array_keys($map),
                 array_values($map)
-            )) . '})'
+            )).'})'
         );
     }
 
@@ -556,7 +556,7 @@ 
     public static function sqlConversionNotAllowedForPrimaryKeyProperties($className, Property $property)
     {
         return new self(sprintf(
-            'It is not possible to set id field "%s" to type "%s" in entity class "%s". ' .
+            'It is not possible to set id field "%s" to type "%s" in entity class "%s". '.
             'The type "%s" requires conversion SQL which is not allowed for identifiers.',
             $property->getName(),
             $property->getTypeName(),
@@ -592,7 +592,7 @@ 
      */
     public static function duplicateColumnName($className, $columnName)
     {
-        return new self("Duplicate definition of column '" . $columnName . "' on entity '" . $className . "' in a field or discriminator column mapping.");
+        return new self("Duplicate definition of column '".$columnName."' on entity '".$className."' in a field or discriminator column mapping.");
     }
 
     /**
@@ -603,7 +603,7 @@ 
      */
     public static function illegalToManyAssociationOnMappedSuperclass($className, $field)
     {
-        return new self("It is illegal to put an inverse side one-to-many or many-to-many association on mapped superclass '" . $className . '#' . $field . "'.");
+        return new self("It is illegal to put an inverse side one-to-many or many-to-many association on mapped superclass '".$className.'#'.$field."'.");
     }
 
     /**
@@ -615,8 +615,8 @@ 
      */
     public static function cannotMapCompositePrimaryKeyEntitiesAsForeignId($className, $targetEntity, $targetField)
     {
-        return new self("It is not possible to map entity '" . $className . "' with a composite primary key " .
-            "as part of the primary key of another entity '" . $targetEntity . '#' . $targetField . "'.");
+        return new self("It is not possible to map entity '".$className."' with a composite primary key ".
+            "as part of the primary key of another entity '".$targetEntity.'#'.$targetField."'.");
     }
 
     /**
@@ -670,8 +670,8 @@ 
      */
     public static function illegalOrphanRemoval($className, $field)
     {
-        return new self('Orphan removal is only allowed on one-to-one and one-to-many ' .
-            'associations, but ' . $className . '#' . $field . ' is not.');
+        return new self('Orphan removal is only allowed on one-to-one and one-to-many '.
+            'associations, but '.$className.'#'.$field.' is not.');
     }
 
     /**
@@ -703,7 +703,7 @@ 
      */
     public static function noInheritanceOnMappedSuperClass($className)
     {
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
     }
 
     /**
@@ -715,8 +715,8 @@ 
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
     {
         return new self(
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '" . $className . "' an abstract class " .
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
             'to avoid this exception from occurring.'
         );
     }
@@ -729,7 +729,7 @@ 
      */
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
     {
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
     }
 
     /**
@@ -775,7 +775,7 @@ 
      */
     public static function invalidFetchMode($className, $annotation)
     {
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
     }
 
     /**
@@ -785,7 +785,7 @@ 
      */
     public static function compositeKeyAssignedIdGeneratorRequired($className)
     {
-        return new self("Entity '" . $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
     }
 
     /**
@@ -797,7 +797,7 @@ 
      */
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
     {
-        return new self("The target-entity '" . $targetEntity . "' cannot be found in '" . $sourceEntity . '#' . $associationName . "'.");
+        return new self("The target-entity '".$targetEntity."' cannot be found in '".$sourceEntity.'#'.$associationName."'.");
     }
 
     /**
@@ -809,8 +809,8 @@ 
      */
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
     {
-        $cascades = implode(', ', array_map(static function ($e) {
-            return "'" . $e . "'";
+        $cascades = implode(', ', array_map(static function($e) {
+            return "'".$e."'";
         }, $cascades));
 
         return new self(sprintf(
@@ -843,7 +843,7 @@ 
     {
         return new self(
             sprintf(
-                'Infinite nesting detected for embedded property %s::%s. ' .
+                'Infinite nesting detected for embedded property %s::%s. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
                 $className,
                 $propertyName
@@ -858,7 +858,7 @@ 
     {
         return new self(
             sprintf(
-                'Class %s not found in namespaces %s.' .
+                'Class %s not found in namespaces %s.'.
                 $className,
                 implode(', ', $namespaces)
             )

lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php

Spacing +13 added lines, -13 removed lines

@@ -33,7 +33,7 @@ 
         // the entire collection with a new would trigger this operation.
         $association = $collection->getMapping();
 
-        if (! $association->isOrphanRemoval()) {
+        if ( ! $association->isOrphanRemoval()) {
             // Handling non-orphan removal should never happen, as @OneToMany
             // can only be inverse side. For owning side one to many, it is
             // required to have a join table, which would classify as a ManyToManyPersister.
@@ -65,7 +65,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
@@ -114,7 +114,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
@@ -136,7 +136,7 @@ 
      */
     public function contains(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
@@ -160,12 +160,12 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOrphanRemoval()) {
+        if ( ! $association->isOrphanRemoval()) {
             // no-op: this is not the owning side, therefore no operations should be applied
             return false;
         }
 
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
@@ -203,7 +203,7 @@ 
         }
 
         $tableName = $targetClass->table->getQuotedQualifiedName($this->platform);
-        $statement = 'DELETE FROM ' . $tableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        $statement = 'DELETE FROM '.$tableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
 
         return $this->conn->executeUpdate($statement, $parameters);
     }
@@ -240,17 +240,17 @@ 
             ];
         }
 
-        $statement = $this->platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable
-            . ' (' . $this->platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
+        $statement = $this->platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable
+            . ' ('.$this->platform->getColumnDeclarationListSQL($columnDefinitions).')';
 
         $this->conn->executeUpdate($statement);
 
         // 2) Build insert table records into temporary table
-        $dql   = ' SELECT t0.' . implode(', t0.', $rootClass->getIdentifierFieldNames())
-               . ' FROM ' . $targetClass->getClassName() . ' t0 WHERE t0.' . $association->getMappedBy() . ' = :owner';
+        $dql   = ' SELECT t0.'.implode(', t0.', $rootClass->getIdentifierFieldNames())
+               . ' FROM '.$targetClass->getClassName().' t0 WHERE t0.'.$association->getMappedBy().' = :owner';
         $query = $this->em->createQuery($dql)->setParameter('owner', $collection->getOwner());
 
-        $statement  = 'INSERT INTO ' . $tempTable . ' (' . $idColumnNameList . ') ' . $query->getSQL();
+        $statement  = 'INSERT INTO '.$tempTable.' ('.$idColumnNameList.') '.$query->getSQL();
         $parameters = array_values($sourcePersister->getIdentifier($collection->getOwner()));
         $numDeleted = $this->conn->executeUpdate($statement, $parameters);
 
@@ -265,7 +265,7 @@ 
         // 4) Delete records on each table in the hierarchy
         $hierarchyClasses = array_merge(
             array_map(
-                function ($className) {
+                function($className) {
                     return $this->em->getClassMetadata($className);
                 },
                 array_reverse($targetClass->getSubClasses())

lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php

Spacing +46 added lines, -46 removed lines

@@ -37,7 +37,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -49,7 +49,7 @@ 
             /** @var JoinColumnMetadata $joinColumn */
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -69,7 +69,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             return; // ignore inverse side
         }
 
@@ -100,7 +100,7 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
@@ -144,7 +144,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -176,9 +176,9 @@ 
         }*/
 
         $sql = 'SELECT COUNT(*)'
-            . ' FROM ' . $joinTableName . ' t'
+            . ' FROM '.$joinTableName.' t'
             . $joinTargetEntitySQL
-            . ' WHERE ' . implode(' AND ', $conditions);
+            . ' WHERE '.implode(' AND ', $conditions);
 
         return $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -200,13 +200,13 @@ 
     {
         $association = $collection->getMapping();
 
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             throw new BadMethodCallException('Selecting a collection by index is only supported on indexed collections.');
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictionsWithKey($collection, $key, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -216,13 +216,13 @@ 
      */
     public function contains(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictions($collection, $element, true);
 
-        $sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'SELECT 1 FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->fetchColumn($sql, $params, 0, $types);
     }
@@ -232,13 +232,13 @@ 
      */
     public function removeElement(PersistentCollection $collection, $element)
     {
-        if (! $this->isValidEntityState($element)) {
+        if ( ! $this->isValidEntityState($element)) {
             return false;
         }
 
         [$quotedJoinTable, $whereClauses, $params, $types] = $this->getJoinTableRestrictions($collection, $element, false);
 
-        $sql = 'DELETE FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
+        $sql = 'DELETE FROM '.$quotedJoinTable.' WHERE '.implode(' AND ', $whereClauses);
 
         return (bool) $this->conn->executeUpdate($sql, $params, $types);
     }
@@ -256,7 +256,7 @@ 
         $onConditions  = $this->getOnConditionSQL($association);
         $whereClauses  = $params = $types = [];
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $association = $targetClass->getProperty($association->getMappedBy());
             $joinColumns = $association->getJoinTable()->getInverseJoinColumns();
         } else {
@@ -268,7 +268,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $ownerMetadata, $this->em));
             }
 
@@ -296,11 +296,11 @@ 
 
         $resultSetMapping->addRootEntityFromClassMetadata($targetClass->getClassName(), 'te');
 
-        $sql = 'SELECT ' . $resultSetMapping->generateSelectClause()
-            . ' FROM ' . $tableName . ' te'
-            . ' JOIN ' . $joinTableName . ' t ON'
+        $sql = 'SELECT '.$resultSetMapping->generateSelectClause()
+            . ' FROM '.$tableName.' te'
+            . ' JOIN '.$joinTableName.' t ON'
             . implode(' AND ', $onConditions)
-            . ' WHERE ' . implode(' AND ', $whereClauses);
+            . ' WHERE '.implode(' AND ', $whereClauses);
 
         $sql .= $this->getOrderingSql($criteria, $targetClass);
         $sql .= $this->getLimitSql($criteria);
@@ -335,8 +335,8 @@ 
 
         // A join is needed if there is filtering on the target entity
         $tableName = $rootClass->table->getQuotedQualifiedName($this->platform);
-        $joinSql   = ' JOIN ' . $tableName . ' te'
-            . ' ON' . implode(' AND ', $this->getOnConditionSQL($association));
+        $joinSql   = ' JOIN '.$tableName.' te'
+            . ' ON'.implode(' AND ', $this->getOnConditionSQL($association));
 
         return [$joinSql, $filterSql];
     }
@@ -357,18 +357,18 @@ 
             $filterExpr = $filter->addFilterConstraint($targetEntity, $targetTableAlias);
 
             if ($filterExpr) {
-                $filterClauses[] = '(' . $filterExpr . ')';
+                $filterClauses[] = '('.$filterExpr.')';
             }
         }
 
-        if (! $filterClauses) {
+        if ( ! $filterClauses) {
             return '';
         }
 
         $filterSql = implode(' AND ', $filterClauses);
 
         return isset($filterClauses[1])
-            ? '(' . $filterSql . ')'
+            ? '('.$filterSql.')'
             : $filterSql;
     }
 
@@ -395,7 +395,7 @@ 
             $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-            $conditions[] = ' t.' . $quotedColumnName . ' = te.' . $quotedReferencedColumnName;
+            $conditions[] = ' t.'.$quotedColumnName.' = te.'.$quotedReferencedColumnName;
         }
 
         return $conditions;
@@ -417,7 +417,7 @@ 
             $columns[] = $this->platform->quoteIdentifier($joinColumn->getColumnName());
         }
 
-        return 'DELETE FROM ' . $joinTableName . ' WHERE ' . implode(' = ? AND ', $columns) . ' = ?';
+        return 'DELETE FROM '.$joinTableName.' WHERE '.implode(' = ? AND ', $columns).' = ?';
     }
 
     /**
@@ -472,7 +472,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -485,7 +485,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -536,7 +536,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $class, $this->em));
             }
 
@@ -549,7 +549,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
@@ -633,7 +633,7 @@ 
         $sourceClass       = $this->em->getClassMetadata($owningAssociation->getSourceEntity());
         $targetClass       = $this->em->getClassMetadata($owningAssociation->getTargetEntity());
 
-        if (! $owningAssociation->isOwningSide()) {
+        if ( ! $owningAssociation->isOwningSide()) {
             $owningAssociation  = $targetClass->getProperty($owningAssociation->getMappedBy());
             $joinTable          = $owningAssociation->getJoinTable();
             $joinColumns        = $joinTable->getJoinColumns();
@@ -645,7 +645,7 @@ 
         }
 
         $joinTableName   = $joinTable->getQuotedQualifiedName($this->platform);
-        $quotedJoinTable = $joinTableName . ' t';
+        $quotedJoinTable = $joinTableName.' t';
         $whereClauses    = [];
         $params          = [];
         $types           = [];
@@ -659,11 +659,11 @@ 
                 $quotedColumnName           = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $quotedReferencedColumnName = $this->platform->quoteIdentifier($joinColumn->getReferencedColumnName());
 
-                $joinConditions[] = ' t.' . $quotedColumnName . ' = tr.' . $quotedReferencedColumnName;
+                $joinConditions[] = ' t.'.$quotedColumnName.' = tr.'.$quotedReferencedColumnName;
             }
 
             $tableName        = $targetClass->table->getQuotedQualifiedName($this->platform);
-            $quotedJoinTable .= ' JOIN ' . $tableName . ' tr ON ' . implode(' AND ', $joinConditions);
+            $quotedJoinTable .= ' JOIN '.$tableName.' tr ON '.implode(' AND ', $joinConditions);
             $indexByProperty  = $targetClass->getProperty($indexBy);
 
             switch (true) {
@@ -686,7 +686,7 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
@@ -695,13 +695,13 @@ 
             $types[]        = $joinColumn->getType();
         }
 
-        if (! $joinNeeded) {
+        if ( ! $joinNeeded) {
             foreach ($joinColumns as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
                 $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
                 }
 
@@ -715,7 +715,7 @@ 
             [$joinTargetEntitySQL, $filterSql] = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -738,7 +738,7 @@ 
         $association       = $collection->getMapping();
         $owningAssociation = $association;
 
-        if (! $association->isOwningSide()) {
+        if ( ! $association->isOwningSide()) {
             $sourceClass      = $this->em->getClassMetadata($association->getTargetEntity());
             $targetClass      = $this->em->getClassMetadata($association->getSourceEntity());
             $sourceIdentifier = $this->uow->getEntityIdentifier($element);
@@ -764,11 +764,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $sourceClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $sourceIdentifier[$sourceClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -778,11 +778,11 @@ 
             $quotedColumnName     = $this->platform->quoteIdentifier($joinColumn->getColumnName());
             $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-            if (! $joinColumn->getType()) {
+            if ( ! $joinColumn->getType()) {
                 $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $this->em));
             }
 
-            $whereClauses[] = ($addFilters ? 't.' : '') . $quotedColumnName . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '').$quotedColumnName.' = ?';
             $params[]       = $targetIdentifier[$targetClass->fieldNames[$referencedColumnName]];
             $types[]        = $joinColumn->getType();
         }
@@ -793,7 +793,7 @@ 
             [$joinTargetEntitySQL, $filterSql] = $this->getFilterSql($association);
 
             if ($filterSql) {
-                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' '.$joinTargetEntitySQL;
                 $whereClauses[]   = $filterSql;
             }
         }
@@ -838,10 +838,10 @@ 
                 $property   = $targetClass->getProperty($name);
                 $columnName = $this->platform->quoteIdentifier($property->getColumnName());
 
-                $orderBy[] = $columnName . ' ' . $direction;
+                $orderBy[] = $columnName.' '.$direction;
             }
 
-            return ' ORDER BY ' . implode(', ', $orderBy);
+            return ' ORDER BY '.implode(', ', $orderBy);
         }
         return '';
     }

lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php

Spacing +3 added lines, -3 removed lines

@@ -74,13 +74,13 @@
 
         switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
-                return '(' . implode(' AND ', $expressionList) . ')';
+                return '('.implode(' AND ', $expressionList).')';
 
             case CompositeExpression::TYPE_OR:
-                return '(' . implode(' OR ', $expressionList) . ')';
+                return '('.implode(' OR ', $expressionList).')';
 
             default:
-                throw new RuntimeException('Unknown composite ' . $expr->getType());
+                throw new RuntimeException('Unknown composite '.$expr->getType());
         }
     }
 

lib/Doctrine/ORM/Query/Lexer.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 
             // Recognize identifiers, aliased or qualified names
             case ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\':
-                $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+                $name = 'Doctrine\ORM\Query\Lexer::T_'.strtoupper($value);
 
                 if (defined($name)) {
                     $type = constant($name);

lib/Doctrine/ORM/Query/Expr/Base.php

Spacing +4 added lines, -4 removed lines

@@ -63,12 +63,12 @@ 
      */
     public function add($arg)
     {
-        if ($arg !== null && (! $arg instanceof self || $arg->count() > 0)) {
+        if ($arg !== null && ( ! $arg instanceof self || $arg->count() > 0)) {
             // If we decide to keep Expr\Base instances, we can use this check
-            if (! is_string($arg)) {
+            if ( ! is_string($arg)) {
                 $class = get_class($arg);
 
-                if (! in_array($class, $this->allowedClasses, true)) {
+                if ( ! in_array($class, $this->allowedClasses, true)) {
                     throw new InvalidArgumentException(
                         sprintf("Expression of type '%s' not allowed in this context.", $class)
                     );
@@ -98,6 +98,6 @@ 
             return (string) $this->parts[0];
         }
 
-        return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator;
+        return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator;
     }
 }