reverting some public services

Author: weaverryan

DependencyInjection/FOSUserExtension.php

@@ -79,10 +79,10 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('flash_notifications.xml');
         }
 
-        $container->setAlias('fos_user.mailer', new Alias($config['service']['mailer'], true));
-        $container->setAlias('fos_user.util.email_canonicalizer', new Alias($config['service']['email_canonicalizer'], true));
-        $container->setAlias('fos_user.util.username_canonicalizer', new Alias($config['service']['username_canonicalizer'], true));
-        $container->setAlias('fos_user.util.token_generator', new Alias($config['service']['token_generator'], true));
+        $container->setAlias('fos_user.mailer', $config['service']['mailer']);
+        $container->setAlias('fos_user.util.email_canonicalizer', $config['service']['email_canonicalizer']);
+        $container->setAlias('fos_user.util.username_canonicalizer', $config['service']['username_canonicalizer']);
+        $container->setAlias('fos_user.util.token_generator', $config['service']['token_generator']);
         $container->setAlias('fos_user.user_manager', new Alias($config['service']['user_manager'], true));
         $container->setAlias('FOS\UserBundle\Model\UserManagerInterface', new Alias('fos_user.user_manager', false));
 

Resources/config/group.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="fos_user.group.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory" public="true">
+        <service id="fos_user.group.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory">
             <argument type="service" id="form.factory" />
             <argument>%fos_user.group.form.name%</argument>
             <argument>%fos_user.group.form.type%</argument>

Resources/config/profile.xml

@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="fos_user.profile.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory" public="true">
+        <service id="fos_user.profile.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory">
             <argument type="service" id="form.factory" />
             <argument>%fos_user.profile.form.name%</argument>
             <argument>%fos_user.profile.form.type%</argument>

Resources/config/registration.xml

@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="fos_user.registration.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory" public="true">
+        <service id="fos_user.registration.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory">
             <argument type="service" id="form.factory" />
             <argument>%fos_user.registration.form.name%</argument>
             <argument>%fos_user.registration.form.type%</argument>

Resources/config/resetting.xml

@@ -6,7 +6,7 @@
 
     <services>
 
-        <service id="fos_user.resetting.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory" public="true">
+        <service id="fos_user.resetting.form.factory" class="FOS\UserBundle\Form\Factory\FormFactory">
             <argument type="service" id="form.factory" />
             <argument>%fos_user.resetting.form.name%</argument>
             <argument>%fos_user.resetting.form.type%</argument>

Resources/config/security.xml

@@ -15,14 +15,16 @@
             <argument type="service" id="fos_user.user_manager" />
         </service>
 
-        <service id="fos_user.security.login_manager" class="%fos_user.security.login_manager.class%" public="true">
+        <service id="fos_user.security.login_manager" class="%fos_user.security.login_manager.class%">
             <argument type="service" id="security.token_storage" />
             <argument type="service" id="security.user_checker" />
             <argument type="service" id="security.authentication.session_strategy" />
             <argument type="service" id="request_stack" />
             <argument>null</argument> <!-- remember_me service -->
         </service>
 
+        <service id="FOS\UserBundle\Security\LoginManagerInterface" alias="fos_user.security.login_manager" />
+
         <service id="fos_user.user_provider.username" class="FOS\UserBundle\Security\UserProvider" public="false">
             <argument type="service" id="fos_user.user_manager" />
         </service>

Resources/config/util.xml

@@ -8,7 +8,7 @@
 
         <service id="fos_user.util.canonicalizer.default" class="FOS\UserBundle\Util\Canonicalizer" public="false" />
 
-        <service id="fos_user.util.user_manipulator" class="FOS\UserBundle\Util\UserManipulator" public="true">
+        <service id="fos_user.util.user_manipulator" class="FOS\UserBundle\Util\UserManipulator">
             <argument type="service" id="fos_user.user_manager" />
             <argument type="service" id="event_dispatcher" />
             <argument type="service" id="request_stack" />