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

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();

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)
     {
     }
 

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;
     }

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;
     }

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);
     }

Tests/Fixtures/OptionalParameter.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * 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)
+    {
+    }
+}

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)
     {
     }
 

Tests/Fixtures/includes/autowiring_classes.php

@@ -120,7 +120,7 @@ public function __construct(A $a, DInterface $d)
 
 class E
 {
-    public function __construct(D $d = null)
+    public function __construct(?D $d = null)
     {
     }
 }
@@ -176,13 +176,6 @@ public function __construct(Dunglas $j, Dunglas $k)
     }
 }
 
-class OptionalParameter
-{
-    public function __construct(CollisionInterface $c = null, A $a, Foo $f = null)
-    {
-    }
-}
-
 class BadTypeHintedArgument
 {
     public function __construct(Dunglas $k, NotARealClass $r)
@@ -216,7 +209,7 @@ public function __construct(A $k, $foo, Dunglas $dunglas, array $bar)
 
 class MultipleArgumentsOptionalScalar
 {
-    public function __construct(A $a, $foo = 'default_val', Lille $lille = null)
+    public function __construct(A $a, $foo = 'default_val', ?Lille $lille = null)
     {
     }
 }
@@ -240,7 +233,7 @@ public function __construct(
  */
 class ClassForResource
 {
-    public function __construct($foo, Bar $bar = null)
+    public function __construct($foo, ?Bar $bar = null)
     {
     }
 
@@ -455,7 +448,7 @@ public function setBar()
     {
     }
 
-    public function setOptionalNotAutowireable(NotARealClass $n = null)
+    public function setOptionalNotAutowireable(?NotARealClass $n = null)
     {
     }
 
@@ -513,7 +506,7 @@ class DecoratorImpl implements DecoratorInterface
 
 class Decorated implements DecoratorInterface
 {
-    public function __construct($quz = null, \NonExistent $nonExistent = null, DecoratorInterface $decorated = null, array $foo = [])
+    public function __construct($quz = null, ?\NonExistent $nonExistent = null, ?DecoratorInterface $decorated = null, array $foo = [])
     {
     }
 }