Load EmailUpdateListener only if registration.confirmation is enabled

Author: XWB

DependencyInjection/FOSUserExtension.php

@@ -112,7 +112,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if (!empty($config['registration'])) {
-            $this->loadRegistration($config['registration'], $container, $loader, $config['from_email']);
+            $this->loadRegistration($config['registration'], $container, $loader, $config['from_email'], $config['db_driver']);
         }
 
         if (!empty($config['change_password'])) {
@@ -150,13 +150,18 @@ private function loadProfile(array $config, ContainerBuilder $container, XmlFile
      * @param ContainerBuilder $container
      * @param XmlFileLoader    $loader
      * @param array            $fromEmail
+     * @param string           $dbDriver
      */
-    private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)
+    private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail, $dbDriver)
     {
         $loader->load('registration.xml');
 
         if ($config['confirmation']['enabled']) {
             $loader->load('email_confirmation.xml');
+
+            if ('custom' !== $dbDriver && isset(self::$doctrineDrivers[$dbDriver])) {
+                $loader->load('email_update_listener.xml');
+            }
         }
 
         if (isset($config['confirmation']['from_email'])) {

Resources/config/doctrine.xml

@@ -21,12 +21,6 @@
             <argument type="service" id="fos_user.util.password_updater" />
             <argument type="service" id="fos_user.util.canonical_fields_updater" />
         </service>
-
-        <service id="fos_user.email_update_listener" class="FOS\UserBundle\Doctrine\EmailUpdateListener" public="false">
-            <argument type="service" id="fos_user.email_update_confirmation"/>
-            <argument type="service" id="request_stack" />
-            <tag name="doctrine.event_listener" event="preUpdate" lazy="true" />
-        </service>
     </services>
 
 </container>

Resources/config/email_confirmation.xml

@@ -25,7 +25,6 @@
             <argument type="service" id="fos_user.email_encryption" />
             <argument type="service" id="event_dispatcher" />
         </service>
-
     </services>
 
 </container>

Resources/config/email_update_listener.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="fos_user.email_update_listener" class="FOS\UserBundle\Doctrine\EmailUpdateListener" public="false">
+            <argument type="service" id="fos_user.email_update_confirmation"/>
+            <argument type="service" id="request_stack" />
+            <tag name="doctrine.event_listener" event="preUpdate" lazy="true" />
+        </service>
+    </services>
+
+</container>