[SecurityBundle] changed expected value for token_provider key in the rememberme section
This commit is contained in:
parent
fd1636b324
commit
8ae7a21e30
@ -21,6 +21,9 @@ PR12 to PR13
|
|||||||
|
|
||||||
$container->removeDefinition('my_definition');
|
$container->removeDefinition('my_definition');
|
||||||
$definition->replaceArgument(0, 'foo');
|
$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
|
PR11 to PR12
|
||||||
------------
|
------------
|
||||||
|
@ -35,9 +35,6 @@ class RememberMeFactory implements SecurityFactoryInterface
|
|||||||
|
|
||||||
// remember me services
|
// remember me services
|
||||||
if (isset($config['token_provider'])) {
|
if (isset($config['token_provider'])) {
|
||||||
$config['token-provider'] = $config['token_provider'];
|
|
||||||
}
|
|
||||||
if (isset($config['token-provider'])) {
|
|
||||||
$templateId = 'security.authentication.rememberme.services.persistent';
|
$templateId = 'security.authentication.rememberme.services.persistent';
|
||||||
$rememberMeServicesId = $templateId.'.'.$id;
|
$rememberMeServicesId = $templateId.'.'.$id;
|
||||||
} else {
|
} else {
|
||||||
@ -56,10 +53,9 @@ class RememberMeFactory implements SecurityFactoryInterface
|
|||||||
$rememberMeServices->replaceArgument(1, $config['key']);
|
$rememberMeServices->replaceArgument(1, $config['key']);
|
||||||
$rememberMeServices->replaceArgument(2, $id);
|
$rememberMeServices->replaceArgument(2, $id);
|
||||||
|
|
||||||
if (isset($config['token-provider'])) {
|
if (isset($config['token_provider'])) {
|
||||||
// FIXME: make the naming assumption more flexible
|
|
||||||
$rememberMeServices->addMethodCall('setTokenProvider', array(
|
$rememberMeServices->addMethodCall('setTokenProvider', array(
|
||||||
new Reference('security.rememberme.token.provider.'.$config['token-provider'])
|
new Reference($config['token_provider'])
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user