Skip to content

Commit 6adb8e5

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs Remove var not used due to returning early (introduced in 8982c32) Enhance hhvm test skip message
2 parents c12bfe3 + de3abd1 commit 6adb8e5

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

DependencyInjection/MainConfiguration.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
162162
->cannotBeOverwritten()
163163
->prototype('array')
164164
->fixXmlConfig('ip')
165+
->fixXmlConfig('method')
165166
->children()
166167
->scalarNode('requires_channel')->defaultNull()->end()
167168
->scalarNode('path')

0 commit comments

Comments
 (0)