moving mailer loader back: its parameters need to be loaded first

weaverryan · weaverryan · commit 842164478737 · 2017-12-18T11:42:57.000-05:00
diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -69,7 +69,7 @@ public function load(array $configs, ContainerBuilder $container)
             $definition->setFactory(array(new Reference('fos_user.doctrine_registry'), 'getManager'));
         }
 
-        foreach (array('validator', 'security', 'util', 'listeners', 'commands') as $basename) {
+        foreach (array('validator', 'security', 'util', 'mailer', 'listeners', 'commands') as $basename) {
             $loader->load(sprintf('%s.xml', $basename));
         }
 
@@ -129,7 +129,6 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->mailerNeeded) {
-            $loader->load('mailer.xml');
             $container->setAlias('fos_user.mailer', $config['service']['mailer']);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function load(array $configs, ContainerBuilder $container)`
`69`	`69`	`$definition->setFactory(array(new Reference('fos_user.doctrine_registry'), 'getManager'));`
`70`	`70`	`}`
`71`	`71`
`72`		`- foreach (array('validator', 'security', 'util', 'listeners', 'commands') as $basename) {`
	`72`	`+ foreach (array('validator', 'security', 'util', 'mailer', 'listeners', 'commands') as $basename) {`
`73`	`73`	`$loader->load(sprintf('%s.xml', $basename));`
`74`	`74`	`}`
`75`	`75`
`@@ -129,7 +129,6 @@ public function load(array $configs, ContainerBuilder $container)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`if ($this->mailerNeeded) {`
`132`		`- $loader->load('mailer.xml');`
`133`	`132`	`$container->setAlias('fos_user.mailer', $config['service']['mailer']);`
`134`	`133`	`}`
`135`	`134`	`}`