DX: nullable_type_declaration

keradus · nicolas-grekas · commit 6aff9d95782f · 2023-10-19T16:54:14.000+02:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -37,6 +37,7 @@
         'header_comment' => ['header' => $fileHeaderComment],
         'modernize_strpos' => true,
         'get_class_to_class_keyword' => true,
+        'nullable_type_declaration' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php b/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php
@@ -29,7 +29,7 @@ public function __construct(
         public ?bool $autowire = null,
         public ?array $properties = null,
         public array|string|null $configurator = null,
-        public string|null $constructor = null,
+        public ?string $constructor = null,
     ) {
     }
 }
diff --git a/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php b/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php
@@ -30,7 +30,7 @@
 final class DotenvDumpCommand extends Command
 {
     private string $projectDir;
-    private string|null $defaultEnv;
+    private ?string $defaultEnv;
 
     public function __construct(string $projectDir, string $defaultEnv = null)
     {
diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
@@ -32,7 +32,7 @@ class OrderedHashMapIterator implements \Iterator
     private int $cursorId;
     /** @var array<int, int> */
     private array $managedCursors;
-    private string|null $key = null;
+    private ?string $key = null;
     /** @var TValue|null */
     private mixed $current = null;
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Novu/NovuOptions.php b/src/Symfony/Component/Notifier/Bridge/Novu/NovuOptions.php
@@ -19,13 +19,13 @@
 class NovuOptions implements MessageOptionsInterface
 {
     public function __construct(
-        private readonly string|null $subscriberId = null,
-        private readonly string|null $firstName = null,
-        private readonly string|null $lastName = null,
-        private readonly string|null $email = null,
-        private readonly string|null $phone = null,
-        private readonly string|null $avatar = null,
-        private readonly string|null $locale = null,
+        private readonly ?string $subscriberId = null,
+        private readonly ?string $firstName = null,
+        private readonly ?string $lastName = null,
+        private readonly ?string $email = null,
+        private readonly ?string $phone = null,
+        private readonly ?string $avatar = null,
+        private readonly ?string $locale = null,
         private readonly array $options = [],
     ) {
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Novu/NovuSubscriberRecipient.php b/src/Symfony/Component/Notifier/Bridge/Novu/NovuSubscriberRecipient.php
@@ -20,12 +20,12 @@ class NovuSubscriberRecipient implements RecipientInterface
 {
     public function __construct(
         private readonly string $subscriberId,
-        private readonly string|null $firstName = null,
-        private readonly string|null $lastName = null,
-        private readonly string|null $email = null,
-        private readonly string|null $phone = null,
-        private readonly string|null $avatar = null,
-        private readonly string|null $locale = null,
+        private readonly ?string $firstName = null,
+        private readonly ?string $lastName = null,
+        private readonly ?string $email = null,
+        private readonly ?string $phone = null,
+        private readonly ?string $avatar = null,
+        private readonly ?string $locale = null,
     ) {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(`
`29`	`29`	`public ?bool $autowire = null,`
`30`	`30`	`public ?array $properties = null,`
`31`	`31`	`public array\|string\|null $configurator = null,`
`32`		`- public string\|null $constructor = null,`
	`32`	`+ public ?string $constructor = null,`
`33`	`33`	`) {`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`final class DotenvDumpCommand extends Command`
`31`	`31`	`{`
`32`	`32`	`private string $projectDir;`
`33`		`- private string\|null $defaultEnv;`
	`33`	`+ private ?string $defaultEnv;`
`34`	`34`
`35`	`35`	`public function __construct(string $projectDir, string $defaultEnv = null)`
`36`	`36`	`{`