doctrine / orm

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

Doc Comments +2 added lines, -2 removed lines

@@ -471,7 +471,7 @@ 
      *
      * @todo guilhermeblanco Remove nullable typehint once embeddables are back
      *
-     * @return Mapping\Property|null
+     * @return Mapping\Property
      *
      * @throws Mapping\MappingException
      */
@@ -906,7 +906,7 @@ 
      * @param Annotation\Table      $tableAnnot
      * @param Mapping\TableMetadata $table
      *
-     * @return void
+     * @return Mapping\TableMetadata
      */
     private function convertTableAnnotationToTableMetadata(
         Annotation\Table $tableAnnot,

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver\Annotation;
 
@@ -187,7 +187,7 @@ 
             return $this->classNames;
         }
 
-        if (!$this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -204,7 +204,7 @@ 
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 \RecursiveRegexIterator::GET_MATCH
             );
 
@@ -260,7 +260,7 @@ 
     {
         $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());
@@ -297,7 +297,7 @@ 
                 $metadataBuildingContext
             );
 
-            if (! $property) {
+            if ( ! $property) {
                 continue;
             }
 
@@ -382,7 +382,7 @@ 
     )
     {
         /** @var Annotation\Entity $entityAnnot */
-        $entityAnnot  = $classAnnotations[Annotation\Entity::class];
+        $entityAnnot = $classAnnotations[Annotation\Entity::class];
 
         if ($entityAnnot->repositoryClass !== null) {
             $metadata->setCustomRepositoryClassName(
@@ -480,7 +480,7 @@ 
         \ReflectionProperty $reflectionProperty,
         Mapping\ClassMetadata $metadata,
         Mapping\ClassMetadataBuildingContext $metadataBuildingContext
-    ) : ?Mapping\Property
+    ) : ? Mapping\Property
     {
         switch (true) {
             case isset($propertyAnnotations[Annotation\Column::class]):
@@ -633,11 +633,11 @@ 
         $assocMetadata->setOrphanRemoval($oneToOneAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $oneToOneAnnot->fetch));
 
-        if (! empty($oneToOneAnnot->mappedBy)) {
+        if ( ! empty($oneToOneAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($oneToOneAnnot->mappedBy);
         }
 
-        if (! empty($oneToOneAnnot->inversedBy)) {
+        if ( ! empty($oneToOneAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($oneToOneAnnot->inversedBy);
         }
 
@@ -693,13 +693,13 @@ 
         $fieldName      = $reflectionProperty->getName();
         $manyToOneAnnot = $propertyAnnotations[Annotation\ManyToOne::class];
         $assocMetadata  = new Mapping\ManyToOneAssociationMetadata($fieldName);
-        $targetEntity  = $metadata->fullyQualifiedClassName($manyToOneAnnot->targetEntity);
+        $targetEntity = $metadata->fullyQualifiedClassName($manyToOneAnnot->targetEntity);
 
         $assocMetadata->setTargetEntity($targetEntity);
         $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);
         }
 
@@ -757,18 +757,18 @@ 
         $fieldName      = $reflectionProperty->getName();
         $oneToManyAnnot = $propertyAnnotations[Annotation\OneToMany::class];
         $assocMetadata  = new Mapping\OneToManyAssociationMetadata($fieldName);
-        $targetEntity  = $metadata->fullyQualifiedClassName($oneToManyAnnot->targetEntity);
+        $targetEntity = $metadata->fullyQualifiedClassName($oneToManyAnnot->targetEntity);
 
         $assocMetadata->setTargetEntity($targetEntity);
         $assocMetadata->setCascade($this->getCascade($className, $fieldName, $oneToManyAnnot->cascade));
         $assocMetadata->setOrphanRemoval($oneToManyAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $oneToManyAnnot->fetch));
 
-        if (! empty($oneToManyAnnot->mappedBy)) {
+        if ( ! empty($oneToManyAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($oneToManyAnnot->mappedBy);
         }
 
-        if (! empty($oneToManyAnnot->indexBy)) {
+        if ( ! empty($oneToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($oneToManyAnnot->indexBy);
         }
 
@@ -817,15 +817,15 @@ 
         $assocMetadata->setOrphanRemoval($manyToManyAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $manyToManyAnnot->fetch));
 
-        if (! empty($manyToManyAnnot->mappedBy)) {
+        if ( ! empty($manyToManyAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($manyToManyAnnot->mappedBy);
         }
 
-        if (! empty($manyToManyAnnot->inversedBy)) {
+        if ( ! empty($manyToManyAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($manyToManyAnnot->inversedBy);
         }
 
-        if (! empty($manyToManyAnnot->indexBy)) {
+        if ( ! empty($manyToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($manyToManyAnnot->indexBy);
         }
 
@@ -876,15 +876,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);
         }
 
@@ -913,11 +913,11 @@ 
         Mapping\TableMetadata $table
     ) : void
     {
-        if (! empty($tableAnnot->name)) {
+        if ( ! empty($tableAnnot->name)) {
             $table->setName($tableAnnot->name);
         }
 
-        if (! empty($tableAnnot->schema)) {
+        if ( ! empty($tableAnnot->schema)) {
             $table->setSchema($tableAnnot->schema);
         }
 
@@ -960,11 +960,11 @@ 
     {
         $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);
         }
 
@@ -997,22 +997,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);
         }
 
@@ -1039,7 +1039,7 @@ 
     ) : 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;
@@ -1152,11 +1152,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);
             }
         }
@@ -1167,7 +1167,7 @@ 
         if (isset($classAnnotations[Annotation\DiscriminatorMap::class])) {
             $discriminatorMapAnnotation = $classAnnotations[Annotation\DiscriminatorMap::class];
             $discriminatorMap           = array_map(
-                function ($className) use ($metadata) {
+                function($className) use ($metadata) {
                     return $metadata->fullyQualifiedClassName($className);
                 },
                 $discriminatorMapAnnotation->value
@@ -1197,12 +1197,12 @@ 
         if (isset($classAnnotations[Annotation\NamedQueries::class])) {
             $namedQueriesAnnot = $classAnnotations[Annotation\NamedQueries::class];
 
-            if (! is_array($namedQueriesAnnot->value)) {
+            if ( ! is_array($namedQueriesAnnot->value)) {
                 throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations.");
             }
 
             foreach ($namedQueriesAnnot->value as $namedQuery) {
-                if (! ($namedQuery instanceof Annotation\NamedQuery)) {
+                if ( ! ($namedQuery instanceof Annotation\NamedQuery)) {
                     throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations.");
                 }
 
@@ -1300,7 +1300,7 @@ 
             foreach ($entityListenersAnnot->value as $item) {
                 $listenerClassName = $metadata->fullyQualifiedClassName($item);
 
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -1343,7 +1343,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1377,7 +1377,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1464,7 +1464,7 @@ 
     {
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
 
-        if (! defined($fetchModeConstant)) {
+        if ( ! defined($fetchModeConstant)) {
             throw Mapping\MappingException::invalidFetchMode($className, $fetchMode);
         }
 
@@ -1514,7 +1514,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1534,7 +1534,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1554,7 +1554,7 @@ 
         $methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
 
         foreach ($methodAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 

lib/Doctrine/ORM/Mapping/TableMetadata.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping;
 
@@ -40,7 +40,7 @@ 
      * @param null|string $name
      * @param null|string $schema
      */
-    public function __construct(?string $name = null, ?string $schema = null)
+    public function __construct(? string $name = null, ? string $schema = null)
     {
         $this->name   = $name;
         $this->schema = $schema;
@@ -49,7 +49,7 @@ 
     /**
      * @return string|null
      */
-    public function getSchema() : ?string
+    public function getSchema() : ? string
     {
         return $this->schema;
     }
@@ -73,7 +73,7 @@ 
     /**
      * @return string|null
      */
-    public function getName() : ?string
+    public function getName() : ? string
     {
         return $this->name;
     }
@@ -85,7 +85,7 @@ 
      */
     public function getQuotedQualifiedName(AbstractPlatform $platform) : string
     {
-        if (!$this->schema) {
+        if ( ! $this->schema) {
             return $platform->quoteIdentifier($this->name);
         }
 
@@ -172,7 +172,7 @@ 
      */
     public function addIndex(array $index) : void
     {
-        if (! isset($index['name'])) {
+        if ( ! isset($index['name'])) {
             $this->indexes[] = $index;
 
             return;
@@ -214,7 +214,7 @@ 
      */
     public function addUniqueConstraint(array $constraint) : void
     {
-        if (! isset($constraint['name'])) {
+        if ( ! isset($constraint['name'])) {
             $this->uniqueConstraints[] = $constraint;
 
             return;

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

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver;
 
@@ -185,7 +185,7 @@ 
             return $this->classNames;
         }
 
-        if (!$this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -202,7 +202,7 @@ 
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 \RecursiveRegexIterator::GET_MATCH
             );
 
@@ -254,7 +254,7 @@ 
     {
         $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());
@@ -290,7 +290,7 @@ 
                 $classMetadata
             );
 
-            if (! $property) {
+            if ( ! $property) {
                 continue;
             }
 
@@ -368,7 +368,7 @@ 
     )
     {
         /** @var Annotation\Entity $entityAnnot */
-        $entityAnnot  = $classAnnotations[Annotation\Entity::class];
+        $entityAnnot = $classAnnotations[Annotation\Entity::class];
 
         if ($entityAnnot->repositoryClass !== null) {
             $metadata->setCustomRepositoryClassName(
@@ -480,7 +480,7 @@ 
         array $propertyAnnotations,
         \ReflectionProperty $reflectionProperty,
         Mapping\ClassMetadata $metadata
-    ) : ?Mapping\Property
+    ) : ? Mapping\Property
     {
         switch (true) {
             case isset($propertyAnnotations[Annotation\Column::class]):
@@ -624,11 +624,11 @@ 
         $assocMetadata->setOrphanRemoval($oneToOneAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $oneToOneAnnot->fetch));
 
-        if (! empty($oneToOneAnnot->mappedBy)) {
+        if ( ! empty($oneToOneAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($oneToOneAnnot->mappedBy);
         }
 
-        if (! empty($oneToOneAnnot->inversedBy)) {
+        if ( ! empty($oneToOneAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($oneToOneAnnot->inversedBy);
         }
 
@@ -682,13 +682,13 @@ 
         $fieldName      = $reflectionProperty->getName();
         $manyToOneAnnot = $propertyAnnotations[Annotation\ManyToOne::class];
         $assocMetadata  = new Mapping\ManyToOneAssociationMetadata($fieldName);
-        $targetEntity  = $metadata->fullyQualifiedClassName($manyToOneAnnot->targetEntity);
+        $targetEntity = $metadata->fullyQualifiedClassName($manyToOneAnnot->targetEntity);
 
         $assocMetadata->setTargetEntity($targetEntity);
         $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);
         }
 
@@ -744,18 +744,18 @@ 
         $fieldName      = $reflectionProperty->getName();
         $oneToManyAnnot = $propertyAnnotations[Annotation\OneToMany::class];
         $assocMetadata  = new Mapping\OneToManyAssociationMetadata($fieldName);
-        $targetEntity  = $metadata->fullyQualifiedClassName($oneToManyAnnot->targetEntity);
+        $targetEntity = $metadata->fullyQualifiedClassName($oneToManyAnnot->targetEntity);
 
         $assocMetadata->setTargetEntity($targetEntity);
         $assocMetadata->setCascade($this->getCascade($className, $fieldName, $oneToManyAnnot->cascade));
         $assocMetadata->setOrphanRemoval($oneToManyAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $oneToManyAnnot->fetch));
 
-        if (! empty($oneToManyAnnot->mappedBy)) {
+        if ( ! empty($oneToManyAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($oneToManyAnnot->mappedBy);
         }
 
-        if (! empty($oneToManyAnnot->indexBy)) {
+        if ( ! empty($oneToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($oneToManyAnnot->indexBy);
         }
 
@@ -802,15 +802,15 @@ 
         $assocMetadata->setOrphanRemoval($manyToManyAnnot->orphanRemoval);
         $assocMetadata->setFetchMode($this->getFetchMode($className, $manyToManyAnnot->fetch));
 
-        if (! empty($manyToManyAnnot->mappedBy)) {
+        if ( ! empty($manyToManyAnnot->mappedBy)) {
             $assocMetadata->setMappedBy($manyToManyAnnot->mappedBy);
         }
 
-        if (! empty($manyToManyAnnot->inversedBy)) {
+        if ( ! empty($manyToManyAnnot->inversedBy)) {
             $assocMetadata->setInversedBy($manyToManyAnnot->inversedBy);
         }
 
-        if (! empty($manyToManyAnnot->indexBy)) {
+        if ( ! empty($manyToManyAnnot->indexBy)) {
             $assocMetadata->setIndexedBy($manyToManyAnnot->indexBy);
         }
 
@@ -861,15 +861,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);
         }
 
@@ -898,11 +898,11 @@ 
         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);
         }
 
@@ -943,11 +943,11 @@ 
     {
         $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);
         }
 
@@ -980,22 +980,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);
         }
 
@@ -1022,7 +1022,7 @@ 
     ) : 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;
@@ -1083,7 +1083,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;
@@ -1141,11 +1141,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);
             }
         }
@@ -1156,7 +1156,7 @@ 
         if (isset($classAnnotations[Annotation\DiscriminatorMap::class])) {
             $discriminatorMapAnnotation = $classAnnotations[Annotation\DiscriminatorMap::class];
             $discriminatorMap           = array_map(
-                function ($className) use ($metadata) {
+                function($className) use ($metadata) {
                     return $metadata->fullyQualifiedClassName($className);
                 },
                 $discriminatorMapAnnotation->value
@@ -1186,12 +1186,12 @@ 
         if (isset($classAnnotations[Annotation\NamedQueries::class])) {
             $namedQueriesAnnot = $classAnnotations[Annotation\NamedQueries::class];
 
-            if (! is_array($namedQueriesAnnot->value)) {
+            if ( ! is_array($namedQueriesAnnot->value)) {
                 throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations.");
             }
 
             foreach ($namedQueriesAnnot->value as $namedQuery) {
-                if (! ($namedQuery instanceof Annotation\NamedQuery)) {
+                if ( ! ($namedQuery instanceof Annotation\NamedQuery)) {
                     throw new \UnexpectedValueException("@NamedQueries should contain an array of @NamedQuery annotations.");
                 }
 
@@ -1289,7 +1289,7 @@ 
             foreach ($entityListenersAnnot->value as $item) {
                 $listenerClassName = $metadata->fullyQualifiedClassName($item);
 
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $metadata->getClassName()
@@ -1331,7 +1331,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1365,7 +1365,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1502,7 +1502,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1522,7 +1522,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1542,7 +1542,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/Annotation/Binder/MappedSuperClassMetadataBinder.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver\Annotation\Binder;
 

lib/Doctrine/ORM/Mapping/Driver/Annotation/Binder/EntityClassMetadataBinder.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver\Annotation\Binder;
 

lib/Doctrine/ORM/Mapping/Driver/Annotation/Binder/EmbeddableClassMetadataBinder.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver\Annotation\Binder;
 

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools;
 
@@ -53,7 +53,7 @@ 
         $this->namespace = uniqid("doctrine_", false);
         $this->tmpDir = sys_get_temp_dir();
 
-        mkdir($this->tmpDir . \DIRECTORY_SEPARATOR . $this->namespace);
+        mkdir($this->tmpDir.\DIRECTORY_SEPARATOR.$this->namespace);
 
         $this->generator = new EntityGenerator();
 
@@ -66,7 +66,7 @@ 
 
     public function tearDown()
     {
-        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir . '/' . $this->namespace));
+        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir.'/'.$this->namespace));
 
         foreach ($ri AS $file) {
             /* @var $file \SplFileInfo */
@@ -75,7 +75,7 @@ 
             }
         }
 
-        rmdir($this->tmpDir . '/' . $this->namespace);
+        rmdir($this->tmpDir.'/'.$this->namespace);
     }
 
     /**
@@ -85,9 +85,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->staticMetadataBuildingContext);
 
-        $metadata->setCustomRepositoryClassName($this->namespace . '\EntityGeneratorBookRepository');
+        $metadata->setCustomRepositoryClassName($this->namespace.'\EntityGeneratorBookRepository');
 
         $tableMetadata = new Mapping\TableMetadata();
 
@@ -206,7 +206,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityType', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityType', $this->staticMetadataBuildingContext);
 
         $tableMetadata = new Mapping\TableMetadata();
         $tableMetadata->setName('entity_type');
@@ -239,7 +239,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorIsbn', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorIsbn', $this->staticMetadataBuildingContext);
 
         $metadata->isEmbeddedClass = true;
 
@@ -298,7 +298,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorTestEmbeddable', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorTestEmbeddable', $this->staticMetadataBuildingContext);
 
         $metadata->isEmbeddedClass = true;
 
@@ -341,7 +341,7 @@ 
     private function loadEntityClass(ClassMetadata $metadata)
     {
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path      = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path      = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
 
         self::assertFileExists($path);
 
@@ -492,7 +492,7 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/EntityGeneratorBook.php~");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/EntityGeneratorBook.php~");
 
         $book = $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->getClassName());
@@ -543,7 +543,7 @@ 
         self::assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor'));
         self::assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor'));
 
-        $expectedClassName = '\\' . $embeddedMetadata->getClassName();
+        $expectedClassName = '\\'.$embeddedMetadata->getClassName();
 
         self::assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn'));
         self::assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn'));
@@ -647,7 +647,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->staticMetadataBuildingContext);
 
         $metadata->isMappedSuperclass = true;
 
@@ -684,7 +684,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC1784Entity', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC1784Entity', $this->staticMetadataBuildingContext);
         $metadata->setTable(new Mapping\TableMetadata('ddc1784_entity'));
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
@@ -702,8 +702,8 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-                  . $this->namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+                  . $this->namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php';
 
         self::assertFileExists($filename);
 
@@ -723,7 +723,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC2079Entity', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC2079Entity', $this->staticMetadataBuildingContext);
         $metadata->setTable(new Mapping\TableMetadata('ddc2079_entity'));
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
@@ -763,14 +763,14 @@ 
         $association = new Mapping\ManyToManyAssociationMetadata('centroCustos');
 
         $association->setJoinTable($joinTable);
-        $association->setTargetEntity($this->namespace . '\\DDC2079CentroCusto');
+        $association->setTargetEntity($this->namespace.'\\DDC2079CentroCusto');
 
         $metadata->addProperty($association);
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-            . $this->namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+            . $this->namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php';
 
         self::assertFileExists($filename);
 
@@ -801,7 +801,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -830,7 +830,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -859,7 +859,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -883,7 +883,7 @@ 
     public function testEntityTypeAlias(array $field)
     {
         $metadata   = $this->generateEntityTypeFixture($field);
-        $path       = $this->tmpDir . '/'. $this->namespace . '/EntityType.php';
+        $path       = $this->tmpDir.'/'.$this->namespace.'/EntityType.php';
 
         self::assertFileExists($path);
         require_once $path;
@@ -896,8 +896,8 @@ 
         $type   = $field['phpType'];
         $name   = $field['fieldName'];
         $value  = $field['value'];
-        $getter = "get" . ucfirst($name);
-        $setter = "set" . ucfirst($name);
+        $getter = "get".ucfirst($name);
+        $setter = "set".ucfirst($name);
 
         self::assertPhpDocVarType($type, $reflClass->getProperty($name));
         self::assertPhpDocParamType($type, $reflClass->getMethod($setter));
@@ -920,13 +920,13 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372User");
+        $metadata->setClassName($this->namespace."\DDC2372User");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372User.php");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372User.php");
 
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372User.php";
+        require $this->tmpDir."/".$this->namespace."/DDC2372User.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -948,12 +948,12 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372Admin");
+        $metadata->setClassName($this->namespace."\DDC2372Admin");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php");
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php";
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372Admin.php");
+        require $this->tmpDir."/".$this->namespace."/DDC2372Admin.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -973,22 +973,22 @@ 
         $cmf->setEntityManager($em);
 
         $ns     = $this->namespace;
-        $nsdir  = $this->tmpDir . '/' . $ns;
+        $nsdir  = $this->tmpDir.'/'.$ns;
 
         // Dump DDC1590User into temp file
         $content = str_replace(
             'namespace Doctrine\Tests\Models\DDC1590',
-            'namespace ' . $ns,
-            file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php')
+            'namespace '.$ns,
+            file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php')
         );
 
-        $fname = $nsdir . "/DDC1590User.php";
+        $fname = $nsdir."/DDC1590User.php";
         file_put_contents($fname, $content);
 
         // Require DDC1590User
         require $fname;
 
-        $metadata = $cmf->getMetadataFor($ns . '\DDC1590User');
+        $metadata = $cmf->getMetadataFor($ns.'\DDC1590User');
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
         // class DDC1590User extends DDC1590Entity { ... }
@@ -996,13 +996,13 @@ 
 
         // class _DDC1590User extends DDC1590Entity { ... }
         $source2    = str_replace('class DDC1590User', 'class _DDC1590User', $source);
-        $fname2     = $nsdir . "/_DDC1590User.php";
+        $fname2     = $nsdir."/_DDC1590User.php";
         file_put_contents($fname2, $source2);
         require $fname2;
 
         // class __DDC1590User { ... }
         $source3    = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source);
-        $fname3     = $nsdir . "/__DDC1590User.php";
+        $fname3     = $nsdir."/__DDC1590User.php";
         file_put_contents($fname3, $source3);
         require $fname3;
 
@@ -1165,7 +1165,7 @@ 
         $this->loadEntityClass($metadata);
 
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
         $classTest = file_get_contents($path);
 
         $this->generator->setRegenerateEntityIfExists(true);
@@ -1174,7 +1174,7 @@ 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
         $classNew = file_get_contents($path);
 
-        self::assertSame($classTest,$classNew);
+        self::assertSame($classTest, $classNew);
     }
 
     /**

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

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -31,7 +31,7 @@ 
 use DoctrineGlobal_Article;
 use SebastianBergmann\Environment\Runtime;
 
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
 class ClassMetadataTest extends OrmTestCase
 {
@@ -804,7 +804,7 @@ 
     public function testEmptyFieldNameThrowsException()
     {
         $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, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('cms_users'));
@@ -947,12 +947,12 @@ 
         $mapping = $cm->getSqlResultSetMapping('find-all');
 
         self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
 
         self::assertEquals(CMS\CmsEmail::class, $mapping['entities'][1]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]);
-        self::assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][1]['fields'][0]);
+        self::assertEquals(['name'=>'email', 'column'=>'email'], $mapping['entities'][1]['fields'][1]);
 
         self::assertEquals('scalarColumn', $mapping['columns'][0]['name']);
     }
@@ -1149,7 +1149,7 @@ 
         $cm->addLifecycleCallback('notfound', 'postLoad');
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no method 'notfound' to be registered as lifecycle callback.");
+        $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no method 'notfound' to be registered as lifecycle callback.");
 
         $cm->validateLifecycleCallbacks(new RuntimeReflectionService());
     }
@@ -1169,7 +1169,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();
     }
@@ -1510,6 +1510,6 @@ 
      */
     public function propertyToColumnName($propertyName, $className = null)
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
     }
 }