[DependencyInjection] Unescape parameters for all types of injection

Nicofuma · Nicofuma · commit b7ac104b93e9 · 2015-10-20T14:28:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -895,7 +895,7 @@ public function createService(Definition $definition, $id, $tryProxy = true)
             $this->callMethod($service, $call);
         }
 
-        $properties = $this->resolveServices($parameterBag->resolveValue($definition->getProperties()));
+        $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties())));
         foreach ($properties as $name => $value) {
             $service->$name = $value;
         }
@@ -1052,7 +1052,7 @@ private function callMethod($service, $call)
             }
         }
 
-        call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1])));
+        call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1]))));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ public function createService(Definition $definition, $id, $tryProxy = true)`
`895`	`895`	`$this->callMethod($service, $call);`
`896`	`896`	`}`
`897`	`897`
`898`		`- $properties = $this->resolveServices($parameterBag->resolveValue($definition->getProperties()));`
	`898`	`+ $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties())));`
`899`	`899`	`foreach ($properties as $name => $value) {`
`900`	`900`	`$service->$name = $value;`
`901`	`901`	`}`
`@@ -1052,7 +1052,7 @@ private function callMethod($service, $call)`
`1052`	`1052`	`}`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`		`- call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1])));`
	`1055`	`+ call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1]))));`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`/**`