8000 Merge branch '3.1' into 3.2 · symfony/symfony@c419041 · GitHub
[go: up one dir, main page]
Skip to content

Commit c419041

Browse files
fabpotfabpot
committed
Merge branch '3.1' into 3.2
* 3.1: add dependency on Twig [Config] Do not skip YamlReferenceDumperTest entirely [Config] Fix YamlReferenceDumper extra space
2 parents c90dcdd + 9369b4d commit c419041

File tree

5 files changed

+5
-1
lines changed

5 files changed

+5
-1
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"symfony/polyfill-php70": "~1.0",
2222
"symfony/routing": "~2.8|~3.0",
2323
"symfony/twig-bridge": "~2.8|~3.0",
24+
"twig/twig": "~1.28|~2.0",
2425
"symfony/var-dumper": "~3.2"
2526
},
2627
"require-dev": {

‎src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php

Lines changed: 1 addition & 1 deletion
108
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private function writeNode(NodeInterface $node, $depth = 0, $prototypedArray = f
106106
$comments = count($comments) ? '# '.implode(', ', $comments) : '';
107107

108
$key = $prototypedArray ? '-' : $node->getName().':';
109-
$text = rtrim(sprintf('%-20s %s %s', $key, $default, $comments), ' ');
109+
$text = rtrim(sprintf('%-21s%s %s', $key, $default, $comments), ' ');
110110

111111
if ($info = $node->getInfo()) {
112112
$this->writeLine('');

‎src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ private function getConfigurationAsString()
4949
scalar-array-empty=""
5050
scalar-array-defaults="elem1,elem2"
5151
scalar-required=""
52+
node-with-a-looong-name=""
5253
enum-with-default="this"
5354
enum=""
5455
>

‎src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ private function getConfigurationAsString()
4242
- elem1
4343
- elem2
4444
scalar_required: ~ # Required
45+
node_with_a_looong_name: ~
4546
enum_with_default: this # One of "this"; "that"
4647
enum: ~ # One of "this"; "that"
4748

‎src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public function getConfigTreeBuilder()
3535
->scalarNode('scalar_array_empty')->defaultValue(array())->end()
3636
->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
3737
->scalarNode('scalar_required')->isRequired()->end()
38+
->scalarNode('node_with_a_looong_name')->end()
3839
->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
3940
->enumNode('enum')->values(array('this', 'that'))->end()
4041
->arrayNode('array')

0 commit comments

Comments
 (0)
0