minor symfony#54426 stop marking parameters implicitly as nullable (xabbuh)

xabbuh · xabbuh · commit 33f4d2a4fd82 · 2024-03-28T10:17:41.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- stop marking parameters implicitly as nullable | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- e44545a stop marking parameters implicitly as nullable
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Tests/Fixtures/ServerRequest.php b/src/Symfony/Bridge/PsrHttpMessage/Tests/Fixtures/ServerRequest.php
@@ -26,10 +26,10 @@ class ServerRequest extends Message implements ServerRequestInterface
     public function __construct(
         string $version = '1.1',
         array $headers = [],
-        StreamInterface $body = null,
+        ?StreamInterface $body = null,
         private readonly string $requestTarget = '/',
         private readonly string $method = 'GET',
-        UriInterface|string $uri = null,
+        UriInterface|string|null $uri = null,
         private readonly array $server = [],
         private readonly array $cookies = [],
         private readonly array $query = [],
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -26,7 +26,7 @@ interface DumperInterface
      * @param bool|null   &$asGhostObject Set to true after the call if the proxy is a ghost object
      * @param string|null $id
      */
-    public function isProxyCandidate(Definition $definition/* , bool &$asGhostObject = null, string $id = null */): bool;
+    public function isProxyCandidate(Definition $definition/* , ?bool &$asGhostObject = null, ?string $id = null */): bool;
 
     /**
      * Generates the code to be used to instantiate a proxy in the dumped factory code.
@@ -38,5 +38,5 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
      *
      * @param string|null $id
      */
-    public function getProxyCode(Definition $definition/* , string $id = null */): string;
+    public function getProxyCode(Definition $definition/* , ?string $id = null */): string;
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -30,7 +30,7 @@ class Foo
     public static int $counter = 0;
 
     #[Required]
-    public function cloneFoo(\stdClass $bar = null): static
+    public function cloneFoo(?\stdClass $bar = null): static
     {
         ++self::$counter;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -107,7 +107,7 @@ public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterf
 #[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
 class AsDecoratorBaz implements AsDecoratorInterface
 {
-    public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)
+    public function __construct(#[AutowireDecorated] ?AsDecoratorInterface $inner = null)
     {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -83,7 +83,7 @@ public function callPassed()
 
 class DummyProxyDumper implements DumperInterface
 {
-    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
+    public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool
     {
         $asGhostObject = false;
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/TranslatableTextAlign.php b/src/Symfony/Component/Form/Tests/Fixtures/TranslatableTextAlign.php
@@ -20,7 +20,7 @@ enum TranslatableTextAlign implements TranslatableInterface
     case Center;
     case Right;
 
-    public function trans(TranslatorInterface $translator, string $locale = null): string
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string
     {
         return $translator->trans($this->name, locale: $locale);
     }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -80,7 +80,7 @@ public function testEmptyParamAnnotation()
     /**
      * @dataProvider typesWithNoPrefixesProvider
      */
-    public function testExtractTypesWithNoPrefixes($property, array $type = null)
+    public function testExtractTypesWithNoPrefixes($property, ?array $type = null)
     {
         $noPrefixExtractor = new PhpDocExtractor(null, [], [], []);
 
@@ -202,7 +202,7 @@ public static function provideCollectionTypes()
     /**
      * @dataProvider typesWithCustomPrefixesProvider
      */
-    public function testExtractTypesWithCustomPrefixes($property, array $type = null)
+    public function testExtractTypesWithCustomPrefixes($property, ?array $type = null)
     {
         $customExtractor = new PhpDocExtractor(null, ['add', 'remove'], ['is', 'can']);
 
@@ -401,7 +401,7 @@ public function testUnknownPseudoType()
     /**
      * @dataProvider constructorTypesProvider
      */
-    public function testExtractConstructorTypes($property, array $type = null)
+    public function testExtractConstructorTypes($property, ?array $type = null)
     {
         $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property));
     }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -44,7 +44,7 @@ protected function setUp(): void
     /**
      * @dataProvider typesProvider
      */
-    public function testExtract($property, array $type = null)
+    public function testExtract($property, ?array $type = null)
     {
         $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property));
     }
@@ -75,7 +75,7 @@ public function testInvalid($property)
     /**
      * @dataProvider typesWithNoPrefixesProvider
      */
-    public function testExtractTypesWithNoPrefixes($property, array $type = null)
+    public function testExtractTypesWithNoPrefixes($property, ?array $type = null)
     {
         $noPrefixExtractor = new PhpStanExtractor([], [], []);
 
@@ -130,7 +130,7 @@ public static function typesProvider()
     /**
      * @dataProvider provideCollectionTypes
      */
-    public function testExtractCollection($property, array $type = null)
+    public function testExtractCollection($property, ?array $type = null)
     {
         $this->testExtract($property, $type);
     }
@@ -186,7 +186,7 @@ public static function provideCollectionTypes()
     /**
      * @dataProvider typesWithCustomPrefixesProvider
      */
-    public function testExtractTypesWithCustomPrefixes($property, array $type = null)
+    public function testExtractTypesWithCustomPrefixes($property, ?array $type = null)
     {
         $customExtractor = new PhpStanExtractor(['add', 'remove'], ['is', 'can']);
 
@@ -344,7 +344,7 @@ public static function propertiesParentTypeProvider(): array
     /**
      * @dataProvider constructorTypesProvider
      */
-    public function testExtractConstructorTypes($property, array $type = null)
+    public function testExtractConstructorTypes($property, ?array $type = null)
     {
         $this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property));
     }
@@ -459,7 +459,7 @@ public static function intRangeTypeProvider(): array
     /**
      * @dataProvider php80TypesProvider
      */
-    public function testExtractPhp80Type(string $class, $property, array $type = null)
+    public function testExtractPhp80Type(string $class, $property, ?array $type = null)
     {
         $this->assertEquals($type, $this->extractor->getTypes($class, $property, []));
     }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/TraceableAttributeClassLoader.php b/src/Symfony/Component/Routing/Tests/Fixtures/TraceableAttributeClassLoader.php
@@ -20,7 +20,7 @@ final class TraceableAttributeClassLoader extends AttributeClassLoader
     /** @var list<string> */
     public array $foundClasses = [];
 
-    public function load(mixed $class, string $type = null): RouteCollection
+    public function load(mixed $class, ?string $type = null): RouteCollection
     {
         if (!is_string($class)) {
             throw new \InvalidArgumentException(sprintf('Expected string, got "%s"', get_debug_type($class)));
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/FooInterfaceDummyDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/FooInterfaceDummyDenormalizer.php
@@ -15,7 +15,7 @@
 
 final class FooInterfaceDummyDenormalizer implements DenormalizerInterface
 {
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): array
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): array
     {
         $result = [];
         foreach ($data as $foo) {
@@ -27,7 +27,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return $result;
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         if (str_ends_with($type, '[]')) {
             $className = substr($type, 0, -2);
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php
@@ -15,7 +15,7 @@
 
 class FormatAndContextAwareNormalizer extends ObjectNormalizer
 {
-    protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool
+    protected function isAllowedAttribute($classOrObject, string $attribute, ?string $format = null, array $context = []): bool
     {
         return \in_array($attribute, ['foo', 'bar']) && 'foo_and_bar_included' === $format;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php
@@ -23,17 +23,17 @@ public function getSupportedTypes(?string $format): array
         return [StaticConstructorDummy::class];
     }
 
-    protected function extractAttributes(object $object, string $format = null, array $context = []): array
+    protected function extractAttributes(object $object, ?string $format = null, array $context = []): array
     {
         return get_object_vars($object);
     }
 
-    protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed
+    protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
     {
         return $object->$attribute;
     }
 
-    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
+    protected function setAttributeValue(object $object, string $attribute, mixed $value, ?string $format = null, array $context = []): void
     {
         $object->$attribute = $value;
     }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithRequiredArgument.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithRequiredArgument.php
@@ -20,7 +20,7 @@ final class ConstraintWithRequiredArgument extends Constraint
     public string $requiredArg;
 
     #[HasNamedArguments]
-    public function __construct(string $requiredArg, array $groups = null, mixed $payload = null)
+    public function __construct(string $requiredArg, ?array $groups = null, mixed $payload = null)
     {
         parent::__construct([], $groups, $payload);
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ interface DumperInterface`
`26`	`26`	`* @param bool\|null &$asGhostObject Set to true after the call if the proxy is a ghost object`
`27`	`27`	`* @param string\|null $id`
`28`	`28`	`*/`
`29`		`- public function isProxyCandidate(Definition $definition/* , bool &$asGhostObject = null, string $id = null */): bool;`
	`29`	`+ public function isProxyCandidate(Definition $definition/* , ?bool &$asGhostObject = null, ?string $id = null */): bool;`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Generates the code to be used to instantiate a proxy in the dumped factory code.`
`@@ -38,5 +38,5 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $`
`38`	`38`	`*`
`39`	`39`	`* @param string\|null $id`
`40`	`40`	`*/`
`41`		`- public function getProxyCode(Definition $definition/* , string $id = null */): string;`
	`41`	`+ public function getProxyCode(Definition $definition/* , ?string $id = null */): string;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Foo`
`30`	`30`	`public static int $counter = 0;`
`31`	`31`
`32`	`32`	`#[Required]`
`33`		`- public function cloneFoo(\stdClass $bar = null): static`
	`33`	`+ public function cloneFoo(?\stdClass $bar = null): static`
`34`	`34`	`{`
`35`	`35`	`++self::$counter;`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterf`
`107`	`107`	`#[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]`
`108`	`108`	`class AsDecoratorBaz implements AsDecoratorInterface`
`109`	`109`	`{`
`110`		`- public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)`
	`110`	`+ public function __construct(#[AutowireDecorated] ?AsDecoratorInterface $inner = null)`
`111`	`111`	`{`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function callPassed()`
`83`	`83`
`84`	`84`	`class DummyProxyDumper implements DumperInterface`
`85`	`85`	`{`
`86`		`- public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool`
	`86`	`+ public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject = null, ?string $id = null): bool`
`87`	`87`	`{`
`88`	`88`	`$asGhostObject = false;`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ enum TranslatableTextAlign implements TranslatableInterface`
`20`	`20`	`case Center;`
`21`	`21`	`case Right;`
`22`	`22`
`23`		`- public function trans(TranslatorInterface $translator, string $locale = null): string`
	`23`	`+ public function trans(TranslatorInterface $translator, ?string $locale = null): string`
`24`	`24`	`{`
`25`	`25`	`return $translator->trans($this->name, locale: $locale);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function testEmptyParamAnnotation()`
`80`	`80`	`/**`
`81`	`81`	`* @dataProvider typesWithNoPrefixesProvider`
`82`	`82`	`*/`
`83`		`- public function testExtractTypesWithNoPrefixes($property, array $type = null)`
	`83`	`+ public function testExtractTypesWithNoPrefixes($property, ?array $type = null)`
`84`	`84`	`{`
`85`	`85`	`$noPrefixExtractor = new PhpDocExtractor(null, [], [], []);`
`86`	`86`
`@@ -202,7 +202,7 @@ public static function provideCollectionTypes()`
`202`	`202`	`/**`
`203`	`203`	`* @dataProvider typesWithCustomPrefixesProvider`
`204`	`204`	`*/`
`205`		`- public function testExtractTypesWithCustomPrefixes($property, array $type = null)`
	`205`	`+ public function testExtractTypesWithCustomPrefixes($property, ?array $type = null)`
`206`	`206`	`{`
`207`	`207`	`$customExtractor = new PhpDocExtractor(null, ['add', 'remove'], ['is', 'can']);`
`208`	`208`
`@@ -401,7 +401,7 @@ public function testUnknownPseudoType()`
`401`	`401`	`/**`
`402`	`402`	`* @dataProvider constructorTypesProvider`
`403`	`403`	`*/`
`404`		`- public function testExtractConstructorTypes($property, array $type = null)`
	`404`	`+ public function testExtractConstructorTypes($property, ?array $type = null)`
`405`	`405`	`{`
`406`	`406`	`$this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property));`
`407`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function setUp(): void`
`44`	`44`	`/**`
`45`	`45`	`* @dataProvider typesProvider`
`46`	`46`	`*/`
`47`		`- public function testExtract($property, array $type = null)`
	`47`	`+ public function testExtract($property, ?array $type = null)`
`48`	`48`	`{`
`49`	`49`	`$this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', $property));`
`50`	`50`	`}`
`@@ -75,7 +75,7 @@ public function testInvalid($property)`
`75`	`75`	`/**`
`76`	`76`	`* @dataProvider typesWithNoPrefixesProvider`
`77`	`77`	`*/`
`78`		`- public function testExtractTypesWithNoPrefixes($property, array $type = null)`
	`78`	`+ public function testExtractTypesWithNoPrefixes($property, ?array $type = null)`
`79`	`79`	`{`
`80`	`80`	`$noPrefixExtractor = new PhpStanExtractor([], [], []);`
`81`	`81`
`@@ -130,7 +130,7 @@ public static function typesProvider()`
`130`	`130`	`/**`
`131`	`131`	`* @dataProvider provideCollectionTypes`
`132`	`132`	`*/`
`133`		`- public function testExtractCollection($property, array $type = null)`
	`133`	`+ public function testExtractCollection($property, ?array $type = null)`
`134`	`134`	`{`
`135`	`135`	`$this->testExtract($property, $type);`
`136`	`136`	`}`
`@@ -186,7 +186,7 @@ public static function provideCollectionTypes()`
`186`	`186`	`/**`
`187`	`187`	`* @dataProvider typesWithCustomPrefixesProvider`
`188`	`188`	`*/`
`189`		`- public function testExtractTypesWithCustomPrefixes($property, array $type = null)`
	`189`	`+ public function testExtractTypesWithCustomPrefixes($property, ?array $type = null)`
`190`	`190`	`{`
`191`	`191`	`$customExtractor = new PhpStanExtractor(['add', 'remove'], ['is', 'can']);`
`192`	`192`
`@@ -344,7 +344,7 @@ public static function propertiesParentTypeProvider(): array`
`344`	`344`	`/**`
`345`	`345`	`* @dataProvider constructorTypesProvider`
`346`	`346`	`*/`
`347`		`- public function testExtractConstructorTypes($property, array $type = null)`
	`347`	`+ public function testExtractConstructorTypes($property, ?array $type = null)`
`348`	`348`	`{`
`349`	`349`	`$this->assertEquals($type, $this->extractor->getTypesFromConstructor('Symfony\Component\PropertyInfo\Tests\Fixtures\ConstructorDummy', $property));`
`350`	`350`	`}`
`@@ -459,7 +459,7 @@ public static function intRangeTypeProvider(): array`
`459`	`459`	`/**`
`460`	`460`	`* @dataProvider php80TypesProvider`
`461`	`461`	`*/`
`462`		`- public function testExtractPhp80Type(string $class, $property, array $type = null)`
	`462`	`+ public function testExtractPhp80Type(string $class, $property, ?array $type = null)`
`463`	`463`	`{`
`464`	`464`	`$this->assertEquals($type, $this->extractor->getTypes($class, $property, []));`
`465`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ final class TraceableAttributeClassLoader extends AttributeClassLoader`
`20`	`20`	`/** @var list<string> */`
`21`	`21`	`public array $foundClasses = [];`
`22`	`22`
`23`		`- public function load(mixed $class, string $type = null): RouteCollection`
	`23`	`+ public function load(mixed $class, ?string $type = null): RouteCollection`
`24`	`24`	`{`
`25`	`25`	`if (!is_string($class)) {`
`26`	`26`	`throw new \InvalidArgumentException(sprintf('Expected string, got "%s"', get_debug_type($class)));`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`final class FooInterfaceDummyDenormalizer implements DenormalizerInterface`
`17`	`17`	`{`
`18`		`- public function denormalize(mixed $data, string $type, string $format = null, array $context = []): array`
	`18`	`+ public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): array`
`19`	`19`	`{`
`20`	`20`	`$result = [];`
`21`	`21`	`foreach ($data as $foo) {`
`@@ -27,7 +27,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar`
`27`	`27`	`return $result;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool`
	`30`	`+ public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool`
`31`	`31`	`{`
`32`	`32`	`if (str_ends_with($type, '[]')) {`
`33`	`33`	`$className = substr($type, 0, -2);`