Skip to content

Commit 456b3d7

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (21 commits) bumped Symfony version to 2.6.8 updated VERSION for 2.6.7 updated CHANGELOG for 2.6.7 bumped Symfony version to 2.3.29 updated VERSION for 2.3.28 update CONTRIBUTORS for 2.3.28 updated CHANGELOG for 2.3.28 [Debug] Fixed ClassNotFoundFatalErrorHandlerTest [SecurityBundle] use access decision constants in config [SecurityBundle] use session auth constants in config PhpDoc fix in AbstractRememberMeServices [Filesystem] Simplified an if statement [SecurityBundle] Use Enum Nodes Instead Of Scalar [Debug 2.3] Fix test for PHP7 [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed [Translation] simplify getMessages. [Framework][Translation] added test for debug command. Run tests on hhvm instead of hhvm-nightly Use HTTPS in README and some other fixes add more entropy to generated classnames ... Conflicts: .travis.yml src/Symfony/Component/HttpKernel/Kernel.php
2 parents dd0253c + 7ed03fe commit 456b3d7

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

DependencyInjection/MainConfiguration.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1717
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1818
use Symfony\Component\Config\Definition\ConfigurationInterface;
19+
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
1920

2021
/**
2122
* This class contains the configuration information.
@@ -60,14 +61,20 @@ public function getConfigTreeBuilder()
6061
$rootNode
6162
->children()
6263
->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
63-
->scalarNode('session_fixation_strategy')->cannotBeEmpty()->info('strategy can be: none, migrate, invalidate')->defaultValue('migrate')->end()
64+
->enumNode('session_fixation_strategy')
65+
->values(array(SessionAuthenticationStrategy::NONE, SessionAuthenticationStrategy::MIGRATE, SessionAuthenticationStrategy::INVALIDATE))
66+
->defaultValue(SessionAuthenticationStrategy::MIGRATE)
67+
->end()
6468
->booleanNode('hide_user_not_found')->defaultTrue()->end()
6569
->booleanNode('always_authenticate_before_granting')->defaultFalse()->end()
6670
->booleanNode('erase_credentials')->defaultTrue()->end()
6771
->arrayNode('access_decision_manager')
6872
->addDefaultsIfNotSet()
6973
->children()
70-
->scalarNode('strategy')->defaultValue(AccessDecisionManager::STRATEGY_AFFIRMATIVE)->end()
74+
->enumNode('strategy')
75+
->values(array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, AccessDecisionManager::STRATEGY_CONSENSUS, AccessDecisionManager::STRATEGY_UNANIMOUS))
76+
->defaultValue(AccessDecisionManager::STRATEGY_AFFIRMATIVE)
77+
->end()
7178
->booleanNode('allow_if_all_abstain')->defaultFalse()->end()
7279
->booleanNode('allow_if_equal_granted_denied')->defaultTrue()->end()
7380
->end()

0 commit comments

Comments
 (0)