Merge branch '7.3' into 7.4

* 7.3:
  Fix
  Fix issue with merging union type with a nullable union type

Author: nicolas-grekas

src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

@@ -306,7 +306,7 @@ public function endTest($test, $time): void
         }
 
         if (self::$expectedDeprecations) {
-            if (!$test instanceof TestCase || !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {
+            if ($test instanceof TestCase && !\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE], true)) {
                 $test->addToAssertionCount(\count(self::$expectedDeprecations));
             }
 

src/Symfony/Component/TypeInfo/Tests/TypeFactoryTest.php

@@ -204,6 +204,10 @@ public function testCreateNullable()
             new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),
             Type::union(Type::nullable(Type::int()), Type::string()),
         );
+        $this->assertEquals(
+            new NullableType(new UnionType(new BuiltinType(TypeIdentifier::INT), new BuiltinType(TypeIdentifier::STRING))),
+            Type::union(Type::nullable(Type::union(Type::int(), Type::string())), Type::string()),
+        );
     }
 
     public function testCreateArrayShape()

src/Symfony/Component/TypeInfo/TypeFactoryTrait.php

@@ -299,9 +299,7 @@ public static function union(Type ...$types): UnionType
         foreach ($types as $type) {
             if ($type instanceof NullableType) {
                 $nullableUnion = true;
-                $unionTypes[] = $type->getWrappedType();
-
-                continue;
+                $type = $type->getWrappedType();
             }
 
             if ($type instanceof UnionType) {