[Mailer] fix multiple transports default injection

fkropfhamer · fabpot · commit a50880b0675b · 2025-02-26T07:58:59.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -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']) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
@@ -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)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -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));

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']) {`