Преглед на файлове

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

Johannes Schmitt преди 14 години
родител
ревизия
8ae7a21e30
променени са 2 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 3 0
      UPDATE.md
  2. 2 6
      src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php

+ 3 - 0
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
 ------------

+ 2 - 6
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'])
             ));
         }