Skip to content

Commit 6aeeaf6

Browse files
committed
[Deprecations]: add aliases for fos user interfaces in XML
Readd missing part Add tokengenerator to util.xml
1 parent 3e9b971 commit 6aeeaf6

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

DependencyInjection/FOSUserExtension.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@ public function load(array $configs, ContainerBuilder $container)
8484
$container->setAlias('fos_user.util.email_canonicalizer', $config['service']['email_canonicalizer']);
8585
$container->setAlias('fos_user.util.username_canonicalizer', $config['service']['username_canonicalizer']);
8686
$container->setAlias('fos_user.util.token_generator', $config['service']['token_generator']);
87-
$container->setAlias('FOS\UserBundle\Util\TokenGeneratorInterface', new Alias('fos_user.util.token_generator', false));
8887
$container->setAlias('fos_user.user_manager', new Alias($config['service']['user_manager'], true));
89-
$container->setAlias('FOS\UserBundle\Model\UserManagerInterface', new Alias('fos_user.user_manager', false));
90-
$container->setAlias('FOS\UserBundle\Util\PasswordUpdaterInterface', new Alias('fos_user.util.password_updater', false));
91-
$container->setAlias('FOS\UserBundle\Util\CanonicalFieldsUpdater', new Alias('fos_user.util.canonical_fields_updater', false));
92-
$container->setAlias('FOS\UserBundle\Security\LoginManagerInterface', new Alias('fos_user.security.login_manager', false));
9388

9489
if ($config['use_listener'] && isset(self::$doctrineDrivers[$config['db_driver']])) {
9590
$listenerDefinition = $container->getDefinition('fos_user.user_listener');

Resources/config/doctrine.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<argument>%fos_user.model.user.class%</argument>
1313
</service>
1414

15+
<service id="FOS\UserBundle\Model\UserManagerInterface" alias="fos_user.user_manager" public="false" />
16+
1517
<!-- The factory is configured in the DI extension class to support more Symfony versions -->
1618
<service id="fos_user.object_manager" class="Doctrine\Common\Persistence\ObjectManager" public="false">
1719
<argument>%fos_user.model_manager_name%</argument>

Resources/config/security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<argument>null</argument> <!-- remember_me service -->
2424
</service>
2525

26-
<service id="FOS\UserBundle\Security\LoginManagerInterface" alias="fos_user.security.login_manager" />
26+
<service id="FOS\UserBundle\Security\LoginManagerInterface" alias="fos_user.security.login_manager" public="false" />
2727

2828
<service id="fos_user.user_provider.username" class="FOS\UserBundle\Security\UserProvider" public="false">
2929
<argument type="service" id="fos_user.user_manager" />

Resources/config/util.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616

1717
<service id="fos_user.util.token_generator.default" class="FOS\UserBundle\Util\TokenGenerator" public="false" />
1818

19+
<service id="FOS\UserBundle\Util\TokenGeneratorInterface" alias="fos_user.util.token_generator" public="false" />
20+
1921
<service id="fos_user.util.password_updater" class="FOS\UserBundle\Util\PasswordUpdater" public="false">
2022
<argument type="service" id="security.encoder_factory" />
2123
</service>
2224

25+
<service id="FOS\UserBundle\Util\PasswordUpdaterInterface" alias="fos_user.util.password_updater" public="false" />
26+
2327
<service id="fos_user.util.canonical_fields_updater" class="FOS\UserBundle\Util\CanonicalFieldsUpdater" public="false">
2428
<argument type="service" id="fos_user.util.username_canonicalizer" />
2529
<argument type="service" id="fos_user.util.email_canonicalizer" />
2630
</service>
2731

32+
<service id="FOS\UserBundle\Util\CanonicalFieldsUpdater" alias="fos_user.util.canonical_fields_updater" public="false" />
2833

2934
</services>
3035

0 commit comments

Comments
 (0)