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

[Config] Fix array sort on normalization in edge case

Browse Source
This commit is contained in:
Romain Neutron 2015-12-24 14:08:20 +01:00
parent 45a006046d
commit eca41a8fbf
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Config/Definition/ArrayNode.php
View File

@ -75,14 +75,17 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
return $value; return $value;
} }
$normalized = array();
foreach ($value as $k => $v) { foreach ($value as $k => $v) {
if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) { if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) {
$value[$normalizedKey] = $v; $normalized[$normalizedKey] = $v;
unset($value[$k]); } else {
$normalized[$k] = $v;
} }
} }
return $value; return $normalized;
} }
/** /**

4
src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
View File

@ -74,6 +74,10 @@ class ArrayNodeTest extends \PHPUnit_Framework_TestCase
array('foo-bar_moo' => 'foo'), array('foo-bar_moo' => 'foo'),
array('foo-bar_moo' => 'foo'), array('foo-bar_moo' => 'foo'),
), ),
array(
array('anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'),
array('anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'),
),
array( array(
array('foo-bar' => null, 'foo_bar' => 'foo'), array('foo-bar' => null, 'foo_bar' => 'foo'),
array('foo-bar' => null, 'foo_bar' => 'foo'), array('foo-bar' => null, 'foo_bar' => 'foo'),