Configure "nullable_type_declaration_for_default_null_value" CS rule

phansys · franmomu · commit f21d8880246c · 2023-07-25T08:18:42.000+02:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -51,6 +51,7 @@
         'no_superfluous_elseif' => true,
         'no_unset_on_property' => true,
         'no_useless_else' => true,
+        'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
         'ordered_class_elements' => true,
         'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'phpdoc_summary' => false,
diff --git a/src/DoctrineExtensions.php b/src/DoctrineExtensions.php
@@ -34,7 +34,7 @@ final class DoctrineExtensions
      * Hooks all extension metadata mapping drivers into
      * the given driver chain of drivers for the ORM.
      */
-    public static function registerMappingIntoDriverChainORM(MappingDriverChain $driverChain, Reader $reader = null): void
+    public static function registerMappingIntoDriverChainORM(MappingDriverChain $driverChain, ?Reader $reader = null): void
     {
         if (!$reader) {
             $reader = self::createAnnotationReader();
@@ -51,7 +51,7 @@ public static function registerMappingIntoDriverChainORM(MappingDriverChain $dri
      * Hooks only superclass extension metadata mapping drivers into
      * the given driver chain of drivers for the ORM.
      */
-    public static function registerAbstractMappingIntoDriverChainORM(MappingDriverChain $driverChain, Reader $reader = null): void
+    public static function registerAbstractMappingIntoDriverChainORM(MappingDriverChain $driverChain, ?Reader $reader = null): void
     {
         if (!$reader) {
             $reader = self::createAnnotationReader();
@@ -68,7 +68,7 @@ public static function registerAbstractMappingIntoDriverChainORM(MappingDriverCh
      * Hooks all extension metadata mapping drivers into
      * the given driver chain of drivers for the MongoDB ODM.
      */
-    public static function registerMappingIntoDriverChainMongodbODM(MappingDriverChain $driverChain, Reader $reader = null): void
+    public static function registerMappingIntoDriverChainMongodbODM(MappingDriverChain $driverChain, ?Reader $reader = null): void
     {
         if (!$reader) {
             $reader = self::createAnnotationReader();
@@ -84,7 +84,7 @@ public static function registerMappingIntoDriverChainMongodbODM(MappingDriverCha
      * Hooks only superclass extension metadata mapping drivers into
      * the given driver chain of drivers for the MongoDB ODM.
      */
-    public static function registerAbstractMappingIntoDriverChainMongodbODM(MappingDriverChain $driverChain, Reader $reader = null): void
+    public static function registerAbstractMappingIntoDriverChainMongodbODM(MappingDriverChain $driverChain, ?Reader $reader = null): void
     {
         if (!$reader) {
             $reader = self::createAnnotationReader();
diff --git a/src/SoftDeleteable/Traits/SoftDeleteable.php b/src/SoftDeleteable/Traits/SoftDeleteable.php
@@ -29,7 +29,7 @@ trait SoftDeleteable
      *
      * @return self
      */
-    public function setDeletedAt(DateTime $deletedAt = null)
+    public function setDeletedAt(?DateTime $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;
 
diff --git a/src/SoftDeleteable/Traits/SoftDeleteableDocument.php b/src/SoftDeleteable/Traits/SoftDeleteableDocument.php
@@ -34,7 +34,7 @@ trait SoftDeleteableDocument
      *
      * @return self
      */
-    public function setDeletedAt(DateTime $deletedAt = null)
+    public function setDeletedAt(?DateTime $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;
 
diff --git a/src/SoftDeleteable/Traits/SoftDeleteableEntity.php b/src/SoftDeleteable/Traits/SoftDeleteableEntity.php
@@ -34,7 +34,7 @@ trait SoftDeleteableEntity
      *
      * @return self
      */
-    public function setDeletedAt(DateTime $deletedAt = null)
+    public function setDeletedAt(?DateTime $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;
 
diff --git a/src/Tool/Logging/DBAL/QueryAnalyzer.php b/src/Tool/Logging/DBAL/QueryAnalyzer.php
@@ -71,7 +71,7 @@ public function __construct(AbstractPlatform $platform)
     /**
      * @return void
      */
-    public function startQuery($sql, array $params = null, array $types = null)
+    public function startQuery($sql, ?array $params = null, ?array $types = null)
     {
         $this->queryStartTime = microtime(true);
         $this->queries[] = $this->generateSql($sql, $params, $types);
diff --git a/src/Tree/Traits/MaterializedPath.php b/src/Tree/Traits/MaterializedPath.php
@@ -45,7 +45,7 @@ trait MaterializedPath
      *
      * @return self
      */
-    public function setParent(self $parent = null)
+    public function setParent(?self $parent = null)
     {
         $this->parent = $parent;
 
diff --git a/src/Uploadable/UploadableListener.php b/src/Uploadable/UploadableListener.php
@@ -90,7 +90,7 @@ class UploadableListener extends MappedEventSubscriber
      */
     private $fileInfoObjects = [];
 
-    public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)
+    public function __construct(?MimeTypeGuesserInterface $mimeTypeGuesser = null)
     {
         parent::__construct();
 
diff --git a/tests/Gedmo/Sluggable/Fixture/Document/Handler/RelativeSlug.php b/tests/Gedmo/Sluggable/Fixture/Document/Handler/RelativeSlug.php
@@ -63,7 +63,7 @@ class RelativeSlug
     #[ODM\ReferenceOne(targetDocument: Article::class)]
     private $article;
 
-    public function setArticle(Article $article = null): void
+    public function setArticle(?Article $article = null): void
     {
         $this->article = $article;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Document/Handler/TreeSlug.php b/tests/Gedmo/Sluggable/Fixture/Document/Handler/TreeSlug.php
@@ -62,7 +62,7 @@ class TreeSlug
     #[ODM\ReferenceOne(targetDocument: self::class)]
     private $parent;
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/ArticleRelativeSlug.php b/tests/Gedmo/Sluggable/Fixture/Handler/ArticleRelativeSlug.php
@@ -67,7 +67,7 @@ class ArticleRelativeSlug
     #[ORM\ManyToOne(targetEntity: Article::class)]
     private $article;
 
-    public function setArticle(Article $article = null): void
+    public function setArticle(?Article $article = null): void
     {
         $this->article = $article;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/People/Occupation.php b/tests/Gedmo/Sluggable/Fixture/Handler/People/Occupation.php
@@ -132,7 +132,7 @@ public function __construct()
         $this->children = new ArrayCollection();
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/People/Person.php b/tests/Gedmo/Sluggable/Fixture/Handler/People/Person.php
@@ -67,7 +67,7 @@ class Person
     #[ORM\ManyToOne(targetEntity: Occupation::class)]
     private $occupation;
 
-    public function setOccupation(Occupation $occupation = null): void
+    public function setOccupation(?Occupation $occupation = null): void
     {
         $this->occupation = $occupation;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/TreeSlug.php b/tests/Gedmo/Sluggable/Fixture/Handler/TreeSlug.php
@@ -131,7 +131,7 @@ public function __construct()
         $this->children = new ArrayCollection();
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/TreeSlugPrefixSuffix.php b/tests/Gedmo/Sluggable/Fixture/Handler/TreeSlugPrefixSuffix.php
@@ -127,7 +127,7 @@ public function __construct()
         $this->children = new ArrayCollection();
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Sluggable/Fixture/Handler/User.php b/tests/Gedmo/Sluggable/Fixture/Handler/User.php
@@ -67,7 +67,7 @@ class User
     #[ORM\ManyToOne(targetEntity: Company::class)]
     private $company;
 
-    public function setCompany(Company $company = null): void
+    public function setCompany(?Company $company = null): void
     {
         $this->company = $company;
     }
diff --git a/tests/Gedmo/Sortable/Fixture/Item.php b/tests/Gedmo/Sortable/Fixture/Item.php
@@ -87,7 +87,7 @@ public function getPosition(): ?int
         return $this->position;
     }
 
-    public function setCategory(Category $category = null): void
+    public function setCategory(?Category $category = null): void
     {
         $this->category = $category;
     }
diff --git a/tests/Gedmo/Tool/BaseTestCaseMongoODM.php b/tests/Gedmo/Tool/BaseTestCaseMongoODM.php
@@ -74,7 +74,7 @@ protected function getMockDocumentManager(?EventManager $evm = null, ?Configurat
         return $this->dm = DocumentManager::create($client, $config, $evm);
     }
 
-    protected function getDefaultDocumentManager(EventManager $evm = null): DocumentManager
+    protected function getDefaultDocumentManager(?EventManager $evm = null): DocumentManager
     {
         return $this->getMockDocumentManager($evm, $this->getDefaultConfiguration());
     }
@@ -83,7 +83,7 @@ protected function getDefaultDocumentManager(EventManager $evm = null): Document
      * DocumentManager mock object with
      * annotation mapping driver
      */
-    protected function getMockMappedDocumentManager(EventManager $evm = null, Configuration $config = null): DocumentManager
+    protected function getMockMappedDocumentManager(?EventManager $evm = null, ?Configuration $config = null): DocumentManager
     {
         $conn = $this->createStub(Client::class);
 
diff --git a/tests/Gedmo/Tool/BaseTestCaseOM.php b/tests/Gedmo/Tool/BaseTestCaseOM.php
@@ -93,7 +93,7 @@ public function getORMDriver(array $paths = []): MappingDriver
      * DocumentManager mock object together with
      * annotation mapping driver and database
      */
-    protected function getMockDocumentManager(string $dbName, MappingDriver $mappingDriver = null): DocumentManager
+    protected function getMockDocumentManager(string $dbName, ?MappingDriver $mappingDriver = null): DocumentManager
     {
         if (!extension_loaded('mongodb')) {
             static::markTestSkipped('Missing Mongo extension.');
@@ -110,7 +110,7 @@ protected function getMockDocumentManager(string $dbName, MappingDriver $mapping
      * annotation mapping driver and pdo_sqlite
      * database in memory
      */
-    protected function getDefaultMockSqliteEntityManager(array $fixtures, MappingDriver $mappingDriver = null): EntityManager
+    protected function getDefaultMockSqliteEntityManager(array $fixtures, ?MappingDriver $mappingDriver = null): EntityManager
     {
         $conn = [
             'driver' => 'pdo_sqlite',
@@ -153,7 +153,7 @@ private function getEventManager(): EventManager
     /**
      * Get annotation mapping configuration
      */
-    private function getMockODMMongoDBConfig(string $dbName, MappingDriver $mappingDriver = null): Configuration
+    private function getMockODMMongoDBConfig(string $dbName, ?MappingDriver $mappingDriver = null): Configuration
     {
         if (null === $mappingDriver) {
             $mappingDriver = $this->getMongoDBDriver();
@@ -176,7 +176,7 @@ private function getMockODMMongoDBConfig(string $dbName, MappingDriver $mappingD
     /**
      * Get annotation mapping configuration for ORM
      */
-    private function getMockORMConfig(MappingDriver $mappingDriver = null): \Doctrine\ORM\Configuration
+    private function getMockORMConfig(?MappingDriver $mappingDriver = null): \Doctrine\ORM\Configuration
     {
         $config = new \Doctrine\ORM\Configuration();
         $config->setProxyDir(TESTS_TEMP_DIR);
diff --git a/tests/Gedmo/Tool/BaseTestCaseORM.php b/tests/Gedmo/Tool/BaseTestCaseORM.php
@@ -65,7 +65,7 @@ protected function setUp(): void
      * annotation mapping driver and pdo_sqlite
      * database in memory
      */
-    protected function getDefaultMockSqliteEntityManager(EventManager $evm = null, Configuration $config = null): EntityManager
+    protected function getDefaultMockSqliteEntityManager(?EventManager $evm = null, ?Configuration $config = null): EntityManager
     {
         $conn = [
             'driver' => 'pdo_sqlite',
diff --git a/tests/Gedmo/Tool/QueryAnalyzer.php b/tests/Gedmo/Tool/QueryAnalyzer.php
@@ -39,7 +39,7 @@ public function __construct(AbstractPlatform $platform)
         $this->platform = $platform;
     }
 
-    public function startQuery($sql, array $params = null, array $types = null): void
+    public function startQuery($sql, ?array $params = null, ?array $types = null): void
     {
         $this->queries[] = $this->generateSql($sql, $params, $types);
     }
diff --git a/tests/Gedmo/Translator/Fixture/PersonCustom.php b/tests/Gedmo/Translator/Fixture/PersonCustom.php
@@ -92,7 +92,7 @@ public function getDescription(): ?string
     /**
      * @return self|CustomProxy
      */
-    public function translate(string $locale = null)
+    public function translate(?string $locale = null)
     {
         if (null === $locale) {
             return $this;
diff --git a/tests/Gedmo/Tree/Fixture/ANode.php b/tests/Gedmo/Tree/Fixture/ANode.php
@@ -70,7 +70,7 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function setParent(BaseNode $parent = null): void
+    public function setParent(?BaseNode $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Closure/Category.php b/tests/Gedmo/Tree/Fixture/Closure/Category.php
@@ -95,7 +95,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Closure/CategoryWithoutLevel.php b/tests/Gedmo/Tree/Fixture/Closure/CategoryWithoutLevel.php
@@ -85,7 +85,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Closure/Person.php b/tests/Gedmo/Tree/Fixture/Closure/Person.php
@@ -101,7 +101,7 @@ public function getName(): ?string
         return $this->name;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Document/Article.php b/tests/Gedmo/Tree/Fixture/Document/Article.php
@@ -97,7 +97,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Document/Category.php b/tests/Gedmo/Tree/Fixture/Document/Category.php
@@ -87,7 +87,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/ForeignRootCategory.php b/tests/Gedmo/Tree/Fixture/ForeignRootCategory.php
@@ -128,7 +128,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/Issue2408/Category.php b/tests/Gedmo/Tree/Fixture/Issue2408/Category.php
@@ -131,7 +131,7 @@ public function getRoot(): ?self
         return $this->root;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/MPCategory.php b/tests/Gedmo/Tree/Fixture/MPCategory.php
@@ -129,7 +129,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parentId = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/MPCategoryWithRootAssociation.php b/tests/Gedmo/Tree/Fixture/MPCategoryWithRootAssociation.php
@@ -133,7 +133,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parentId = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php b/tests/Gedmo/Tree/Fixture/MPCategoryWithTrimmedSeparator.php
@@ -110,7 +110,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parentId = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/MPFeaturesCategory.php b/tests/Gedmo/Tree/Fixture/MPFeaturesCategory.php
@@ -139,7 +139,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parentId = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/RootAssociationCategory.php b/tests/Gedmo/Tree/Fixture/RootAssociationCategory.php
@@ -125,7 +125,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/Fixture/RootCategory.php b/tests/Gedmo/Tree/Fixture/RootCategory.php
@@ -127,7 +127,7 @@ public function getTitle(): ?string
         return $this->title;
     }
 
-    public function setParent(self $parent = null): void
+    public function setParent(?self $parent = null): void
     {
         $this->parent = $parent;
     }
diff --git a/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php b/tests/Gedmo/Tree/MaterializedPathORMRepositoryTest.php
@@ -388,7 +388,7 @@ protected function getUsedEntityFixtures(): array
     /**
      * @phpstan-param class-string|null $class
      */
-    private function populate(string $class = null): void
+    private function populate(?string $class = null): void
     {
         $root = $this->createCategory($class);
         $root->setTitle('Food');

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ trait SoftDeleteable`
`29`	`29`	`*`
`30`	`30`	`* @return self`
`31`	`31`	`*/`
`32`		`- public function setDeletedAt(DateTime $deletedAt = null)`
	`32`	`+ public function setDeletedAt(?DateTime $deletedAt = null)`
`33`	`33`	`{`
`34`	`34`	`$this->deletedAt = $deletedAt;`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ trait SoftDeleteableDocument`
`34`	`34`	`*`
`35`	`35`	`* @return self`
`36`	`36`	`*/`
`37`		`- public function setDeletedAt(DateTime $deletedAt = null)`
	`37`	`+ public function setDeletedAt(?DateTime $deletedAt = null)`
`38`	`38`	`{`
`39`	`39`	`$this->deletedAt = $deletedAt;`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ trait SoftDeleteableEntity`
`34`	`34`	`*`
`35`	`35`	`* @return self`
`36`	`36`	`*/`
`37`		`- public function setDeletedAt(DateTime $deletedAt = null)`
	`37`	`+ public function setDeletedAt(?DateTime $deletedAt = null)`
`38`	`38`	`{`
`39`	`39`	`$this->deletedAt = $deletedAt;`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __construct(AbstractPlatform $platform)`
`71`	`71`	`/**`
`72`	`72`	`* @return void`
`73`	`73`	`*/`
`74`		`- public function startQuery($sql, array $params = null, array $types = null)`
	`74`	`+ public function startQuery($sql, ?array $params = null, ?array $types = null)`
`75`	`75`	`{`
`76`	`76`	`$this->queryStartTime = microtime(true);`
`77`	`77`	`$this->queries[] = $this->generateSql($sql, $params, $types);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ trait MaterializedPath`
`45`	`45`	`*`
`46`	`46`	`* @return self`
`47`	`47`	`*/`
`48`		`- public function setParent(self $parent = null)`
	`48`	`+ public function setParent(?self $parent = null)`
`49`	`49`	`{`
`50`	`50`	`$this->parent = $parent;`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class UploadableListener extends MappedEventSubscriber`
`90`	`90`	`*/`
`91`	`91`	`private $fileInfoObjects = [];`
`92`	`92`
`93`		`- public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)`
	`93`	`+ public function __construct(?MimeTypeGuesserInterface $mimeTypeGuesser = null)`
`94`	`94`	`{`
`95`	`95`	`parent::__construct();`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class RelativeSlug`
`63`	`63`	`#[ODM\ReferenceOne(targetDocument: Article::class)]`
`64`	`64`	`private $article;`
`65`	`65`
`66`		`- public function setArticle(Article $article = null): void`
	`66`	`+ public function setArticle(?Article $article = null): void`
`67`	`67`	`{`
`68`	`68`	`$this->article = $article;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class TreeSlug`
`62`	`62`	`#[ODM\ReferenceOne(targetDocument: self::class)]`
`63`	`63`	`private $parent;`
`64`	`64`
`65`		`- public function setParent(self $parent = null): void`
	`65`	`+ public function setParent(?self $parent = null): void`
`66`	`66`	`{`
`67`	`67`	`$this->parent = $parent;`
`68`	`68`	`}`