From 3fb90e28300f3c000c321035a6ca1f8ece577b96 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Mon, 5 Jun 2023 13:51:12 +0200
Subject: [PATCH] [DependencyInjection] Support PHP 8.2 `true` type

Add test for `null` type
---
 .../Compiler/CheckTypeDeclarationsPass.php    |  4 ++++
 .../CheckTypeDeclarationsPassTest.php         | 21 +++++++++++++++++++
 .../UnionConstructorPHP82.php                 | 16 ++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorPHP82.php

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
index 59e39067e777e..e69d56fb16265 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -308,6 +308,10 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
             if (false === $value) {
                 return;
             }
+        } elseif ('true' === $type) {
+            if (true === $value) {
+                return;
+            }
         } elseif ($reflectionType->isBuiltin()) {
             $checkFunction = sprintf('is_%s', $type);
             if ($checkFunction($value)) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
index e3c87ef13b74f..91447c7ef4459 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -32,6 +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\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;
@@ -868,6 +869,26 @@ public function testUnionTypePassesWithFalse()
         $this->addToAssertionCount(1);
     }
 
+    /**
+     * @requires PHP 8.2
+     */
+    public function testUnionTypePassesWithTrue()
+    {
+        $container = new ContainerBuilder();
+
+        $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);
+    }
+
     /**
      * @requires PHP 8
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorPHP82.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/UnionConstructorPHP82.php
new file mode 100644
index 0000000000000..ea0d9e348f388
--- /dev/null
+++ 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);
+    }
+}