bug #37729 [FrameworkBundle] fail properly when the required service is not defined (xabbuh)

fabpot · fabpot · commit d81eb081c3ae · 2020-08-06T07:03:59.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] fail properly when the required service is not defined | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Before: ``` Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException: You have requested a non-existent service "mailer.logger_message_listener". ``` After: ``` A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer? ``` Commits ------- a16ebc1 fail properly when the required service is not defined
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php
@@ -122,10 +122,10 @@ private static function getMessageMailerEvents(): MessageEvents
             static::fail('Unable to make email assertions. Did you forget to make an HTTP request?');
         }
 
-        if (!$logger = self::$container->get('mailer.logger_message_listener')) {
+        if (!self::$container->has('mailer.logger_message_listener')) {
             static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');
         }
 
-        return $logger->getEvents();
+        return self::$container->get('mailer.logger_message_listener')->getEvents();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,10 @@ private static function getMessageMailerEvents(): MessageEvents`
`122`	`122`	`static::fail('Unable to make email assertions. Did you forget to make an HTTP request?');`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (!$logger = self::$container->get('mailer.logger_message_listener')) {`
	`125`	`+ if (!self::$container->has('mailer.logger_message_listener')) {`
`126`	`126`	`static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');`
`127`	`127`	`}`
`128`	`128`
`129`		`- return $logger->getEvents();`
	`129`	`+ return self::$container->get('mailer.logger_message_listener')->getEvents();`
`130`	`130`	`}`
`131`	`131`	`}`