From 8ae7a21e30dd20b1099782e9d4e703c22c027374 Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Wed, 20 Apr 2011 22:20:55 +0200 Subject: [PATCH] [SecurityBundle] changed expected value for token_provider key in the rememberme section --- UPDATE.md | 3 +++ .../Security/Factory/RememberMeFactory.php | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/UPDATE.md b/UPDATE.md index 54d339d237..1d08d5854f 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -21,6 +21,9 @@ PR12 to PR13 $container->removeDefinition('my_definition'); $definition->replaceArgument(0, 'foo'); + +* In the rememberme configuration, the token_provider key now expects a real + service id instead of only a suffix. PR11 to PR12 ------------ diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php index 21f1ee1bc3..13cf66fa39 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php @@ -35,9 +35,6 @@ class RememberMeFactory implements SecurityFactoryInterface // remember me services if (isset($config['token_provider'])) { - $config['token-provider'] = $config['token_provider']; - } - if (isset($config['token-provider'])) { $templateId = 'security.authentication.rememberme.services.persistent'; $rememberMeServicesId = $templateId.'.'.$id; } else { @@ -56,10 +53,9 @@ class RememberMeFactory implements SecurityFactoryInterface $rememberMeServices->replaceArgument(1, $config['key']); $rememberMeServices->replaceArgument(2, $id); - if (isset($config['token-provider'])) { - // FIXME: make the naming assumption more flexible + if (isset($config['token_provider'])) { $rememberMeServices->addMethodCall('setTokenProvider', array( - new Reference('security.rememberme.token.provider.'.$config['token-provider']) + new Reference($config['token_provider']) )); }