Skip to content

Move autowiring aliases to XML files #2725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2018
Merged

Move autowiring aliases to XML files #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aeeaf6
[Deprecations]: add aliases for fos user interfaces in XML
sandergo90 Feb 9, 2018
29a6033
Move the UserManagerInterface alias to the util file
stof Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions DependencyInjection/FOSUserExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,7 @@ public function load(array $configs, ContainerBuilder $container)
$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\UserBundle\Util\TokenGeneratorInterface', new Alias('fos_user.util.token_generator', false));
$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));
$container->setAlias('FOS\UserBundle\Util\PasswordUpdaterInterface', new Alias('fos_user.util.password_updater', false));
$container->setAlias('FOS\UserBundle\Util\CanonicalFieldsUpdater', new Alias('fos_user.util.canonical_fields_updater', false));
$container->setAlias('FOS\UserBundle\Security\LoginManagerInterface', new Alias('fos_user.security.login_manager', false));

if ($config['use_listener'] && isset(self::$doctrineDrivers[$config['db_driver']])) {
$listenerDefinition = $container->getDefinition('fos_user.user_listener');
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<argument>null</argument> <!-- remember_me service -->
</service>

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

<service id="fos_user.user_provider.username" class="FOS\UserBundle\Security\UserProvider" public="false">
<argument type="service" id="fos_user.user_manager" />
Expand Down
6 changes: 6 additions & 0 deletions Resources/config/util.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@

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

<service id="FOS\UserBundle\Util\TokenGeneratorInterface" alias="fos_user.util.token_generator" public="false" />

<service id="fos_user.util.password_updater" class="FOS\UserBundle\Util\PasswordUpdater" public="false">
<argument type="service" id="security.encoder_factory" />
</service>

<service id="FOS\UserBundle\Util\PasswordUpdaterInterface" alias="fos_user.util.password_updater" public="false" />

<service id="fos_user.util.canonical_fields_updater" class="FOS\UserBundle\Util\CanonicalFieldsUpdater" public="false">
<argument type="service" id="fos_user.util.username_canonicalizer" />
<argument type="service" id="fos_user.util.email_canonicalizer" />
</service>

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

<service id="FOS\UserBundle\Model\UserManagerInterface" alias="fos_user.user_manager" public="false" />
</services>

</container>