bug #37906 [FrameworkBundle] properly choose the best mailer message logger listener (xabbuh)

fabpot · fabpot · commit 28ede1f46872 · 2020-08-21T12:17:53.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [FrameworkBundle] properly choose the best mailer message logger listener | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Properly merge the changes from #37729 and #37728. Commits ------- 6cffc79 properly choose the best mailer message logger listener
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php
@@ -118,10 +118,14 @@ public static function getMailerMessage(int $index = 0, string $transport = null
 
     private static function getMessageMailerEvents(): MessageEvents
     {
-        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?');
+        if (self::$container->has('mailer.message_logger_listener')) {
+            return self::$container->get('mailer.message_logger_listener')->getEvents();
         }
 
-        return self::$container->get('mailer.logger_message_listener')->getEvents();
+        if (self::$container->has('mailer.logger_message_listener')) {
+            return self::$container->get('mailer.logger_message_listener')->getEvents();
+        }
+
+        static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,14 @@ 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.message_logger_listener') ? self::$container->get('mailer.message_logger_listener') : self::$container->get('mailer.logger_message_listener'))) {`
`122`		`- static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');`
	`121`	`+ if (self::$container->has('mailer.message_logger_listener')) {`
	`122`	`+ return self::$container->get('mailer.message_logger_listener')->getEvents();`
`123`	`123`	`}`
`124`	`124`
`125`		`- return self::$container->get('mailer.logger_message_listener')->getEvents();`
	`125`	`+ if (self::$container->has('mailer.logger_message_listener')) {`
	`126`	`+ return self::$container->get('mailer.logger_message_listener')->getEvents();`
	`127`	`+ }`
	`128`	`+`
	`129`	`+ static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');`
`126`	`130`	`}`
`127`	`131`	`}`