bug #37728 [FrameworkBundle] do not use deprecated mailer.logger_message_listener service (xabbuh)

fabpot · fabpot · commit 8449f7040eb4 · 2020-08-11T17:22:09.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [FrameworkBundle] do not use deprecated mailer.logger_message_listener service | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 0e93216 do not use deprecated mailer.logger_message_listener service
diff --git 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
@@ -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
@@ -9,3 +9,4 @@ framework:
             sender: sender@example.org
             recipients:
                 - redirected@example.org
+    profiler: ~

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static function getMailerMessage(int $index = 0, string $transport = null`
`118`	`118`
`119`	`119`	`private static function getMessageMailerEvents(): MessageEvents`
`120`	`120`	`{`
`121`		`- if (!self::$container->has('mailer.logger_message_listener')) {`
	`121`	`+ if (!(self::$container->has('mailer.message_logger_listener') ? self::$container->get('mailer.message_logger_listener') : self::$container->get('mailer.logger_message_listener'))) {`
`122`	`122`	`static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');`
`123`	`123`	`}`
`124`	`124`
-Original file line number
+Diff line change
             sender: [email protected]
             recipients:
                 - [email protected]
 +    profiler: ~