8000 [Mailer] fix multiple transports default injection by fkropfhamer · Pull Request #59781 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Mailer] fix multiple transports default injection #59781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged

[Mailer] fix multiple transports default injection #59781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Mailer] fix multiple transports default injection
  • Loading branch information
@fkropfhamer @fabpot
fkropfhamer authored and fabpot committed Feb 26, 2025
commit a50880b0675b941a945f388b82a90f77239e975d
1 change: 0 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2660,7 +2660,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
}
$transports = $config['dsn'] ? ['main' => $config['dsn']] : $config['transports'];
$container->getDefinition('mailer.transports')->setArgument(0, $transports);
$container->getDefinition('mailer.default_transport')->setArgument(0, current($transports));

$mailer = $container->getDefinition('mailer.mailer');
if (false === $messageBus = $config['message_bus']) {
Expand Down
5 changes: 1 addition & 4 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@
])

->set('mailer.default_transport', TransportInterface::class)
->factory([service('mailer.transport_factory'), 'fromString'])
->args([
abstract_arg('env(MAILER_DSN)'),
])
->alias('mailer.default_transport', 'mailer.transports')
->alias(TransportInterface::class, 'mailer.default_transport')

->set('mailer.messenger.message_handler', MessageHandler::class)
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2103,8 +2103,7 @@ public function testMailer(string $configFile, array $expectedTransports, array
$this->assertTrue($container->hasAlias('mailer'));
$this->assertTrue($container->hasDefinition('mailer.transports'));
$this->assertSame($expectedTransports, $container->getDefinition('mailer.transports')->getArgument(0));
$this->assertTrue($container->hasDefinition('mailer.default_transport'));
$this->assertSame(current($expectedTransports), $container->getDefinition('mailer.default_transport')->getArgument(0));
$this->assertTrue($container->hasAlias('mailer.default_transport'));
$this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
$l = $container->getDefinition('mailer.envelope_listener');
$this->assertSame('sender@example.org', $l->getArgument(0));
Expand Down
Loading
0