[Mailer] Fix memory leak with mailer.message_logger_listener

Author: andrew-demb

src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php

@@ -15,7 +15,6 @@
 use Symfony\Component\Mailer\EventListener\DkimSignedMessageListener;
 use Symfony\Component\Mailer\EventListener\EnvelopeListener;
 use Symfony\Component\Mailer\EventListener\MessageListener;
-use Symfony\Component\Mailer\EventListener\MessageLoggerListener;
 use Symfony\Component\Mailer\EventListener\MessengerTransportListener;
 use Symfony\Component\Mailer\EventListener\SmimeEncryptedMessageListener;
 use Symfony\Component\Mailer\EventListener\SmimeSignedMessageListener;
@@ -72,10 +71,6 @@
             ])
             ->tag('kernel.event_subscriber')
 
-        ->set('mailer.message_logger_listener', MessageLoggerListener::class)
-            ->tag('kernel.event_subscriber')
-            ->tag('kernel.reset', ['method' => 'reset'])
-
         ->set('mailer.messenger_transport_listener', MessengerTransportListener::class)
             ->tag('kernel.event_subscriber')
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php

@@ -12,9 +12,17 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Mailer\DataCollector\MessageDataCollector;
+use Symfony\Component\Mailer\EventListener\MessageLoggerListener;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+        ->set('mailer.message_logger_listener', MessageLoggerListener::class)
+            ->args([
+                service('profiler.is_disabled_state_checker')->nullOnInvalid(),
+            ])
+            ->tag('kernel.event_subscriber')
+            ->tag('kernel.reset', ['method' => 'reset'])
+
         ->set('mailer.data_collector', MessageDataCollector::class)
             ->args([
                 service('mailer.message_logger_listener'),

src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php

@@ -25,8 +25,9 @@ class MessageLoggerListener implements EventSubscriberInterface, ResetInterface
 {
     private MessageEvents $events;
 
-    public function __construct()
-    {
+    public function __construct(
+        protected ?\Closure $disabled = null,
+    ) {
         $this->events = new MessageEvents();
     }
 
@@ -37,6 +38,10 @@ public function reset(): void
 
     public function onMessage(MessageEvent $event): void
     {
+        if ($this->disabled?->__invoke()) {
+            return;
+        }
+
         $this->events->add($event);
     }