Skip to content

Commit ddbab22

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) Enhance hhvm test skip message
2 parents 1abc3f6 + 6adb8e5 commit ddbab22

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

DependencyInjection/MainConfiguration.php

Lines changed: 2 additions & 1 deletion
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')
@@ -286,7 +287,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
286287
->arrayNode('anonymous')
287288
->canBeUnset()
288289
->children()
289-
->scalarNode('key')->defaultValue(uniqid())->end()
290+
->scalarNode('key')->defaultValue(uniqid('', true))->end()
290291
->end()
291292
->end()
292293
->arrayNode('switch_user')

DependencyInjection/Security/UserProvider/InMemoryFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function addConfiguration(NodeDefinition $node)
5454
->useAttributeAsKey('name')
5555
->prototype('array')
5656
->children()
57-
->scalarNode('password')->defaultValue(uniqid())->end()
57+
->scalarNode('password')->defaultValue(uniqid('', true))->end()
5858
->arrayNode('roles')
5959
->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
6060
->prototype('scalar')->end()

0 commit comments

Comments
 (0)