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

[Config] Fix enum default value in Yaml dumper

Browse Source
This commit is contained in:
Romain Neutron 2015-09-21 17:02:29 +02:00
parent 0ad587aec3
commit d135d8282d
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
View File

@ -88,7 +88,7 @@ class YamlReferenceDumper
} }
} elseif ($node instanceof EnumNode) { } elseif ($node instanceof EnumNode) {
$comments[] = 'One of '.implode('; ', array_map('json_encode', $node->getValues())); $comments[] = 'One of '.implode('; ', array_map('json_encode', $node->getValues()));
$default = '~'; $default = $node->hasDefaultValue() ? Inline::dump($node->getDefaultValue()) : '~';
} else { } else {
$default = '~'; $default = '~';

2
src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
View File

@ -37,6 +37,7 @@ class XmlReferenceDumperTest extends \PHPUnit_Framework_TestCase
return str_replace("\n", PHP_EOL, <<<EOL return str_replace("\n", PHP_EOL, <<<EOL
<!-- Namespace: http://example.org/schema/dic/acme_root --> <!-- Namespace: http://example.org/schema/dic/acme_root -->
<!-- scalar-required: Required --> <!-- scalar-required: Required -->
<!-- enum-with-default: One of "this"; "that" -->
<!-- enum: One of "this"; "that" --> <!-- enum: One of "this"; "that" -->
<config <config
boolean="true" boolean="true"
@ -48,6 +49,7 @@ class XmlReferenceDumperTest extends \PHPUnit_Framework_TestCase
scalar-array-empty="" scalar-array-empty=""
scalar-array-defaults="elem1,elem2" scalar-array-defaults="elem1,elem2"
scalar-required="" scalar-required=""
enum-with-default="this"
enum="" enum=""
> >

1
src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
View File

@ -43,6 +43,7 @@ acme_root:
- elem1 - elem1
- elem2 - elem2
scalar_required: ~ # Required scalar_required: ~ # Required
enum_with_default: this # One of "this"; "that"
enum: ~ # One of "this"; "that" enum: ~ # One of "this"; "that"
# some info # some info

1
src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
View File

@ -34,6 +34,7 @@ class ExampleConfiguration implements ConfigurationInterface
->scalarNode('scalar_array_empty')->defaultValue(array())->end() ->scalarNode('scalar_array_empty')->defaultValue(array())->end()
->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end() ->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
->scalarNode('scalar_required')->isRequired()->end() ->scalarNode('scalar_required')->isRequired()->end()
->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
->enumNode('enum')->values(array('this', 'that'))->end() ->enumNode('enum')->values(array('this', 'that'))->end()
->arrayNode('array') ->arrayNode('array')
->info('some info') ->info('some info')