[DependencyInjection] Support PHP 8.2 null type

ruudk · ruudk · commit 7e21e069658f · 2023-06-05T13:59:23.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -32,7 +32,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\FooObject;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\IntersectionConstructor;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor;
-use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructorWithTrue;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructorPHP82;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Waldo;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\WaldoFoo;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Wobble;
@@ -876,10 +876,14 @@ public function testUnionTypePassesWithTrue()
     {
         $container = new ContainerBuilder();
 
-        $container->register('union', UnionConstructorWithTrue::class)
-            ->setFactory([UnionConstructorWithTrue::class, 'create'])
+        $container->register('unionTrue', UnionConstructorPHP82::class)
+            ->setFactory([UnionConstructorPHP82::class, 'create'])
             ->setArguments([true]);
 
+        $container->register('unionNull', UnionConstructorPHP82::class)
+            ->setFactory([UnionConstructorPHP82::class, 'create'])
+            ->setArguments([null]);
+
         (new CheckTypeDeclarationsPass(true))->process($container);
 
         $this->addToAssertionCount(1);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorPHP82.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorPHP82.php
@@ -2,9 +2,9 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;
 
-class UnionConstructorWithTrue
+class UnionConstructorPHP82
 {
-    public static function create(array|true $arg): static
+    public static function create(null|true $arg): static
     {
         return new static(0);
     }

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;`
`4`	`4`
`5`		`-class UnionConstructorWithTrue`
	`5`	`+class UnionConstructorPHP82`
`6`	`6`	`{`
`7`		`- public static function create(array\|true $arg): static`
	`7`	`+ public static function create(null\|true $arg): static`
`8`	`8`	`{`
`9`	`9`	`return new static(0);`
`10`	`10`	`}`