Commita50880b

authored and

committed

[Mailer] fix multiple transports default injection

1 parentc1082f2 commita50880bCopy full SHA for a50880b

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2660,7 +2660,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co`
`2660`	`2660`	`}`
`2661`	`2661`	`$transports =$config['dsn'] ? ['main' =>$config['dsn']] :$config['transports'];`
`2662`	`2662`	`$container->getDefinition('mailer.transports')->setArgument(0,$transports);`
`2663`		`-$container->getDefinition('mailer.default_transport')->setArgument(0,current($transports));`
`2664`	`2663`
`2665`	`2664`	`$mailer =$container->getDefinition('mailer.mailer');`
`2666`	`2665`	`if (false ===$messageBus =$config['message_bus']) {`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,7 @@`
`46`	`46`	`])`
`47`	`47`
`48`	`48`	`->set('mailer.default_transport', TransportInterface::class)`
`49`		`- ->factory([service('mailer.transport_factory'),'fromString'])`
`50`		`- ->args([`
`51`		`-abstract_arg('env(MAILER_DSN)'),`
`52`		`- ])`
	`49`	`+ ->alias('mailer.default_transport','mailer.transports')`
`53`	`50`	`->alias(TransportInterface::class,'mailer.default_transport')`
`54`	`51`
`55`	`52`	`->set('mailer.messenger.message_handler', MessageHandler::class)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2103,8 +2103,7 @@ public function testMailer(string $configFile, array $expectedTransports, array`
`2103`	`2103`	`$this->assertTrue($container->hasAlias('mailer'));`
`2104`	`2104`	`$this->assertTrue($container->hasDefinition('mailer.transports'));`
`2105`	`2105`	`$this->assertSame($expectedTransports,$container->getDefinition('mailer.transports')->getArgument(0));`
`2106`		`-$this->assertTrue($container->hasDefinition('mailer.default_transport'));`
`2107`		`-$this->assertSame(current($expectedTransports),$container->getDefinition('mailer.default_transport')->getArgument(0));`
	`2106`	`+$this->assertTrue($container->hasAlias('mailer.default_transport'));`
`2108`	`2107`	`$this->assertTrue($container->hasDefinition('mailer.envelope_listener'));`
`2109`	`2108`	`$l =$container->getDefinition('mailer.envelope_listener');`
`2110`	`2109`	`$this->assertSame('sender@example.org',$l->getArgument(0));`

Comments

(0)