Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS
  quote address names if they contain parentheses
  [FrameworkBundle] Fail gracefully when forms use disabled CSRF
  [Mime] Fix inline parts when added via attachPart()
  Fail gracefully when attempting to autowire composite types
  [VarDumper] Add a test case for nesting intersection and union types
  Fix #46592 - Ignore getter with required parameters
  [Serializer] Fix inconsistent behaviour of nullable objects in key/value arrays

Author: derrabus

LazyProxy/ProxyHelper.php

@@ -32,6 +32,11 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
             return null;
         }
 
+        return self::getTypeHintForType($type, $r, $noBuiltin);
+    }
+
+    private static function getTypeHintForType(\ReflectionType $type, \ReflectionFunctionAbstract $r, bool $noBuiltin): ?string
+    {
         $types = [];
         $glue = '|';
         if ($type instanceof \ReflectionUnionType) {
@@ -46,6 +51,17 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
         }
 
         foreach ($reflectionTypes as $type) {
+            if ($type instanceof \ReflectionIntersectionType) {
+                $typeHint = self::getTypeHintForType($type, $r, $noBuiltin);
+                if (null === $typeHint) {
+                    return null;
+                }
+
+                $types[] = sprintf('(%s)', $typeHint);
+
+                continue;
+            }
+
             if ($type->isBuiltin()) {
                 if (!$noBuiltin) {
                     $types[] = $type->getName();

Tests/Compiler/AutowirePassTest.php

@@ -240,8 +240,6 @@ public function testTypeNotGuessableNoServicesFound()
 
     public function testTypeNotGuessableUnionType()
     {
-        $this->expectException(AutowiringFailedException::class);
-        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.');
         $container = new ContainerBuilder();
 
         $container->register(CollisionA::class);
@@ -251,6 +249,9 @@ public function testTypeNotGuessableUnionType()
         $aDefinition->setAutowired(true);
 
         $pass = new AutowirePass();
+
+        $this->expectException(AutowiringFailedException::class);
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.');
         $pass->process($container);
     }
 
@@ -287,7 +288,27 @@ public function testTypeNotGuessableIntersectionType()
         $pass = new AutowirePass();
 
         $this->expectException(AutowiringFailedException::class);
-        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\IntersectionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface&Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but this class was not found.');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\IntersectionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface" but this class was not found.');
+        $pass->process($container);
+    }
+
+    /**
+     * @requires PHP 8.2
+     */
+    public function testTypeNotGuessableCompositeType()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(CollisionInterface::class);
+        $container->register(AnotherInterface::class);
+
+        $aDefinition = $container->register('a', CompositeTypeClasses::class);
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+
+        $this->expectException(AutowiringFailedException::class);
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CompositeTypeClasses::__construct()" has type "(Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface&Symfony\Component\DependencyInjection\Tests\Compiler\AnotherInterface)|Symfony\Component\DependencyInjection\Tests\Compiler\YetAnotherInterface" but this class was not found.');
         $pass->process($container);
     }
 
@@ -408,6 +429,22 @@ public function testParameterWithNullUnionIsSkipped()
         $this->assertNull($definition->getArgument(0));
     }
 
+    /**
+     * @requires PHP 8.2
+     */
+    public function testParameterWithNullableIntersectionIsSkipped()
+    {
+        $container = new ContainerBuilder();
+
+        $optDefinition = $container->register('opt', NullableIntersection::class);
+        $optDefinition->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('opt');
+        $this->assertNull($definition->getArgument(0));
+    }
+
     public function testParameterWithNullUnionIsAutowired()
     {
         $container = new ContainerBuilder();

Tests/Fixtures/includes/autowiring_classes.php

@@ -9,6 +9,9 @@
 if (\PHP_VERSION_ID >= 80100) {
     require __DIR__.'/intersectiontype_classes.php';
 }
+if (\PHP_VERSION_ID >= 80200) {
+    require __DIR__.'/compositetype_classes.php';
+}
 
 class Foo
 {

Tests/Fixtures/includes/compositetype_classes.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+interface YetAnotherInterface
+{
+}
+
+class CompositeTypeClasses
+{
+    public function __construct((CollisionInterface&AnotherInterface)|YetAnotherInterface $collision)
+    {
+    }
+}
+
+class NullableIntersection
+{
+    public function __construct((CollisionInterface&AnotherInterface)|null $a)
+    {
+    }
+}