Skip to content

Commit

Permalink
[DependencyInjection] fixed a bug in the YAML dumper where references…
Browse files Browse the repository at this point in the history
… where not converted to the @ notation
  • Loading branch information
fabpot committed Jan 17, 2013
1 parent 51d1948 commit 972e1b7
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
Expand Up @@ -166,11 +166,7 @@ private function addParameters()
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);
}
Expand Down Expand Up @@ -240,20 +236,20 @@ private function getParameterCall($id)
*
* @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;
}

$filtered[$key] = $value;
}

return $this->escape($filtered);
return $escape ? $this->escape($filtered) : $filtered;
}

/**
Expand Down

0 comments on commit 972e1b7

Please sign in to comment.