doctrine / orm

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

Doc Comments +1 added lines, -1 removed lines

@@ -471,7 +471,7 @@
      *
      * @todo guilhermeblanco Remove nullable typehint once embeddables are back
      *
-     * @return Mapping\Property|null
+     * @return Mapping\Property
      */
     private function convertPropertyAnnotationsToProperty(
         array $propertyAnnotations,

Spacing +40 added lines, -40 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());
@@ -289,7 +289,7 @@ 
                 $classMetadata
             );
 
-            if (! $property) {
+            if ( ! $property) {
                 continue;
             }
 
@@ -362,7 +362,7 @@ 
     )
     {
         /** @var Annotation\Entity $entityAnnot */
-        $entityAnnot  = $classAnnotations[Annotation\Entity::class];
+        $entityAnnot = $classAnnotations[Annotation\Entity::class];
 
         if ($entityAnnot->repositoryClass !== null) {
             $metadata->setCustomRepositoryClassName(
@@ -477,7 +477,7 @@ 
         array $propertyAnnotations,
         \ReflectionProperty $reflectionProperty,
         Mapping\ClassMetadata $metadata
-    ) : ?Mapping\Property
+    ) : ? Mapping\Property
     {
         switch (true) {
             case isset($propertyAnnotations[Annotation\Column::class]):
@@ -603,11 +603,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);
         }
 
@@ -660,13 +660,13 @@ 
         $fieldName      = $reflProperty->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);
         }
 
@@ -719,18 +719,18 @@ 
         $fieldName      = $reflProperty->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);
         }
 
@@ -774,15 +774,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);
         }
 
@@ -839,15 +839,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);
         }
 
@@ -876,11 +876,11 @@ 
     {
         $table = new Mapping\TableMetadata();
 
-        if (! empty($tableAnnot->name)) {
+        if ( ! empty($tableAnnot->name)) {
             $table->setName($tableAnnot->name);
         }
 
-        if (! empty($tableAnnot->schema)) {
+        if ( ! empty($tableAnnot->schema)) {
             $table->setSchema($tableAnnot->schema);
         }
 
@@ -923,11 +923,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);
         }
 
@@ -960,22 +960,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);
         }
 
@@ -1002,7 +1002,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;
@@ -1084,11 +1084,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);
             }
         }
@@ -1099,7 +1099,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
@@ -1129,12 +1129,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.");
                 }
 
@@ -1232,7 +1232,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()
@@ -1274,7 +1274,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1308,7 +1308,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1425,7 +1425,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1445,7 +1445,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1465,7 +1465,7 @@ 
         $methodAnnotations = $this->reader->getMethodAnnotations($reflectionMethod);
 
         foreach ($methodAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 

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

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -119,7 +119,7 @@ 
     protected function loadDriverForCMSModels()
     {
         $annotationDriver = $this->loadDriver();
-        $annotationDriver->addPaths([__DIR__ . '/../../Models/CMS/']);
+        $annotationDriver->addPaths([__DIR__.'/../../Models/CMS/']);
         return $annotationDriver;
     }
 
@@ -141,7 +141,7 @@ 
     public function testJoinTablesWithMappedSuperclassForAnnotationDriver()
     {
         $annotationDriver = $this->loadDriver();
-        $annotationDriver->addPaths([__DIR__ . '/../../Models/DirectoryTree/']);
+        $annotationDriver->addPaths([__DIR__.'/../../Models/DirectoryTree/']);
 
         $em = $this->getTestEntityManager();
         $em->getConfiguration()->setMetadataDriverImpl($annotationDriver);
@@ -171,7 +171,7 @@ 
 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
-            "It is illegal to put an inverse side one-to-many or many-to-many association on " .
+            "It is illegal to put an inverse side one-to-many or many-to-many association on ".
             "mapped superclass 'Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass#users'"
         );