Merge branch '4.1'

* 4.1:
  fix merge
This commit is contained in:
Nicolas Grekas 2018-06-15 10:20:40 +02:00
commit 3ccbec3497

View File

@ -136,13 +136,11 @@ class SecurityExtensionTest extends TestCase
'some_firewall' => array( 'some_firewall' => array(
'pattern' => '^/admin', 'pattern' => '^/admin',
'http_basic' => null, 'http_basic' => null,
'logout_on_user_change' => true,
), ),
'stateless_firewall' => array( 'stateless_firewall' => array(
'pattern' => '/.*', 'pattern' => '/.*',
'stateless' => true, 'stateless' => true,
'http_basic' => null, 'http_basic' => null,
'logout_on_user_change' => true,
), ),
), ),
)); ));