[Mailer] made the message logger permanent

Author: fabpot

DependencyInjection/FrameworkExtension.php

@@ -148,6 +148,7 @@ class FrameworkExtension extends Extension
     private $annotationsConfigEnabled = false;
     private $validatorConfigEnabled = false;
     private $messengerConfigEnabled = false;
+    private $mailerConfigEnabled = false;
 
     /**
      * Responds to the app.config configuration parameter.
@@ -343,7 +344,7 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
         }
 
-        if ($this->isConfigEnabled($container, $config['mailer'])) {
+        if ($this->mailerConfigEnabled = $this->isConfigEnabled($container, $config['mailer'])) {
             $this->registerMailerConfiguration($config['mailer'], $container, $loader);
         }
 
@@ -553,6 +554,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             $loader->load('messenger_debug.xml');
         }
 
+        if ($this->mailerConfigEnabled) {
+            $loader->load('mailer_debug.xml');
+        }
+
         $container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
         $container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
 
@@ -1965,9 +1970,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         }
 
         $loader->load('mailer.xml');
-        if ($container->getParameter('kernel.debug')) {
-            $loader->load('mailer_debug.xml');
-        }
         $loader->load('mailer_transports.xml');
         $container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
 

Resources/config/mailer.xml

@@ -33,5 +33,9 @@
             <argument /> <!-- recipients -->
             <tag name="kernel.event_subscriber"/>
         </service>
+
+        <service id="mailer.logger_message_listener" class="Symfony\Component\Mailer\EventListener\MessageLoggerListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
     </services>
 </container>

Resources/config/mailer_debug.xml

@@ -5,10 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="mailer.logger_message_listener" class="Symfony\Component\Mailer\EventListener\MessageLoggerListener">
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
        <service id="mailer.data_collector" class="Symfony\Component\Mailer\DataCollector\MessageDataCollector">
             <argument type="service" id="mailer.logger_message_listener" />
             <tag name="data_collector" template="@WebProfiler/Collector/mailer.html.twig" id="mailer" />