CS: Use question mark instead of |null in non-union type

phpcs.xml.dist

@@ -16,7 +16,11 @@
     <file>tests/BundleTest.php</file>
     <file>tests/Maker</file>
 
-    <rule ref="Doctrine" />
+    <rule ref="Doctrine">
+        <!-- Allow short nullable syntax for non-union types -->
+        <exclude name="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable" />
+        <exclude name="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat.DisallowedShortNullable" />
+    </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint" />
     <rule ref="PSR2.Classes.PropertyDeclaration.ScopeMissing" />
 

src/Maker/MakeDocument.php

@@ -50,8 +50,8 @@ final class MakeDocument extends AbstractMaker implements InputAwareMakerInterfa
     public function __construct(
         private FileManager $fileManager,
         private MongoDBHelper $mongoDBHelper,
-        private Generator|null $generator = null,
-        private DocumentClassGenerator|null $documentClassGenerator = null,
+        private ?Generator $generator = null,
+        private ?DocumentClassGenerator $documentClassGenerator = null,
     ) {
         $this->generator              ??= new Generator($fileManager, 'App\\');
         $this->documentClassGenerator ??= new DocumentClassGenerator($this->generator, $this->mongoDBHelper);
@@ -176,7 +176,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         ]);
     }
 
-    public function configureDependencies(DependencyBuilder $dependencies, InputInterface|null $input = null): void
+    public function configureDependencies(DependencyBuilder $dependencies, ?InputInterface $input = null): void
     {
         $dependencies->addClassDependency(
             DoctrineMongoDBBundle::class,
@@ -185,7 +185,7 @@ public function configureDependencies(DependencyBuilder $dependencies, InputInte
     }
 
     /** @param string[] $fields */
-    private function askForNextField(ConsoleStyle $io, array $fields, string $documentClass, bool $isFirstField): ClassProperty|null
+    private function askForNextField(ConsoleStyle $io, array $fields, string $documentClass, bool $isFirstField): ?ClassProperty
     {
         $io->writeln('');
 

src/MongoDB/Validator.php

@@ -16,7 +16,7 @@ final class Validator
     /**
      * Validates that a value is not blank.
      */
-    public static function notBlank(string|null $value = null): string
+    public static function notBlank(?string $value = null): string
     {
         if ($value === null || $value === '') {
             throw new RuntimeCommandException('This value cannot be blank.');

tests/MongoDB/ValidatorTest.php

@@ -30,15 +30,15 @@ public static function validNotBlankProvider(): Generator
     }
 
     #[DataProvider('invalidNotBlankProvider')]
-    public function testNotBlankWithInvalidValue(string|null $value): void
+    public function testNotBlankWithInvalidValue(?string $value): void
     {
         $this->expectException(RuntimeCommandException::class);
         $this->expectExceptionMessage('This value cannot be blank.');
 
         Validator::notBlank($value);
     }
 
-    /** @return Generator<string, array{0: string|null}> */
+    /** @return Generator<string, array{0: ?string}> */
     public static function invalidNotBlankProvider(): Generator
     {
         yield 'null' => [null];
@@ -76,7 +76,7 @@ public function testValidateFieldNameWithEmptyValue(string $fieldName): void
         Validator::validateFieldName($fieldName);
     }
 
-    /** @return Generator<string, array{0: string|null}> */
+    /** @return Generator<string, array{0: ?string}> */
     public static function emptyFieldNameProvider(): Generator
     {
         yield 'empty string' => [''];

tests/fixtures/make-document/documents/User-basic.php

@@ -10,8 +10,8 @@
 class User
 {
     #[ODM\Id]
-    public int|null $id = null;
+    public ?int $id = null;
 
     #[ODM\Field]
-    public string|null $firstName = null;
+    public ?string $firstName = null;
 }