bug #59818 [TypeInfo] Fix create union with nullable type (mtarld)

nicolas-grekas · nicolas-grekas · commit 33f70b7f5be6 · 2025-02-20T13:00:03.000+01:00
This PR was merged into the 7.2 branch. Discussion ---------- [TypeInfo] Fix create union with nullable type | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT Fix the creation of a union type with a nullable type, such as ```php Type::union(Type::nullable(Type::int()), Type::string()); // it will be handled the same as: Type::nullable(Type::int(), Type::string()) Type::union(Type::int(), Type::string(), Type::null()) ``` Commits ------- a5f779c [TypeInfo] Fix create union with nullable type
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php
@@ -205,5 +205,9 @@ public function testCreateNullable()
             new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),
             Type::nullable(Type::union(Type::int(), Type::string(), Type::null())),
         );
+        $this->assertEquals(
+            new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),
+            Type::union(Type::nullable(Type::int()), Type::string()),
+        );
     }
 }
diff --git a/src/Symfony/Component/TypeInfo/TypeFactoryTrait.php b/src/Symfony/Component/TypeInfo/TypeFactoryTrait.php
@@ -266,6 +266,13 @@ public static function union(Type ...$types): UnionType
         $isNullable = fn (Type $type): bool => $type instanceof BuiltinType && TypeIdentifier::NULL === $type->getTypeIdentifier();
 
         foreach ($types as $type) {
+            if ($type instanceof NullableType) {
+                $nullableUnion = true;
+                $unionTypes[] = $type->getWrappedType();
+
+                continue;
+            }
+
             if ($type instanceof UnionType) {
                 foreach ($type->getTypes() as $unionType) {
                     if ($isNullable($type)) {

Original file line number	Diff line number	Diff line change
`@@ -205,5 +205,9 @@ public function testCreateNullable()`
`205`	`205`	`new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),`
`206`	`206`	`Type::nullable(Type::union(Type::int(), Type::string(), Type::null())),`
`207`	`207`	`);`
	`208`	`+ $this->assertEquals(`
	`209`	`+ new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),`
	`210`	`+ Type::union(Type::nullable(Type::int()), Type::string()),`
	`211`	`+ );`
`208`	`212`	`}`
`209`	`213`	`}`