Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 3ccbec3497d2 · 2018-06-15T10:20:40.000+02:00
* 4.1:
  fix merge
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -136,13 +136,11 @@ public function testGuardHandlerIsPassedStatelessFirewalls()
                 'some_firewall' => array(
                     'pattern' => '^/admin',
                     'http_basic' => null,
-                    'logout_on_user_change' => true,
                 ),
                 'stateless_firewall' => array(
                     'pattern' => '/.*',
                     'stateless' => true,
                     'http_basic' => null,
-                    'logout_on_user_change' => true,
                 ),
             ),
         ));
