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

bug #10686 Fixing Yaml Loader/Dumper to use underscores instead of dashes (WouterJ)

Browse Source 
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fixing Yaml Loader/Dumper to use underscores instead of dashes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

9ba2861 Fixed Yaml loader/dumper to use underscores
This commit is contained in:
Fabien Potencier 2014-04-10 14:59:31 +02:00
commit dbf7eeb10f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
View File

@ -143,7 +143,7 @@ class YamlDumper extends Dumper
list ($decorated, $renamedId) = $decorated;
$code .= sprintf(" decorates: %s\n", $decorated);
if (null !== $renamedId) {
$code .= sprintf(" decoration-inner-name: %s\n", $renamedId);
$code .= sprintf(" decoration_inner_name: %s\n", $renamedId);
}
}

2
src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
View File

@ -235,7 +235,7 @@ class YamlFileLoader extends FileLoader
}
if (isset($service['decorates'])) {
$renameId = isset($service['decoration-inner-name']) ? $service['decoration-inner-name'] : null;
$renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null;
$definition->setDecoratedService($service['decorates'], $renameId);
}

2
src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
View File

@ -34,4 +34,4 @@ services:
decorates: decorated
decorator_service_with_name:
decorates: decorated
decoration-inner-name: decorated.pif-pouf
decoration_inner_name: decorated.pif-pouf

2
src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
View File

@ -87,6 +87,6 @@ services:
decorator_service_with_name:
class: stdClass
decorates: decorated
decoration-inner-name: decorated.pif-pouf
decoration_inner_name: decorated.pif-pouf
alias_for_foo: @foo
alias_for_alias: @foo