From 972e1b7a168454f12e52f9ba0dfe8b538f9b6ec1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 22:13:26 +0100 Subject: [PATCH] [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation --- .../DependencyInjection/Dumper/YamlDumper.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 04fc117eee2d..8846d83e488d 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -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); } @@ -240,12 +236,12 @@ 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; } @@ -253,7 +249,7 @@ private function prepareParameters($parameters) $filtered[$key] = $value; } - return $this->escape($filtered); + return $escape ? $this->escape($filtered) : $filtered; } /**