[SecurityBundle] changed expected value for token_provider key in the rememberme section

This commit is contained in:
Johannes Schmitt 2011-04-20 22:20:55 +02:00
parent fd1636b324
commit 8ae7a21e30
2 changed files with 5 additions and 6 deletions

View File

@ -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
------------

View File

@ -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'])
));
}