[FrameworkBundle] Fix mailer config with XML

lyrixx · lyrixx · commit 322b40a1235d · 2024-03-15T08:39:49.000+01:00
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1559,7 +1559,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                     continue;
                                 }
                                 if (\is_array($scopedConfig['retry_failed'])) {
-                                    $scopedConfig['retry_failed'] = $scopedConfig['retry_failed'] + $config['default_options']['retry_failed'];
+                                    $scopedConfig['retry_failed'] += $config['default_options']['retry_failed'];
                                 }
                             }
 
@@ -1897,6 +1897,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                         ->end()
                         ->arrayNode('envelope')
                             ->info('Mailer Envelope configuration')
+                            ->fixXmlConfig('recipient')
                             ->children()
                                 ->scalarNode('sender')->end()
                                 ->arrayNode('recipients')
diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
@@ -703,7 +703,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>
 
diff --git a/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php b/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php
@@ -8,7 +8,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',
diff --git a/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml b/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml
@@ -10,8 +10,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>
diff --git a/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml b/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml
@@ -12,8 +12,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>
diff --git a/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml b/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml
@@ -5,7 +5,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]
diff --git a/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -318,7 +318,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);
@@ -1940,21 +1940,27 @@ public function testHttpClientFullDefaultOptions()
         ], $defaultOptions['peer_fingerprint']);
     }
 
-    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);
 
@@ -1966,7 +1972,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'));
diff --git a/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;
 
 class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -1559,7 +1559,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e`
`1559`	`1559`	`continue;`
`1560`	`1560`	`}`
`1561`	`1561`	`if (\is_array($scopedConfig['retry_failed'])) {`
`1562`		`- $scopedConfig['retry_failed'] = $scopedConfig['retry_failed'] + $config['default_options']['retry_failed'];`
	`1562`	`+ $scopedConfig['retry_failed'] += $config['default_options']['retry_failed'];`
`1563`	`1563`	`}`
`1564`	`1564`	`}`
`1565`	`1565`
`@@ -1897,6 +1897,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl`
`1897`	`1897`	`->end()`
`1898`	`1898`	`->arrayNode('envelope')`
`1899`	`1899`	`->info('Mailer Envelope configuration')`
	`1900`	`+ ->fixXmlConfig('recipient')`
`1900`	`1901`	`->children()`
`1901`	`1902`	`->scalarNode('sender')->end()`
`1902`	`1903`	`->arrayNode('recipients')`
-Original file line number
+Diff line change
             'dsn' => 'smtp://example.com',
             'envelope' => [
                 'sender' => '[email protected]',
 -                'recipients' => ['[email protected]', '[email protected]'],
 +                'recipients' => ['[email protected]'],
             ],
             'headers' => [
                 'from' => '[email protected]',
-Original file line number
+Diff line change
         <framework:mailer dsn="smtp://example.com">
             <framework:envelope>
                 <framework:sender>[email protected]</framework:sender>
 -                <framework:recipients>[email protected]</framework:recipients>
 -                <framework:recipients>[email protected]</framework:recipients>
 +                <framework:recipient>[email protected]</framework:recipient>
             </framework:envelope>
             <framework:header name="from">[email protected]</framework:header>
             <framework:header name="bcc">[email protected]</framework:header>
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Symfony\Component\Config\FileLocator;`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`16`	`use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;`
`17`		`-use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;`
`18`	`17`
`19`	`18`	`class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase`
`20`	`19`	`{`