Merge branch '6.4' into 7.2

* 6.4:
  [Validator] Remove comment to GitHub issue
  [Serializer] Add support for discriminator map in property normalizer
  [DependencyInjection] Fix inlining when public services are involved
  fix contracts directory name
  Fix TraceableSerializer when collected caller from array map
  [HttpClient] Limit curl's connection cache size
  [FrameworkBundle] Fix argument not provided to `add_bus_name_stamp_middleware`

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -2176,16 +2176,18 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
                 $defaultMiddleware['after'][0]['arguments'] = [$bus['default_middleware']['allow_no_senders']];
                 $defaultMiddleware['after'][1]['arguments'] = [$bus['default_middleware']['allow_no_handlers']];
 
-                // argument to add_bus_name_stamp_middleware
-                $defaultMiddleware['before'][0]['arguments'] = [$busId];
-
                 $middleware = array_merge($defaultMiddleware['before'], $middleware, $defaultMiddleware['after']);
             }
 
-            foreach ($middleware as $middlewareItem) {
+            foreach ($middleware as $key => $middlewareItem) {
                 if (!$validationEnabled && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
                     throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
                 }
+
+                // argument to add_bus_name_stamp_middleware
+                if ('add_bus_name_stamp_middleware' === $middlewareItem['id']) {
+                    $middleware[$key]['arguments'] = [$busId];
+                }
             }
 
             if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class)) {

Tests/DependencyInjection/Fixtures/php/messenger_bus_name_stamp.php

@@ -0,0 +1,24 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'messenger' => [
+        'default_bus' => 'messenger.bus.commands',
+        'buses' => [
+            'messenger.bus.commands' => [
+                'default_middleware' => false,
+                'middleware' => [
+                    'add_bus_name_stamp_middleware',
+                    'send_message',
+                    'handle_message',
+                ],
+            ],
+            'messenger.bus.events' => [
+                'default_middleware' => true,
+            ],
+        ],
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/messenger_bus_name_stamp.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config http-method-override="false" handle-all-throwables="true">
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:messenger default-bus="messenger.bus.commands">
+            <framework:bus name="messenger.bus.commands" default-middleware="false">
+                <framework:middleware id="add_bus_name_stamp_middleware" />
+                <framework:middleware id="send_message" />
+                <framework:middleware id="handle_message" />
+            </framework:bus>
+            <framework:bus name="messenger.bus.events" default-middleware="true" />
+        </framework:messenger>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/messenger_bus_name_stamp.yml

@@ -0,0 +1,17 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    messenger:
+        default_bus: messenger.bus.commands
+        buses:
+            messenger.bus.commands:
+                default_middleware: false
+                middleware:
+                    - "add_bus_name_stamp_middleware"
+                    - "send_message"
+                    - "handle_message"
+            messenger.bus.events:
+                default_middleware: true

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -1093,6 +1093,28 @@ public function testMessengerWithMultipleBuses()
         $this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
     }
 
+    public function testMessengerWithAddBusNameStampMiddleware()
+    {
+        $container = $this->createContainerFromFile('messenger_bus_name_stamp');
+
+        $this->assertTrue($container->has('messenger.bus.commands'));
+        $this->assertEquals([
+            ['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.commands']],
+            ['id' => 'send_message', 'arguments' => []],
+            ['id' => 'handle_message', 'arguments' => []],
+        ], $container->getParameter('messenger.bus.commands.middleware'));
+        $this->assertTrue($container->has('messenger.bus.events'));
+        $this->assertSame([], $container->getDefinition('messenger.bus.events')->getArgument(0));
+        $this->assertEquals([
+            ['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.events']],
+            ['id' => 'reject_redelivered_message_middleware'],
+            ['id' => 'dispatch_after_current_bus'],
+            ['id' => 'failed_message_processing_middleware'],
+            ['id' => 'send_message', 'arguments' => [true]],
+            ['id' => 'handle_message', 'arguments' => [false]],
+        ], $container->getParameter('messenger.bus.events.middleware'));
+    }
+
     public function testMessengerMiddlewareFactoryErroneousFormat()
     {
         $this->expectException(\InvalidArgumentException::class);