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

bug #39334 [Config][TwigBundle] Fixed syntax error in config (Nyholm) 

This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

[Config][TwigBundle] Fixed syntax error in config

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Sorry for such small PR. I found this when I was parsing the yaml after running `bin/console config:dump-reference TwigBundle`

#SymfonyHackday

Commits
-------

04d369d336 [Config][TwigBundle] Fixed syntax error in config
This commit is contained in:
Alexander M. Turek 2020-12-08 15:10:36 +01:00
parent 891e2afb64 04d369d336
commit 8f331f2df2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
View File

@ -88,7 +88,7 @@ class Configuration implements ConfigurationInterface
->arrayNode('globals')
->normalizeKeys(false)
->useAttributeAsKey('key')
->example(['foo' => '"@bar"', 'pi' => 3.14])
->example(['foo' => '@bar', 'pi' => 3.14])
->prototype('array')
->normalizeKeys(false)
->beforeNormalization()

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

@ -129,7 +129,7 @@ class YamlReferenceDumper
// example
if ($example && !\is_array($example)) {
$comments[] = 'Example: '.$example;
$comments[] = 'Example: '.Inline::dump($example);
}
$default = '' != (string) $default ? ' '.$default : '';
@ -165,7 +165,7 @@ class YamlReferenceDumper
$this->writeLine('# '.$message.':', $depth * 4 + 4);
$this->writeArray($example, $depth + 1);
$this->writeArray(array_map([Inline::class, 'dump'], $example), $depth + 1);
}
if ($children) {

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

@ -42,7 +42,7 @@ array:
# this is a long
# multi-line info text
# which should be indented
child3: ~ # Example: example setting
child3: ~ # Example: 'example setting'
EOL
],
'Regular nested' => ['array.child2', <<<EOL
@ -112,7 +112,7 @@ acme_root:
# this is a long
# multi-line info text
# which should be indented
child3: ~ # Example: example setting
child3: ~ # Example: 'example setting'
scalar_prototyped: []
parameters: