8000 [FrameworkBundle] Fix mailer config with XML · symfony/symfony@0cfdf2f · GitHub
[go: up one dir, main page]
Skip to content

Commit 0cfdf2f

Browse files
lyrixxlyrixx
committed
[FrameworkBundle] Fix mailer config with XML
1 parent 3fbca7b commit 0cfdf2f

File tree

8 files changed

+21
-17
lines changed

8 files changed

+21
-17
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
15591559
continue;
15601560
}
15611561
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'];
15631563
}
15641564
}
15651565

@@ -1897,6 +1897,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
18971897
->end()
18981898
->arrayNode('envelope')
18991899
->info('Mailer Envelope configuration')
1900+
->fixXmlConfig('recipient')
19001901
->children()
19011902
->scalarNode('sender')->end()
19021903
->arrayNode('recipients')

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@
703703
<xsd:complexType name="mailer_envelope">
704704
<xsd:sequence>
705705
<xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
706-
<xsd:element name="recipients" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
706+
<xsd:element name="recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
707707
</xsd:sequence>
708708
</xsd:complexType>
709709

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'dsn' => 'smtp://example.com',
99
'envelope' => [
1010
'sender' => 'sender@example.org',
11-
'recipients' => ['redirected@example.org', 'redirected1@example.org'],
11+
'recipients' => ['redirected@example.org'],
1212
],
1313
'headers' => [
1414
'from' => 'from@example.org',

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<framework:mailer dsn="smtp://example.com">
1111
<framework:envelope>
1212
<framework:sender>sender@example.org</framework:sender>
13-
<framework:recipients>redirected@example.org</framework:recipients>
14-
<framework:recipients>redirected1@example.org</framework:recipients>
13+
<framework:recipient>redirected@example.org</framework:recipient>
1514
</framework:envelope>
1615
<framework:header name="from">from@example.org</framework:header>
1716
<framework:header name="bcc">bcc1@example.org</framework:header>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<framework:transport name="transport2">smtp://example2.com</framework:transport>
1313
<framework:envelope>
1414
<framework:sender>sender@example.org</framework:sender>
15-
<framework:recipients>redirected@example.org</framework:recipients>
16-
<framework:recipients>redirected1@example.org</framework:recipients>
15+
<framework:recipient>redirected@example.org</framework:recipient>
16+
<framework:recipient>redirected1@example.org</framework:recipient>
1717
</framework:envelope>
1818
<framework:header name="from">from@example.org</framework:header>
1919
<framework:header name="bcc">bcc1@example.org</framework:header>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ framework:
55
sender: sender@example.org
66
recipients:
77
- redirected@example.org
8-
- redirected1@example.org
98
headers:
109
from: from@example.org
1110
bcc: [bcc1@example.org, bcc2@example.org]

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public function testWorkflows()
318318
$this->assertSame('state_machine.pull_request.metadata_store', (string) $metadataStoreReference);
319319

320320
$metadataStoreDefinition = $container->getDefinition('state_machine.pull_request.metadata_store');
321-
$this->assertSame(Workflow\Metadata\InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
321+
$this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
322322
$this->assertSame(InMemoryMetadataStore::class, $metadataStoreDefinition->getClass());
323323

324324
$workflowMetadata = $metadataStoreDefinition->getArgument(0);
@@ -1940,21 +1940,27 @@ public function testHttpClientFullDefaultOptions()
19401940
], $defaultOptions['peer_fingerprint']);
19411941
}
19421942

1943-
public static function provideMailer(): array
1943+
public static function provideMailer(): iterable
19441944
{
1945-
return [
1946-
['mailer_with_dsn', ['main' => 'smtp://example.com']],
1947-
['mailer_with_transports', [
1945+
yield [
1946+
'mailer_with_dsn',
1947+
['main' => 'smtp://example.com'],
1948+
['redirected@example.org'],
1949+
];
1950+
yield [
1951+
'mailer_with_transports',
1952+
[
19481953
'transport1' => 'smtp://example1.com',
19491954
'transport2' => 'smtp://example2.com',
1950-
]],
1955+
],
1956+
['redirected@example.org', 'redirected1@example.org'],
19511957
];
19521958
}
19531959

19541960
/**
19551961
* @dataProvider provideMailer
19561962
*/
1957-
public function testMailer(string $configFile, array $expectedTransports)
1963+
public function testMailer(string $configFile, array $expectedTransports, array $expectedRecipients)
19581964
{
19591965
$container = $this->createContainerFromFile($configFile);
19601966

@@ -1966,7 +1972,7 @@ public function testMailer(string $configFile, array $expectedTransports)
19661972
$this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
19671973
$l = $container->getDefinition('mailer.envelope_listener');
19681974
$this->assertSame('sender@example.org', $l->getArgument(0));
1969-
$this->assertSame(['redirected@example.org', 'redirected1@example.org'], $l->getArgument(1));
1975+
$this->assertSame($expectedRecipients, $l->getArgument(1));
19701976
$this->assertEquals(new Reference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE), $container->getDefinition('mailer.mailer')->getArgument(1));
19711977

19721978
$this->assertTrue($container->hasDefinition('mailer.message_listener'));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Config\FileLocator;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
17-
use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;
1817

1918
class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase
2019
{

0 commit comments

Comments
 (0)
0