Merge branch '4.4' into 5.1

* 4.4:
  Fix CS
  [Serializer] Fix configuration of the cache key
  [Messenger] Do not stack retry stamp
  [FrameworkBundle] Add missing mailer transports in xsd
  [ErrorHandler][DebugClassLoader] Add mixed and static return types support

Author: fabpot

Resources/config/schema/symfony-1.0.xsd

@@ -554,12 +554,17 @@
 
     <xsd:complexType name="mailer">
         <xsd:sequence>
+            <xsd:element name="transport" type="mailer_transport" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="envelope" type="mailer_envelope" minOccurs="0" maxOccurs="1" />
         </xsd:sequence>
         <xsd:attribute name="dsn" type="xsd:string" />
         <xsd:attribute name="message-bus" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="mailer_transport" mixed="true">
+        <xsd:attribute name="name" type="xsd:string" use="required" />
+    </xsd:complexType>
+
     <xsd:complexType name="mailer_envelope">
         <xsd:sequence>
             <xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />

Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $container) {
+    $container->extension('framework', [
+        'mailer' => [
+            'dsn' => 'smtp://example.com',
+            'envelope' => [
+                'sender' => 'sender@example.org',
+                'recipients' => ['redirected@example.org', 'redirected1@example.org'],
+            ],
+        ],
+    ]);
+};

Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return static function (ContainerConfigurator $container) {
+    $container->extension('framework', [
+        'mailer' => [
+            'transports' => [
+                'transport1' => 'smtp://example1.com',
+                'transport2' => 'smtp://example2.com',
+            ],
+            'envelope' => [
+                'sender' => 'sender@example.org',
+                'recipients' => ['redirected@example.org', 'redirected1@example.org'],
+            ],
+        ],
+    ]);
+};

Tests/DependencyInjection/Fixtures/xml/mailer.xml renamed to Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+
+<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>
+        <framework:mailer>
+            <framework:transport name="transport1">smtp://example1.com</framework:transport>
+            <framework:transport name="transport2">smtp://example2.com</framework:transport>
+            <framework:envelope>
+                <framework:sender>sender@example.org</framework:sender>
+                <framework:recipients>redirected@example.org</framework:recipients>
+                <framework:recipients>redirected1@example.org</framework:recipients>
+            </framework:envelope>
+        </framework:mailer>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml

@@ -0,0 +1,10 @@
+framework:
+    mailer:
+        transports:
+            transport1: 'smtp://example1.com'
+            transport2: 'smtp://example2.com'
+        envelope:
+            sender: sender@example.org
+            recipients:
+                - redirected@example.org
+                - redirected1@example.org

Tests/DependencyInjection/Fixtures/yml/mailer.yml renamed to Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml

@@ -1423,13 +1423,29 @@ public function testHttpClientFullDefaultOptions()
         ], $defaultOptions['peer_fingerprint']);
     }
 
-    public function testMailer(): void
+    public function provideMailer(): array
+    {
+        return [
+            ['mailer_with_dsn', ['main' => 'smtp://example.com']],
+            ['mailer_with_transports', [
+                'transport1' => 'smtp://example1.com',
+                'transport2' => 'smtp://example2.com',
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMailer
+     */
+    public function testMailer(string $configFile, array $expectedTransports): void
     {
-        $container = $this->createContainerFromFile('mailer');
+        $container = $this->createContainerFromFile($configFile);
 
         $this->assertTrue($container->hasAlias('mailer'));
+        $this->assertTrue($container->hasDefinition('mailer.transports'));
+        $this->assertSame($expectedTransports, $container->getDefinition('mailer.transports')->getArgument(0));
         $this->assertTrue($container->hasDefinition('mailer.default_transport'));
-        $this->assertSame('smtp://example.com', $container->getDefinition('mailer.default_transport')->getArgument(0));
+        $this->assertSame(current($expectedTransports), $container->getDefinition('mailer.default_transport')->getArgument(0));
         $this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
         $l = $container->getDefinition('mailer.envelope_listener');
         $this->assertSame('sender@example.org', $l->getArgument(0));