Merge branch '6.4' into 7.0

* 6.4:
  [FrameworkBundle] Fix mailer config with XML

Author: lyrixx

DependencyInjection/Configuration.php

@@ -2074,6 +2074,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                         ->end()
                         ->arrayNode('envelope')
                             ->info('Mailer Envelope configuration')
+                            ->fixXmlConfig('recipient')
                             ->children()
                                 ->scalarNode('sender')->end()
                                 ->arrayNode('recipients')

Resources/config/schema/symfony-1.0.xsd

@@ -755,7 +755,7 @@
     <xsd:complexType name="mailer_envelope">
         <xsd:sequence>
             <xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="recipients" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
 

Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php

@@ -12,7 +12,7 @@
             'dsn' => 'smtp://example.com',
             'envelope' => [
                 'sender' => 'sender@example.org',
-                'recipients' => ['redirected@example.org', 'redirected1@example.org'],
+                'recipients' => ['redirected@example.org'],
             ],
             'headers' => [
                 'from' => 'from@example.org',

Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml

@@ -12,8 +12,7 @@
         <framework:mailer dsn="smtp://example.com">
             <framework:envelope>
                 <framework:sender>sender@example.org</framework:sender>
-                <framework:recipients>redirected@example.org</framework:recipients>
-                <framework:recipients>redirected1@example.org</framework:recipients>
+                <framework:recipient>redirected@example.org</framework:recipient>
             </framework:envelope>
             <framework:header name="from">from@example.org</framework:header>
             <framework:header name="bcc">bcc1@example.org</framework:header>

Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml

@@ -14,8 +14,8 @@
             <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:recipient>redirected@example.org</framework:recipient>
+                <framework:recipient>redirected1@example.org</framework:recipient>
             </framework:envelope>
             <framework:header name="from">from@example.org</framework:header>
             <framework:header name="bcc">bcc1@example.org</framework:header>

Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml

@@ -10,7 +10,6 @@ framework:
             sender: sender@example.org
             recipients:
                 - redirected@example.org
-                - redirected1@example.org
         headers:
             from: from@example.org
             bcc: [bcc1@example.org, bcc2@example.org]

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -355,7 +355,7 @@ public function testWorkflows()
         $this->assertSame('state_machine.pull_request.metadata_store', (string) $metadataStoreReference);
 
         $metadataStoreDefinition = $container->getDefinition('state_machine.pull_request.metadata_store');
-        $this->assertSame(Workflow\Metadata\InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
+        $this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
         $this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
 
         $workflowMetadata = $metadataStoreDefinition->getArgument(0);
@@ -1989,21 +1989,27 @@ public function testHttpClientFullDefaultOptions()
         $this->assertSame(['foo' => ['bar' => 'baz']], $defaultOptions['extra']);
     }
 
-    public static function provideMailer(): array
+    public static function provideMailer(): iterable
     {
-        return [
-            ['mailer_with_dsn', ['main' => 'smtp://example.com']],
-            ['mailer_with_transports', [
+        yield [
+            'mailer_with_dsn',
+            ['main' => 'smtp://example.com'],
+            ['redirected@example.org'],
+        ];
+        yield [
+            'mailer_with_transports',
+            [
                 'transport1' => 'smtp://example1.com',
                 'transport2' => 'smtp://example2.com',
-            ]],
+            ],
+            ['redirected@example.org', 'redirected1@example.org'],
         ];
     }
 
     /**
      * @dataProvider provideMailer
      */
-    public function testMailer(string $configFile, array $expectedTransports)
+    public function testMailer(string $configFile, array $expectedTransports, array $expectedRecipients)
     {
         $container = $this->createContainerFromFile($configFile);
 
@@ -2015,7 +2021,7 @@ public function testMailer(string $configFile, array $expectedTransports)
         $this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
         $l = $container->getDefinition('mailer.envelope_listener');
         $this->assertSame('sender@example.org', $l->getArgument(0));
-        $this->assertSame(['redirected@example.org', 'redirected1@example.org'], $l->getArgument(1));
+        $this->assertSame($expectedRecipients, $l->getArgument(1));
         $this->assertEquals(new Reference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE), $container->getDefinition('mailer.mailer')->getArgument(1));
 
         $this->assertTrue($container->hasDefinition('mailer.message_listener'));