From e7c96d3b438f8b7f68786f5ef2dc46c4e15a2a12 Mon Sep 17 00:00:00 2001
From: Titouan Galopin <galopintitouan@gmail.com>
Date: Tue, 4 Jun 2019 17:16:29 +0200
Subject: [PATCH] Rename the Symfony Mailer service config to avoid conflict
 with SwitMailer

---
 .../Bundle/FrameworkBundle/Resources/config/mailer.xml       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml
index 241c1ab00a..d39899c0a9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml
@@ -5,11 +5,12 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="mailer" class="Symfony\Component\Mailer\Mailer">
+        <service id="mailer.mailer" class="Symfony\Component\Mailer\Mailer">
             <argument type="service" id="mailer.transport" />
             <argument type="service" id="messenger.default_bus" on-invalid="ignore" />
         </service>
-        <service id="Symfony\Component\Mailer\MailerInterface" alias="mailer" />
+        <service id="mailer" alias="mailer.mailer" />
+        <service id="Symfony\Component\Mailer\MailerInterface" alias="mailer.mailer" />
 
         <service id="mailer.transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
             <factory class="Symfony\Component\Mailer\Transport" method="fromDsn" />