Skip to content

Commit 884594e

Browse files
Merge branch '2.3' into 2.7
* 2.3: [php7] Fix for substr() always returning a string [Security] Do not save the target path in the session for a stateless firewall [DependencyInjection] fixed FrozenParameterBag and improved Parameter… Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
2 parents ddbab22 + 6ff8306 commit 884594e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

DependencyInjection/SecurityExtension.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
366366
$listeners[] = new Reference('security.access_listener');
367367

368368
// Exception listener
369-
$exceptionListener = new Reference($this->createExceptionListener($container, $firewall, $id, $configuredEntryPoint ?: $defaultEntryPoint));
369+
$exceptionListener = new Reference($this->createExceptionListener($container, $firewall, $id, $configuredEntryPoint ?: $defaultEntryPoint, $firewall['stateless']));
370370

371371
return array($matcher, $listeners, $exceptionListener);
372372
}
@@ -551,12 +551,13 @@ private function getUserProviderId($name)
551551
return 'security.user.provider.concrete.'.$name;
552552
}
553553

554-
private function createExceptionListener($container, $config, $id, $defaultEntryPoint)
554+
private function createExceptionListener($container, $config, $id, $defaultEntryPoint, $stateless)
555555
{
556556
$exceptionListenerId = 'security.exception_listener.'.$id;
557557
$listener = $container->setDefinition($exceptionListenerId, new DefinitionDecorator('security.exception_listener'));
558558
$listener->replaceArgument(3, $id);
559559
$listener->replaceArgument(4, null === $defaultEntryPoint ? null : new Reference($defaultEntryPoint));
560+
$listener->replaceArgument(8, $stateless);
560561

561562
// access denied handler setup
562563
if (isset($config['access_denied_handler'])) {

Resources/config/security_listeners.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244
<argument>%security.access.denied_url%</argument>
245245
<argument type="service" id="security.access.denied_handler" on-invalid="null" />
246246
<argument type="service" id="logger" on-invalid="null" />
247+
<argument>false</argument> <!-- Stateless -->
247248
</service>
248249

249250
<service id="security.authentication.switchuser_listener" class="%security.authentication.switchuser_listener.class%" public="false" abstract="true">

0 commit comments

Comments
 (0)