Fix dependency error on a non-existent parameter "fos_user.resetting.email.from_email" when resetting feature was disabled

Author: covex-nn

DependencyInjection/FOSUserExtension.php

@@ -122,6 +122,10 @@ public function load(array $configs, ContainerBuilder $container)
 
         if (!empty($config['resetting'])) {
             $this->loadResetting($config['resetting'], $container, $loader, $config['from_email']);
+        } else {
+            $emails = $container->getParameter("fos_user.from_email");
+            unset($emails["resetting"]);
+            $container->setParameter("fos_user.from_email", $emails);
         }
 
         if (!empty($config['group'])) {

Resources/config/mailer.xml

@@ -8,6 +8,10 @@
         <parameter key="fos_user.resetting.email.template">@FOSUser/Resetting/email.txt.twig</parameter>
         <parameter key="fos_user.registration.confirmation.template">@FOSUser/Registration/email.txt.twig</parameter>
         <parameter key="fos_user.email_update_confirmation.template">@FOSUser/Profile/email_update_confirmation.txt.twig</parameter>
+        <parameter key="fos_user.from_email" type="collection">
+            <parameter key="confirmation">%fos_user.registration.confirmation.from_email%</parameter>
+            <parameter key="resetting">%fos_user.resetting.email.from_email%</parameter>
+        </parameter>
     </parameters>
 
     <services>
@@ -19,10 +23,7 @@
                 <argument key="confirmation.template">%fos_user.registration.confirmation.template%</argument>
                 <argument key="resetting.template">%fos_user.resetting.email.template%</argument>
                 <argument key="email_updating.template">%fos_user.email_update_confirmation.template%</argument>
-                <argument key="from_email" type="collection">
-                    <argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>
-                    <argument key="resetting">%fos_user.resetting.email.from_email%</argument>
-                </argument>
+                <argument key="from_email" type="collection">%fos_user.from_email%</argument>
             </argument>
             <tag name="fos_user.requires_swift" />
         </service>
@@ -37,10 +38,7 @@
                     <argument key="resetting">%fos_user.resetting.email.template%</argument>
                     <argument key="email_updating">%fos_user.email_update_confirmation.template%</argument>
                 </argument>
-                <argument key="from_email" type="collection">
-                    <argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>
-                    <argument key="resetting">%fos_user.resetting.email.from_email%</argument>
-                </argument>
+                <argument key="from_email" type="collection">%fos_user.from_email%</argument>
             </argument>
             <tag name="fos_user.requires_swift" />
         </service>