Merge branch '5.4' into 6.0

* 5.4:
  Fix colors for 4.4
  Stand with Ukraine
  [Runtime] Fix passing $debug parameter to `ErrorHandler`
  [FrameworkBundle] Ensure container is reset between tests
  [HttpKernel] fix using Target with controller args
  Remove blocking test for adding support for placeholders in EmumNode in 6.1
  [FrameworkBundle] Fix compiler passes processing a container twice when it's loaded from the debug dump
  [HttpKernel] Fix advertizing deprecations for *TestSessionListener

Author: fabpot

CHANGELOG.md

@@ -14,7 +14,7 @@ CHANGELOG
 ---
 
  * Add the ability to enable the profiler using a request query parameter, body parameter or attribute
- * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead
+ * Deprecate `AbstractTestSessionListener` and `TestSessionListener`, use `AbstractSessionListener` and `SessionListener` instead
  * Deprecate the `fileLinkFormat` parameter of `DebugHandlersListener`
  * Add support for configuring log level, and status code by exception class
  * Allow ignoring "kernel.reset" methods that don't exist with "on_invalid" attribute

DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -175,7 +175,7 @@ public function process(ContainerBuilder $container)
                         $args[$p->name] = new Reference($erroredId, ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE);
                     } else {
                         $target = ltrim($target, '\\');
-                        $args[$p->name] = $type ? new TypedReference($target, $type, $invalidBehavior, $p->name) : new Reference($target, $invalidBehavior);
+                        $args[$p->name] = $type ? new TypedReference($target, $type, $invalidBehavior, Target::parseName($p)) : new Reference($target, $invalidBehavior);
                     }
                 }
                 // register the maps as a per-method service-locators

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

@@ -425,6 +425,9 @@ public function testBindWithTarget()
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument([]);
 
+        $container->register(ControllerDummy::class, 'bar');
+        $container->register(ControllerDummy::class.' $imageStorage', 'baz');
+
         $container->register('foo', WithTarget::class)
             ->setBindings(['string $someApiKey' => new Reference('the_api_key')])
             ->addTag('controller.service_arguments');
@@ -434,7 +437,11 @@ public function testBindWithTarget()
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
         $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
 
-        $expected = ['apiKey' => new ServiceClosureArgument(new Reference('the_api_key'))];
+        $expected = [
+            'apiKey' => new ServiceClosureArgument(new Reference('the_api_key')),
+            'service1' => new ServiceClosureArgument(new TypedReference(ControllerDummy::class, ControllerDummy::class, ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE, 'imageStorage')),
+            'service2' => new ServiceClosureArgument(new TypedReference(ControllerDummy::class, ControllerDummy::class, ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE, 'service2')),
+        ];
         $this->assertEquals($expected, $locator->getArgument(0));
     }
 }
@@ -510,7 +517,10 @@ class WithTarget
 {
     public function fooAction(
         #[Target('some.api.key')]
-        string $apiKey
+        string $apiKey,
+        #[Target('image.storage')]
+        ControllerDummy $service1,
+        ControllerDummy $service2
     ) {
     }
 }