Merge branch '5.4' into 6.4

* 5.4:
  Make more nullable types explicit
  Add more explicit nullable types for default null values

Author: derrabus

src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ConfigurationTest.php

@@ -525,7 +525,7 @@ public function testBaselineFileWriteError()
         $this->expectException(\ErrorException::class);
         $this->expectExceptionMessageMatches('/[Ff]ailed to open stream: Permission denied/');
 
-        set_error_handler(static function (int $errno, string $errstr, string $errfile = null, int $errline = null): bool {
+        set_error_handler(static function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null): bool {
             if ($errno & (E_WARNING | E_WARNING)) {
                 throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
             }

src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php

@@ -200,7 +200,7 @@ public function __wakeup()
     {
     }
 
-    public function setProxyInitializer(\Closure $initializer = null)%S
+    public function setProxyInitializer(%S\Closure $initializer = null)%S
     {
         $this->initializer%s = $initializer;
     }

src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php

@@ -32,7 +32,7 @@ public function connect(array $params, $username = null, $password = null, array
         return $this->driver->connect($params, $username, $password, $driverOptions);
     }
 
-    public function getDatabasePlatform(ServerVersionProvider $versionProvider = null): AbstractPlatform
+    public function getDatabasePlatform(?ServerVersionProvider $versionProvider = null): AbstractPlatform
     {
         return $this->driver->getDatabasePlatform($versionProvider);
     }

src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

@@ -35,6 +35,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\OptionalParameter;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WithTarget;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WithTargetAnonymous;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -405,6 +406,9 @@ public function testResolveParameter()
         $this->assertEquals(Foo::class, $container->getDefinition('bar')->getArgument(0));
     }
 
+    /**
+     * @group legacy
+     */
     public function testOptionalParameter()
     {
         $container = new ContainerBuilder();

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php

@@ -15,12 +15,12 @@ class Bar implements BarInterface
 {
     public $quz;
 
-    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = [], iterable $baz = [])
+    public function __construct($quz = null, ?\NonExistent $nonExistent = null, ?BarInterface $decorated = null, array $foo = [], iterable $baz = [])
     {
         $this->quz = $quz;
     }
 
-    public static function create(\NonExistent $nonExistent = null, $factory = null)
+    public static function create(?\NonExistent $nonExistent = null, $factory = null)
     {
     }
 

src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarMethodCall.php

@@ -20,7 +20,7 @@ public function setFoosVariadic(Foo $foo, Foo ...$foos)
         $this->foo = $foo;
     }
 
-    public function setFoosOptional(Foo $foo, Foo $fooOptional = null)
+    public function setFoosOptional(Foo $foo, ?Foo $fooOptional = null)
     {
         $this->foo = $foo;
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/BarOptionalArgument.php

@@ -6,7 +6,7 @@ class BarOptionalArgument
 {
     public $foo;
 
-    public function __construct(\stdClass $foo = null)
+    public function __construct(?\stdClass $foo = null)
     {
         $this->foo = $foo;
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Foo.php

@@ -9,7 +9,7 @@ public static function createBar()
         return new Bar(new \stdClass());
     }
 
-    public static function createBarArguments(\stdClass $stdClass, \stdClass $stdClassOptional = null)
+    public static function createBarArguments(\stdClass $stdClass, ?\stdClass $stdClassOptional = null)
     {
         return new Bar($stdClass);
     }

src/Symfony/Component/DependencyInjection/Tests/Fixtures/OptionalParameter.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\A;
+use Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface;
+use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+
+class OptionalParameter
+{
+    public function __construct(?CollisionInterface $c = null, A $a, ?Foo $f = null)
+    {
+    }
+}

src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/Foo.php

@@ -8,7 +8,7 @@
 #[When(env: 'dev')]
 class Foo implements FooInterface, Sub\BarInterface
 {
-    public function __construct($bar = null, iterable $foo = null, object $baz = null)
+    public function __construct($bar = null, ?iterable $foo = null, ?object $baz = null)
     {
     }