From a32646e35b6993213eb411fd387777c4f5ce363a Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 26 Jul 2014 20:45:30 +0200 Subject: [PATCH] [SecurityBundle] fix constructor argument index As @excelwebzone pointed out in fb9dc6a, `catchExceptions` is the 6th argument of the RememberMeListener constructor. --- .../Security/Factory/RememberMeFactory.php | 2 +- .../Tests/DependencyInjection/CompleteConfigurationTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php index 679b1db96f..dde5beaad0 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php @@ -102,7 +102,7 @@ class RememberMeFactory implements SecurityFactoryInterface $listenerId = 'security.authentication.listener.rememberme.'.$id; $listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.authentication.listener.rememberme')); $listener->replaceArgument(1, new Reference($rememberMeServicesId)); - $listener->replaceArgument(4, $config['catch_exceptions']); + $listener->replaceArgument(5, $config['catch_exceptions']); return array($authProviderId, $listenerId, $defaultEntryPoint); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php index cf79e9bfd9..eb609b8ccc 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php @@ -223,7 +223,7 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase public function testRememberMeThrowExceptionsDefault() { $container = $this->getContainer('container1'); - $this->assertTrue($container->getDefinition('security.authentication.listener.rememberme.secure')->getArgument(4)); + $this->assertTrue($container->getDefinition('security.authentication.listener.rememberme.secure')->getArgument(5)); } public function testRememberMeThrowExceptions() @@ -231,7 +231,7 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase $container = $this->getContainer('remember_me_options'); $service = $container->getDefinition('security.authentication.listener.rememberme.main'); $this->assertEquals('security.authentication.rememberme.services.persistent.main', $service->getArgument(1)); - $this->assertFalse($service->getArgument(4)); + $this->assertFalse($service->getArgument(5)); } protected function getContainer($file)