diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SecurityBundle] Fix compat with HttpFoundation >=3.4

Browse Source
This commit is contained in:
Nicolas Grekas 2017-12-04 13:50:51 +01:00
parent 5b997f1f21
commit c9f72e2807
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
View File

@ -15,6 +15,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\AbstractSessionHandler;
/**
* AbstractFactory is the base class for all classes inheriting from
@ -29,7 +30,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface
protected $options = array(
'check_path' => '/login_check',
'use_forward' => false,
'require_previous_session' => true,
'require_previous_session' => null,
);
protected $defaultSuccessHandlerOptions = array(
@ -80,6 +81,10 @@ abstract class AbstractFactory implements SecurityFactoryInterface
->scalarNode('failure_handler')->end()
;
if (array_key_exists('require_previous_session', $this->options) && null === $this->options['require_previous_session']) {
$this->options['require_previous_session'] = !class_exists(AbstractSessionHandler::class);
}
foreach (array_merge($this->options, $this->defaultSuccessHandlerOptions, $this->defaultFailureHandlerOptions) as $name => $default) {
if (is_bool($default)) {
$builder->booleanNode($name)->defaultValue($default);