Skip to content

Commit f8c1413

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: 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 Updated README for the Mailer component fix error with custom function and web profiler routing tab
2 parents 253be1c + 5cc05ef commit f8c1413

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Resources/config/mailer.xml

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

4242
<service id="mailer.logger_message_listener" class="Symfony\Component\Mailer\EventListener\MessageLoggerListener">
4343
<tag name="kernel.event_subscriber"/>
44+
<tag name="kernel.reset" method="reset" />
4445
</service>
4546
</services>
4647
</container>

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)