bug symfony#17823 [DependencyInjection] fix dumped YAML string (xabbuh)

Tobion · Tobion · commit d3114d177850 · 2016-02-17T22:06:18.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] fix dumped YAML string | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- b1bb135 [DependencyInjection] fix dumped YAML string
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -88,7 +88,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->getFile()) {
-            $code .= sprintf("        file: %s\n", $definition->getFile());
+            $code .= sprintf("        file: %s\n", $this->dumper->dump($definition->getFile()));
         }
 
         if ($definition->isSynthetic()) {
@@ -108,11 +108,11 @@ private function addService($id, $definition)
         }
 
         if ($definition->getFactoryMethod()) {
-            $code .= sprintf("        factory_method: %s\n", $definition->getFactoryMethod());
+            $code .= sprintf("        factory_method: %s\n", $this->dumper->dump($definition->getFactoryMethod()));
         }
 
         if ($definition->getFactoryService()) {
-            $code .= sprintf("        factory_service: %s\n", $definition->getFactoryService());
+            $code .= sprintf("        factory_service: %s\n", $this->dumper->dump($definition->getFactoryService()));
         }
 
         if ($definition->getArguments()) {
@@ -128,7 +128,7 @@ private function addService($id, $definition)
         }
 
         if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {
-            $code .= sprintf("        scope: %s\n", $scope);
+            $code .= sprintf("        scope: %s\n", $this->dumper->dump($scope));
         }
 
         if ($callable = $definition->getConfigurator()) {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ private function addService($id, $definition)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if ($definition->getFile()) {`
`91`		`- $code .= sprintf(" file: %s\n", $definition->getFile());`
	`91`	`+ $code .= sprintf(" file: %s\n", $this->dumper->dump($definition->getFile()));`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if ($definition->isSynthetic()) {`
`@@ -108,11 +108,11 @@ private function addService($id, $definition)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if ($definition->getFactoryMethod()) {`
`111`		`- $code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod());`
	`111`	`+ $code .= sprintf(" factory_method: %s\n", $this->dumper->dump($definition->getFactoryMethod()));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if ($definition->getFactoryService()) {`
`115`		`- $code .= sprintf(" factory_service: %s\n", $definition->getFactoryService());`
	`115`	`+ $code .= sprintf(" factory_service: %s\n", $this->dumper->dump($definition->getFactoryService()));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if ($definition->getArguments()) {`
`@@ -128,7 +128,7 @@ private function addService($id, $definition)`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {`
`131`		`- $code .= sprintf(" scope: %s\n", $scope);`
	`131`	`+ $code .= sprintf(" scope: %s\n", $this->dumper->dump($scope));`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`if ($callable = $definition->getConfigurator()) {`