Fix misresolved parameters in debug:config on 3.2

chalasr · chalasr · commit 5f1b505e971b · 2016-12-13T20:06:03.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * A console command for dumping available configuration reference.
@@ -83,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $configs = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($configs));
 
         $processor = new Processor();
-        $config = $processor->processConfiguration($configuration, $configs);
+        $config = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($processor->processConfiguration($configuration, $configs)));
 
         if (null === $path = $input->getArgument('path')) {
             $io->title(
@@ -105,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
 
-        $io->writeln(Yaml::dump($container->getParameterBag()->resolveValue($config), 10));
+        $io->writeln(Yaml::dump($config, 10));
     }
 
     private function compileContainer()
@@ -130,7 +131,7 @@ private function compileContainer()
      *
      * @return mixed
      */
-    private function getConfigForPath(array $config = array(), $path, $alias)
+    private function getConfigForPath(array $config, $path, $alias)
     {
         $steps = explode('.', $path);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -48,6 +48,16 @@ public function testDumpBundleOption()
         $this->assertContains('foo', $tester->getDisplay());
     }
 
+    public function testParametersValuesAreResolved()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(array('name' => 'framework'));
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertContains("locale: '%env(LOCALE)%'", $tester->getDisplay());
+        $this->assertContains('secret: test', $tester->getDisplay());
+    }
+
     public function testDumpUndefinedBundleOption()
     {
         $tester = $this->createCommandTester();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
@@ -1,2 +1,10 @@
 imports:
     - { resource: ../config/default.yml }
+
+framework:
+    secret: '%secret%'
+    default_locale: '%env(LOCALE)%'
+
+parameters:
+    env(LOCALE): en
+    secret: test
