[DependencyInjection] Support PHP 8.2 null type

ruudk · ruudk · commit f94e3aaa6f64 · 2023-06-05T14:00:26.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, 'createTrue'])
             ->setArguments([true]);
 
+        $container->register('unionNull', UnionConstructorPHP82::class)
+            ->setFactory([UnionConstructorPHP82::class, 'createNull'])
+            ->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
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass;
+
+class UnionConstructorPHP82
+{
+    public static function createTrue(array|true $arg): static
+    {
+        return new static(0);
+    }
+
+    public static function createNull(null $arg): static
+    {
+        return new static(0);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorWithTrue.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorWithTrue.php
