Skip to content

Commit 5fb9460

Browse files
committed
Merge branch '5.1'
* 5.1: fail properly when the required service is not defined Fix typo [Finder] Fix GitIgnore parser when dealing with (sub)directories and take order of lines into account Update UPGRADE-5.0.md Added the missing reset tag to mailer.logger_message_listener Fix invalid option sslmode Updated README for the Mailer component fix error with custom function and web profiler routing tab
2 parents 57a10ef + f8c1413 commit 5fb9460

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Resources/config/mailer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171

7272
->set('mailer.logger_message_listener', MessageLoggerListener::class)
7373
->tag('kernel.event_subscriber')
74+
->tag('kernel.reset', ['method' => 'reset'])
7475
->deprecate('symfony/framework-bundle', '5.2', 'The "%service_id%" service is deprecated, use "mailer.message_logger_listener" instead.')
7576
;
7677
};

Test/MailerAssertionsTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ public static function getMailerMessage(int $index = 0, string $transport = null
118118

119119
private static function getMessageMailerEvents(): MessageEvents
120120
{
121-
if (!$logger = self::$container->get('mailer.logger_message_listener')) {
121+
if (!self::$container->has('mailer.logger_message_listener')) {
122122
static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');
123123
}
124124

125-
return $logger->getEvents();
125+
return self::$container->get('mailer.logger_message_listener')->getEvents();
126126
}
127127
}

0 commit comments

Comments
 (0)