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

[DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation

Browse Source
This commit is contained in:
Fabien Potencier 2013-01-17 22:13:26 +01:00
parent 51d1948327
commit 972e1b7a16
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,11 +166,7 @@ class YamlDumper extends Dumper
return '';
}
if ($this->container->isFrozen()) {
$parameters = $this->prepareParameters($this->container->getParameterBag()->all());
} else {
$parameters = $this->container->getParameterBag()->all();
}
$parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isFrozen());
return Yaml::dump(array('parameters' => $parameters), 2);
}
@ -240,12 +236,12 @@ class YamlDumper extends Dumper
*
* @return array
*/
private function prepareParameters($parameters)
private function prepareParameters($parameters, $escape = true)
{
$filtered = array();
foreach ($parameters as $key => $value) {
if (is_array($value)) {
$value = $this->prepareParameters($value);
$value = $this->prepareParameters($value, $escape);
} elseif ($value instanceof Reference) {
$value = '@'.$value;
}
@ -253,7 +249,7 @@ class YamlDumper extends Dumper
$filtered[$key] = $value;
}
return $this->escape($filtered);
return $escape ? $this->escape($filtered) : $filtered;
}
/**