doctrine / orm

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

Doc Comments +6 added lines

@@ -155,6 +155,9 @@ 
         $this->books = new \Doctrine\Common\Collections\ArrayCollection;
     }
 
+    /**
+     * @param string $title
+     */
     public function addBook($title)
     {
         $book = new DDC618Book($title, $this);
@@ -179,6 +182,9 @@ 
     /** @ORM\ManyToOne(targetEntity=DDC618Author::class, inversedBy="books") */
     public $author;
 
+    /**
+     * @param DDC618Author $author
+     */
     function __construct($title, $author)
     {
         $this->title = $title;

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

Unused Use Statements -1 removed lines

@@ -26,7 +26,6 @@
 use Doctrine\Tests\Models\DDC964\DDC964Address;
 use Doctrine\Tests\Models\DDC964\DDC964Admin;
 use Doctrine\Tests\Models\DDC964\DDC964Guest;
-use Doctrine\Tests\Models\Routing\RoutingLeg;
 use Doctrine\Tests\OrmTestCase;
 use DoctrineGlobal_Article;
 

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

Spacing +37 added lines, -37 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($entityAnnot->repositoryClass);
@@ -629,11 +629,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);
         }
 
@@ -695,7 +695,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);
         }
 
@@ -760,11 +760,11 @@ 
         $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);
         }
 
@@ -813,15 +813,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);
         }
 
@@ -872,15 +872,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);
         }
 
@@ -909,11 +909,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);
         }
 
@@ -956,11 +956,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);
         }
 
@@ -993,22 +993,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);
         }
 
@@ -1035,7 +1035,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;
@@ -1148,11 +1148,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);
             }
         }
@@ -1188,12 +1188,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 @@ 
             $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()
@@ -1332,7 +1332,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1366,7 +1366,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1453,7 +1453,7 @@ 
     {
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
 
-        if (! defined($fetchModeConstant)) {
+        if ( ! defined($fetchModeConstant)) {
             throw Mapping\MappingException::invalidFetchMode($className, $fetchMode);
         }
 
@@ -1503,7 +1503,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1523,7 +1523,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1543,7 +1543,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/AnnotationDriver.php

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver;
 
@@ -186,7 +186,7 @@ 
             return $this->classNames;
         }
 
-        if (!$this->paths) {
+        if ( ! $this->paths) {
             throw Mapping\MappingException::pathRequired();
         }
 
@@ -203,7 +203,7 @@ 
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 \RecursiveRegexIterator::GET_MATCH
             );
 
@@ -255,7 +255,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());
@@ -291,7 +291,7 @@ 
                 $classMetadata
             );
 
-            if (! $property) {
+            if ( ! $property) {
                 continue;
             }
 
@@ -369,7 +369,7 @@ 
     )
     {
         /** @var Annotation\Entity $entityAnnot */
-        $entityAnnot  = $classAnnotations[Annotation\Entity::class];
+        $entityAnnot = $classAnnotations[Annotation\Entity::class];
 
         if ($entityAnnot->repositoryClass !== null) {
             $metadata->setCustomRepositoryClassName($entityAnnot->repositoryClass);
@@ -621,11 +621,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);
         }
 
@@ -685,7 +685,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);
         }
 
@@ -748,11 +748,11 @@ 
         $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);
         }
 
@@ -799,15 +799,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);
         }
 
@@ -858,15 +858,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);
         }
 
@@ -895,11 +895,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);
         }
 
@@ -940,11 +940,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);
         }
 
@@ -977,22 +977,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);
         }
 
@@ -1019,7 +1019,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;
@@ -1080,7 +1080,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;
@@ -1138,11 +1138,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);
             }
         }
@@ -1178,12 +1178,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.");
                 }
 
@@ -1279,7 +1279,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()
@@ -1321,7 +1321,7 @@ 
                 $fieldName = $associationOverride->name;
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -1355,7 +1355,7 @@ 
                 // Check for fetch
                 if ($associationOverride->fetch) {
                     $override->setFetchMode(
-                        constant(Mapping\FetchMode::class . '::' . $associationOverride->fetch)
+                        constant(Mapping\FetchMode::class.'::'.$associationOverride->fetch)
                     );
                 }
 
@@ -1492,7 +1492,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1512,7 +1512,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1532,7 +1532,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/NewAnnotationDriver.php

Spacing +31 added lines, -31 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver;
 
@@ -122,7 +122,7 @@ 
 
         $classNames = array_filter(
             $this->locator->getAllClassNames(null),
-            function ($className) {
+            function($className) {
                 return ! $this->isTransient($className);
             }
         );
@@ -210,7 +210,7 @@ 
     )
     {
         /** @var Annotation\Entity $entityAnnot */
-        $entityAnnot  = $classAnnotations[Annotation\Entity::class];
+        $entityAnnot = $classAnnotations[Annotation\Entity::class];
         $classMetadata = new Mapping\ClassMetadata($reflectionClass->getName(), $parent);
 
         if ($entityAnnot->repositoryClass !== null) {
@@ -274,12 +274,12 @@ 
             /** @var Annotation\NamedQueries $namedQueriesAnnot */
             $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.");
                 }
 
@@ -293,7 +293,7 @@ 
             $entityListenersAnnot = $classAnnotations[Annotation\EntityListeners::class];
 
             foreach ($entityListenersAnnot->value as $listenerClassName) {
-                if (! class_exists($listenerClassName)) {
+                if ( ! class_exists($listenerClassName)) {
                     throw Mapping\MappingException::entityListenerClassNotFound(
                         $listenerClassName,
                         $reflectionClass->getName()
@@ -340,15 +340,15 @@ 
 
                     $discriminatorColumn->setColumnName($discriminatorColumnAnnot->name);
 
-                    if (! empty($discriminatorColumnAnnot->columnDefinition)) {
+                    if ( ! empty($discriminatorColumnAnnot->columnDefinition)) {
                         $discriminatorColumn->setColumnDefinition($discriminatorColumnAnnot->columnDefinition);
                     }
 
-                    if (! empty($discriminatorColumnAnnot->type)) {
+                    if ( ! empty($discriminatorColumnAnnot->type)) {
                         $discriminatorColumn->setType(Type::getType($discriminatorColumnAnnot->type));
                     }
 
-                    if (! empty($discriminatorColumnAnnot->length)) {
+                    if ( ! empty($discriminatorColumnAnnot->length)) {
                         $discriminatorColumn->setLength($discriminatorColumnAnnot->length);
                     }
                 }
@@ -408,11 +408,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);
         }
 
@@ -500,7 +500,7 @@ 
     {
         $usage         = constant(sprintf('%s::%s', Mapping\CacheUsage::class, $cacheAnnot->usage));
         $baseRegion    = strtolower(str_replace('\\', '_', $metadata->getRootClassName()));
-        $defaultRegion = $baseRegion . ($fieldName ? '__' . $fieldName : '');
+        $defaultRegion = $baseRegion.($fieldName ? '__'.$fieldName : '');
 
         return new Mapping\CacheMetadata($usage, $cacheAnnot->region ?: $defaultRegion);
     }
@@ -622,11 +622,11 @@ 
             $fieldMetadata->setPrimaryKey(true);
         }
 
-        if (! empty($columnAnnot->columnDefinition)) {
+        if ( ! empty($columnAnnot->columnDefinition)) {
             $fieldMetadata->setColumnDefinition($columnAnnot->columnDefinition);
         }
 
-        if (! empty($columnAnnot->length)) {
+        if ( ! empty($columnAnnot->length)) {
             $fieldMetadata->setLength($columnAnnot->length);
         }
 
@@ -647,7 +647,7 @@ 
                     break;
 
                 default:
-                    if (! isset($customOptions['default'])) {
+                    if ( ! isset($customOptions['default'])) {
                         throw Mapping\MappingException::unsupportedOptimisticLockingType($fieldMetadata->getType());
                     }
             }
@@ -688,11 +688,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);
         }
 
@@ -771,7 +771,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);
         }
 
@@ -851,11 +851,11 @@ 
         $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);
         }
 
@@ -912,15 +912,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);
         }
 
@@ -976,11 +976,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);
         }
 
@@ -1036,11 +1036,11 @@ 
         $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);
         }
 
@@ -1098,7 +1098,7 @@ 
     {
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
 
-        if (! defined($fetchModeConstant)) {
+        if ( ! defined($fetchModeConstant)) {
             throw Mapping\MappingException::invalidFetchMode($className, $fetchMode);
         }
 
@@ -1142,7 +1142,7 @@ 
         $classAnnotations = $this->reader->getClassAnnotations($reflectionClass);
 
         foreach ($classAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1162,7 +1162,7 @@ 
         $propertyAnnotations = $this->reader->getPropertyAnnotations($reflectionProperty);
 
         foreach ($propertyAnnotations as $key => $annot) {
-            if (! is_numeric($key)) {
+            if ( ! is_numeric($key)) {
                 continue;
             }
 
@@ -1182,7 +1182,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 +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping\Driver;
 
@@ -473,7 +473,7 @@ 
 
                 if (isset($manyToOneElement['fetch'])) {
                     $association->setFetchMode(
-                        constant('Doctrine\ORM\Mapping\FetchMode::' . (string) $manyToOneElement['fetch'])
+                        constant('Doctrine\ORM\Mapping\FetchMode::'.(string) $manyToOneElement['fetch'])
                     );
                 }
 
@@ -625,7 +625,7 @@ 
                 $fieldName = (string) $overrideElement['name'];
                 $property  = $metadata->getProperty($fieldName);
 
-                if (! $property) {
+                if ( ! $property) {
                     throw Mapping\MappingException::invalidOverrideFieldName($metadata->getClassName(), $fieldName);
                 }
 
@@ -683,7 +683,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'])
                     );
                 }
 
@@ -694,7 +694,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);
@@ -706,7 +706,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()
@@ -881,7 +881,7 @@ 
     )
     {
         $baseRegion    = strtolower(str_replace('\\', '_', $metadata->getRootClassName()));
-        $defaultRegion = $baseRegion . ($fieldName ? '__' . $fieldName : '');
+        $defaultRegion = $baseRegion.($fieldName ? '__'.$fieldName : '');
 
         $region = (string) ($cacheMapping['region'] ?? $defaultRegion);
         $usage  = isset($cacheMapping['usage'])
@@ -912,7 +912,7 @@ 
             Events::preFlush,
         ];
 
-        return array_filter($events, function ($eventName) use ($method) {
+        return array_filter($events, function($eventName) use ($method) {
             return $eventName === $method->getName();
         });
     }

tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php

Indentation +7 added lines, -7 removed lines

@@ -87,10 +87,10 @@ 
  * @ORM\DiscriminatorMap({"parent" = CTIParent::class, "child" = CTIChild::class})
  */
 class CTIParent {
-   /**
-    * @ORM\Id @ORM\Column(type="integer")
-    * @ORM\GeneratedValue(strategy="AUTO")
-    */
+    /**
+     * @ORM\Id @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
     private $id;
 
     /** @ORM\OneToOne(targetEntity=CTIRelated::class, mappedBy="ctiParent") */
@@ -114,9 +114,9 @@ 
  * @ORM\Entity @ORM\Table(name="cti_children")
  */
 class CTIChild extends CTIParent {
-   /**
-    * @ORM\Column(type="string")
-    */
+    /**
+     * @ORM\Column(type="string")
+     */
     private $data;
 
     public function getData() {

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

Indentation +54 added lines, -54 removed lines

@@ -54,65 +54,65 @@
     /** @ORM\Column(type="string", nullable=false) */
     protected $name;
 
-	/** @ORM\Column(type="string", nullable=true) */
-	protected $description;
-
-	/**
-	 * @ORM\ManyToMany(targetEntity=DDC719Group::class, inversedBy="parents")
-	 * @ORM\JoinTable(name="groups_groups",
-	 * 		joinColumns={@ORM\JoinColumn(name="parent_id", referencedColumnName="id")},
-	 * 		inverseJoinColumns={@ORM\JoinColumn(name="child_id", referencedColumnName="id")}
-	 * )
-	 */
-	protected $children;
-
-	/**
-	 * @ORM\ManyToMany(targetEntity=DDC719Group::class, mappedBy="children")
-	 */
-	protected $parents;
-
-	/**
-	 * construct
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		$this->channels = new ArrayCollection();
-		$this->children = new ArrayCollection();
-		$this->parents = new ArrayCollection();
-	}
-
-	/**
-	 * adds group as new child
-	 *
-	 * @param Group $child
-	 */
-	public function addGroup(Group $child) {
+    /** @ORM\Column(type="string", nullable=true) */
+    protected $description;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=DDC719Group::class, inversedBy="parents")
+     * @ORM\JoinTable(name="groups_groups",
+     * 		joinColumns={@ORM\JoinColumn(name="parent_id", referencedColumnName="id")},
+     * 		inverseJoinColumns={@ORM\JoinColumn(name="child_id", referencedColumnName="id")}
+     * )
+     */
+    protected $children;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=DDC719Group::class, mappedBy="children")
+     */
+    protected $parents;
+
+    /**
+     * construct
+     */
+    public function __construct() {
+        parent::__construct();
+
+        $this->channels = new ArrayCollection();
+        $this->children = new ArrayCollection();
+        $this->parents = new ArrayCollection();
+    }
+
+    /**
+     * adds group as new child
+     *
+     * @param Group $child
+     */
+    public function addGroup(Group $child) {
         if ( ! $this->children->contains($child)) {
             $this->children->add($child);
             $child->addGroup($this);
         }
-	}
-
-	/**
-	 * adds channel as new child
-	 *
-	 * @param Channel $child
-	 */
-	public function addChannel(Channel $child) {
+    }
+
+    /**
+     * adds channel as new child
+     *
+     * @param Channel $child
+     */
+    public function addChannel(Channel $child) {
         if ( ! $this->channels->contains($child)) {
             $this->channels->add($child);
         }
-	}
-
-	/**
-	 * getter & setter
-	 */
-	public function getName() { return $this->name; }
-	public function setName($name) { $this->name = $name; }
-	public function getDescription() { return $this->description; }
-	public function setDescription($description) { $this->description = $description; }
-	public function getChildren() { return $this->children; }
-	public function getParents() { return $this->parents; }
-	public function getChannels() { return $this->channels; }
+    }
+
+    /**
+     * getter & setter
+     */
+    public function getName() { return $this->name; }
+    public function setName($name) { $this->name = $name; }
+    public function getDescription() { return $this->description; }
+    public function setDescription($description) { $this->description = $description; }
+    public function getChildren() { return $this->children; }
+    public function getParents() { return $this->parents; }
+    public function getChannels() { return $this->channels; }
 }

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

Indentation +51 added lines, -51 removed lines

@@ -27,8 +27,8 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('p', 'r')
-		   ->from(__NAMESPACE__ .  '\DDC698Privilege', 'p')
-		   ->leftJoin('p.roles', 'r');
+            ->from(__NAMESPACE__ .  '\DDC698Privilege', 'p')
+            ->leftJoin('p.roles', 'r');
 
         self::assertSQLEquals(
             'SELECT t0."privilegeID" AS c0, t0."name" AS c1, t1."roleID" AS c2, t1."name" AS c3, t1."shortName" AS c4 FROM "Privileges" t0 LEFT JOIN "RolePrivileges" t2 ON t0."privilegeID" = t2."privilegeID" LEFT JOIN "Roles" t1 ON t1."roleID" = t2."roleID"',
@@ -44,37 +44,37 @@ 
  */
 class DDC698Role
 {
-	/**
-	 *  @ORM\Id @ORM\Column(name="roleID", type="integer")
-	 *  @ORM\GeneratedValue(strategy="AUTO")
-	 *
-	 */
-	protected $roleID;
-
-	/**
-	 * @ORM\Column(name="name", type="string", length=45)
-	 *
-	 *
-	 */
-	protected $name;
-
-	/**
-	 * @ORM\Column(name="shortName", type="string", length=45)
-	 *
-	 *
-	 */
-	protected $shortName;
-
-
-
-	/**
-	 * @ORM\ManyToMany(targetEntity=DDC698Privilege::class, inversedBy="roles")
-	 * @ORM\JoinTable(name="RolePrivileges",
-	 *     joinColumns={@ORM\JoinColumn(name="roleID", referencedColumnName="roleID")},
-	 *     inverseJoinColumns={@ORM\JoinColumn(name="privilegeID", referencedColumnName="privilegeID")}
-	 * )
-	 */
-	protected $privilege;
+    /**
+     *  @ORM\Id @ORM\Column(name="roleID", type="integer")
+     *  @ORM\GeneratedValue(strategy="AUTO")
+     *
+     */
+    protected $roleID;
+
+    /**
+     * @ORM\Column(name="name", type="string", length=45)
+     *
+     *
+     */
+    protected $name;
+
+    /**
+     * @ORM\Column(name="shortName", type="string", length=45)
+     *
+     *
+     */
+    protected $shortName;
+
+
+
+    /**
+     * @ORM\ManyToMany(targetEntity=DDC698Privilege::class, inversedBy="roles")
+     * @ORM\JoinTable(name="RolePrivileges",
+     *     joinColumns={@ORM\JoinColumn(name="roleID", referencedColumnName="roleID")},
+     *     inverseJoinColumns={@ORM\JoinColumn(name="privilegeID", referencedColumnName="privilegeID")}
+     * )
+     */
+    protected $privilege;
 
 }
 
@@ -86,22 +86,22 @@ 
  */
 class DDC698Privilege
 {
-	/**
-	 *  @ORM\Id  @ORM\Column(name="privilegeID", type="integer")
-	 *  @ORM\GeneratedValue(strategy="AUTO")
-	 *
-	 */
-	protected $privilegeID;
-
-	/**
-	 * @ORM\Column(name="name", type="string", length=45)
-	 *
-	 *
-	 */
-	protected $name;
-
-	/**
-	 * @ORM\ManyToMany(targetEntity=DDC698Role::class, mappedBy="privilege")
-	 */
-	protected $roles;
+    /**
+     *  @ORM\Id  @ORM\Column(name="privilegeID", type="integer")
+     *  @ORM\GeneratedValue(strategy="AUTO")
+     *
+     */
+    protected $privilegeID;
+
+    /**
+     * @ORM\Column(name="name", type="string", length=45)
+     *
+     *
+     */
+    protected $name;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=DDC698Role::class, mappedBy="privilege")
+     */
+    protected $roles;
 }