Skip to content

[Config][TwigBundle] Fixed syntax error in config #39334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derrabus merged 1 commit into from
Dec 8, 2020
Merged

[Config][TwigBundle] Fixed syntax error in config #39334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
->arrayNode('globals')
->normalizeKeys(false)
->useAttributeAsKey('key')
->example(['foo' => '"@bar"', 'pi' => 3.14])
->example(['foo' => '@bar', 'pi' => 3.14])
->prototype('array')
->normalizeKeys(false)
->beforeNormalization()
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private function writeNode(NodeInterface $node, NodeInterface $parentNode = null

// example
if ($example && !\is_array($example)) {
$comments[] = 'Example: '.$example;
$comments[] = 'Example: '.Inline::dump($example);
}

$default = '' != (string) $default ? ' '.$default : '';
Expand Down Expand Up @@ -165,7 +165,7 @@ private function writeNode(NodeInterface $node, NodeInterface $parentNode = null

$this->writeLine('# '.$message.':', $depth * 4 + 4);

$this->writeArray($example, $depth + 1);
$this->writeArray(array_map([Inline::class, 'dump'], $example), $depth + 1);
}

if ($children) {
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function provideDumpAtPath()
# 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
Expand Down Expand Up @@ -112,7 +112,7 @@ enum: ~ # One of "this"; "that"
# this is a long
# multi-line info text
# which should be indented
child3: ~ # Example: example setting
child3: ~ # Example: 'example setting'
scalar_prototyped: []
parameters:

Expand Down