Skip to content

Commit 78007ce

Browse files
Merge branch '5.3' into 5.4
* 5.3: Match 5.1 mailer configuration [Cache] Make sure PdoAdapter::prune() always returns a bool [HttpKernel] Fix broken mock [HttpClient] Fix handling timeouts when responses are destructed [PropertyInfo] Support for intersection types
2 parents bd7a9d7 + 4bcc5e8 commit 78007ce

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Resources/config/mailer.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,9 @@
7373
->tag('kernel.event_subscriber')
7474
->tag('kernel.reset', ['method' => 'reset'])
7575
->deprecate('symfony/framework-bundle', '5.2', 'The "%service_id%" service is deprecated, use "mailer.message_logger_listener" instead.')
76+
77+
->set('mailer.message_logger_listener', MessageLoggerListener::class)
78+
->tag('kernel.event_subscriber')
79+
->tag('kernel.reset', ['method' => 'reset'])
7680
;
7781
};

Resources/config/mailer_debug.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,5 @@
2424
'template' => '@WebProfiler/Collector/mailer.html.twig',
2525
'id' => 'mailer',
2626
])
27-
28-
->set('mailer.message_logger_listener', MessageLoggerListener::class)
29-
->tag('kernel.event_subscriber')
30-
->tag('kernel.reset', ['method' => 'reset'])
3127
;
3228
};

0 commit comments

Comments
 (0)