From 0e9321632298d609c8371ea427375cc158cc763a Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 3 Aug 2020 14:55:32 +0200 Subject: [PATCH] do not use deprecated mailer.logger_message_listener service --- .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 3 +++ .../Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php | 2 +- .../FrameworkBundle/Tests/Functional/app/Mailer/config.yml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index ee140bf1e0db4..7d3c95f646cb3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1990,6 +1990,9 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co $container->getDefinition('mailer.transports')->setArgument(0, $transports); $container->getDefinition('mailer.default_transport')->setArgument(0, current($transports)); + $container->removeDefinition('mailer.logger_message_listener'); + $container->setAlias('mailer.logger_message_listener', (new Alias('mailer.message_logger_listener'))->setDeprecated('symfony/framework-bundle', '5.2', 'The "%alias_id%" alias is deprecated, use "mailer.message_logger_listener" instead.')); + $mailer = $container->getDefinition('mailer.mailer'); if (false === $messageBus = $config['message_bus']) { $mailer->replaceArgument(1, null); diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php index d0ca84e25ae7a..571bd804104ea 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php @@ -118,7 +118,7 @@ public static function getMailerMessage(int $index = 0, string $transport = null private static function getMessageMailerEvents(): MessageEvents { - if (!self::$container->has('mailer.logger_message_listener')) { + if (!(self::$container->has('mailer.message_logger_listener') ? self::$container->get('mailer.message_logger_listener') : self::$container->get('mailer.logger_message_listener'))) { static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?'); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Mailer/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Mailer/config.yml index c2c3ace06f179..b464a41a0d857 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Mailer/config.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Mailer/config.yml @@ -9,3 +9,4 @@ framework: sender: sender@example.org recipients: - redirected@example.org + profiler: ~