From 55d9c516baeaba990eb529c121bae94524e21958 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 27 Jul 2019 07:22:12 +0200 Subject: [PATCH] remove the deprecated "switch_user.stateless" option --- src/Symfony/Bundle/SecurityBundle/CHANGELOG.md | 1 + .../SecurityBundle/DependencyInjection/MainConfiguration.php | 4 ---- .../SecurityBundle/DependencyInjection/SecurityExtension.php | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md index bf63cbcc1f..602e1a0b78 100644 --- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 5.0.0 ----- + * The `switch_user.stateless` firewall option has been removed. * Removed the ability to configure encoders using `argon2i` or `bcrypt` as algorithm, use `auto` instead * The `simple_form` and `simple_preauth` authentication listeners have been removed, use Guard instead. diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php index 7e8cb99356..fae177bc0e 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php @@ -244,10 +244,6 @@ class MainConfiguration implements ConfigurationInterface ->scalarNode('provider')->end() ->scalarNode('parameter')->defaultValue('_switch_user')->end() ->scalarNode('role')->defaultValue('ROLE_ALLOWED_TO_SWITCH')->end() - ->booleanNode('stateless') - ->setDeprecated('The "%path%.%node%" configuration key has been deprecated in Symfony 4.1.') - ->defaultValue(false) - ->end() ->end() ->end() ; diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 9389b06e71..be974d01ec 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -675,7 +675,7 @@ class SecurityExtension extends Extension implements PrependExtensionInterface $listener->replaceArgument(3, $id); $listener->replaceArgument(6, $config['parameter']); $listener->replaceArgument(7, $config['role']); - $listener->replaceArgument(9, $stateless ?: $config['stateless']); + $listener->replaceArgument(9, $stateless); return $switchUserListenerId; }