Movatterモバイル変換

Skip to content

symfony/symfonyPublic

NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commitadf6d45

lyrixx

committed

[Mailer] Add support for allowing some users even ifrecipients is defined inEnvelopeListener

1 parent60e83e5 commitadf6d45Copy full SHA for adf6d45

File tree

13 files changed

+99

-5

lines changed

src/Symfony
- Bundle/FrameworkBundle
  - DependencyInjection
    - Configuration.php
    - FrameworkExtension.php
  - Resources/config/schema
    - symfony-1.0.xsd
  - Tests/DependencyInjection
    - Fixtures
    - FrameworkExtensionTestCase.php
- Component/Mailer
  - CHANGELOG.md
  - EventListener
    - EnvelopeListener.php
  - Tests/EventListener
    - EnvelopeListenerTest.php

13 files changed

+99

-5

lines changed

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

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2117,12 +2117,22 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl`
`2117`	`2117`	`->arrayNode('envelope')`
`2118`	`2118`	`->info('Mailer Envelope configuration')`
`2119`	`2119`	`->fixXmlConfig('recipient')`
	`2120`	`+ ->fixXmlConfig('allowed_recipient')`
`2120`	`2121`	`->children()`
`2121`	`2122`	`->scalarNode('sender')->end()`
`2122`	`2123`	`->arrayNode('recipients')`
`2123`	`2124`	`->performNoDeepMerging()`
`2124`	`2125`	`->beforeNormalization()`
`2125`		`- ->ifArray()`
	`2126`	`+ ->ifArray()`
	`2127`	`+ ->then(fn ($v) =>array_filter(array_values($v)))`
	`2128`	`+ ->end()`
	`2129`	`+ ->prototype('scalar')->end()`
	`2130`	`+ ->end()`
	`2131`	`+ ->arrayNode('allowed_recipients')`
	`2132`	`+ ->info('A list of regular expressions that allow recipients when "recipients" option is defined.')`
	`2133`	`+ ->performNoDeepMerging()`
	`2134`	`+ ->beforeNormalization()`
	`2135`	`+ ->ifArray()`
`2126`	`2136`	`->then(fn ($v) =>array_filter(array_values($v)))`
`2127`	`2137`	`->end()`
`2128`	`2138`	`->prototype('scalar')->end()`

`‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2669,6 +2669,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co`
`2669`	`2669`	`$envelopeListener =$container->getDefinition('mailer.envelope_listener');`
`2670`	`2670`	`$envelopeListener->setArgument(0,$config['envelope']['sender'] ??null);`
`2671`	`2671`	`$envelopeListener->setArgument(1,$config['envelope']['recipients'] ??null);`
	`2672`	`+$envelopeListener->setArgument(2,$config['envelope']['allowed_recipients'] ?? []);`
`2672`	`2673`
`2673`	`2674`	`if ($config['headers']) {`
`2674`	`2675`	`$headers =newDefinition(Headers::class);`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,7 @@`
`764`	`764`	`<xsd:sequence>`
`765`	`765`	`<xsd:elementname="sender"type="xsd:string"minOccurs="0"maxOccurs="1" />`
`766`	`766`	`<xsd:elementname="recipient"type="xsd:string"minOccurs="0"maxOccurs="unbounded" />`
	`767`	`+ <xsd:elementname="allowed-recipient"type="xsd:string"minOccurs="0"maxOccurs="unbounded" />`
`767`	`768`	`</xsd:sequence>`
`768`	`769`	`</xsd:complexType>`
`769`	`770`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`'envelope' => [`
`14`	`14`	`'sender' =>'sender@example.org',`
`15`	`15`	`'recipients' => ['redirected@example.org'],`
	`16`	`+'allowed_recipients' => ['/^foobar@example.org$/'],`
`16`	`17`	`],`
`17`	`18`	`'headers' => [`
`18`	`19`	`'from' =>'from@example.org',`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`'envelope' => [`
`17`	`17`	`'sender' =>'sender@example.org',`
`18`	`18`	`'recipients' => ['redirected@example.org','redirected1@example.org'],`
	`19`	`+'allowed_recipients' => ['/^foobar@example.org$/','/@example.com$/'],`
`19`	`20`	`],`
`20`	`21`	`'headers' => [`
`21`	`22`	`'from' =>'from@example.org',`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`<framework:envelope>`
`14`	`14`	`<framework:sender>sender@example.org</framework:sender>`
`15`	`15`	`<framework:recipient>redirected@example.org</framework:recipient>`
	`16`	`+ <framework:allowed-recipient>/^foobar@example.org$/</framework:allowed-recipient>`
`16`	`17`	`</framework:envelope>`
`17`	`18`	`<framework:headername="from">from@example.org</framework:header>`
`18`	`19`	`<framework:headername="bcc">bcc1@example.org</framework:header>`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`<framework:sender>sender@example.org</framework:sender>`
`17`	`17`	`<framework:recipient>redirected@example.org</framework:recipient>`
`18`	`18`	`<framework:recipient>redirected1@example.org</framework:recipient>`
	`19`	`+ <framework:allowed-recipient>/^foobar@example.org$/</framework:allowed-recipient>`
	`20`	`+ <framework:allowed-recipient>/@example.com$/</framework:allowed-recipient>`
`19`	`21`	`</framework:envelope>`
`20`	`22`	`<framework:headername="from">from@example.org</framework:header>`
`21`	`23`	`<framework:headername="bcc">bcc1@example.org</framework:header>`

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

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ framework:`
`10`	`10`	`sender:sender@example.org`
`11`	`11`	`recipients:`
`12`	`12`	`-redirected@example.org`
	`13`	`+allowed_recipients:`
	`14`	`+ -/^foobar@example.org$/`
`13`	`15`	`headers:`
`14`	`16`	`from:from@example.org`
`15`	`17`	`bcc:[bcc1@example.org, bcc2@example.org]`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/mailer_with_transports.yml‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ framework:`
`13`	`13`	`recipients:`
`14`	`14`	`-redirected@example.org`
`15`	`15`	`-redirected1@example.org`
	`16`	`+allowed_recipients:`
	`17`	`+ -/^foobar@example.org$/`
	`18`	`+ -/@example.com$/`
`16`	`19`	`headers:`
`17`	`20`	`from:from@example.org`
`18`	`21`	`bcc:[bcc1@example.org, bcc2@example.org]`

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

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2043,6 +2043,7 @@ public static function provideMailer(): iterable`
`2043`	`2043`	`'mailer_with_dsn',`
`2044`	`2044`	`['main' =>'smtp://example.com'],`
`2045`	`2045`	`['redirected@example.org'],`
	`2046`	`+ ['/^foobar@example.org$/'],`
`2046`	`2047`	`];`
`2047`	`2048`	`yield [`
`2048`	`2049`	`'mailer_with_transports',`
`@@ -2052,13 +2053,14 @@ public static function provideMailer(): iterable`
`2052`	`2053`
`2053`	`2054`	`],`
`2054`	`2055`	`['redirected@example.org','redirected1@example.org'],`
	`2056`	`+ ['/^foobar@example.org$/','/@example.com$/'],`
`2055`	`2057`	`];`
`2056`	`2058`	`}`
`2057`	`2059`
`2058`	`2060`	`/**`
`2059`	`2061`	`* @dataProvider provideMailer`
`2060`	`2062`	`*/`
`2061`		`-publicfunctiontestMailer(string$configFile,array$expectedTransports,array$expectedRecipients)`
	`2063`	`+publicfunctiontestMailer(string$configFile,array$expectedTransports,array$expectedRecipients,array$expectedAllowedRecipients)`
`2062`	`2064`	`{`
`2063`	`2065`	`$container =$this->createContainerFromFile($configFile);`
`2064`	`2066`
`@@ -2071,6 +2073,7 @@ public function testMailer(string $configFile, array $expectedTransports, array`
`2071`	`2073`	`$l =$container->getDefinition('mailer.envelope_listener');`
`2072`	`2074`	`$this->assertSame('sender@example.org',$l->getArgument(0));`
`2073`	`2075`	`$this->assertSame($expectedRecipients,$l->getArgument(1));`
	`2076`	`+$this->assertSame($expectedAllowedRecipients,$l->getArgument(2));`
`2074`	`2077`	`$this->assertEquals(newReference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE),$container->getDefinition('mailer.mailer')->getArgument(1));`
`2075`	`2078`
`2076`	`2079`	`$this->assertTrue($container->hasDefinition('mailer.message_listener'));`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp