Fixed Yaml loader/dumper to use underscores

wouterj · wouterj · commit 9ba2861408be · 2014-04-10T14:44:40.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -143,7 +143,7 @@ private function addService($id, $definition)
             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);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -235,7 +235,7 @@ private function parseDefinition($id, $service, $file)
         }
 
         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);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -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
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private function addService($id, $definition)`
`143`	`143`	`list ($decorated, $renamedId) = $decorated;`
`144`	`144`	`$code .= sprintf(" decorates: %s\n", $decorated);`
`145`	`145`	`if (null !== $renamedId) {`
`146`		`- $code .= sprintf(" decoration-inner-name: %s\n", $renamedId);`
	`146`	`+ $code .= sprintf(" decoration_inner_name: %s\n", $renamedId);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ private function parseDefinition($id, $service, $file)`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if (isset($service['decorates'])) {`
`238`		`- $renameId = isset($service['decoration-inner-name']) ? $service['decoration-inner-name'] : null;`
	`238`	`+ $renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null;`
`239`	`239`	`$definition->setDecoratedService($service['decorates'], $renameId);`
`240`	`240`	`}`
`241`	`241`