Merge branch '4.2'

* 4.2:
  Debug finalized config in debug:config

Author: xabbuh

Command/ConfigDebugCommand.php

@@ -11,12 +11,12 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Command;
 
-use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\Compiler\ValidateEnvPlaceholdersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Yaml\Yaml;
 
@@ -80,15 +80,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $container = $this->compileContainer();
 
         $extensionAlias = $extension->getAlias();
-        $configs = $container->getExtensionConfig($extensionAlias);
-        $configuration = $extension->getConfiguration($configs, $container);
-
-        $this->validateConfiguration($extension, $configuration);
+        $extensionConfig = [];
+        foreach ($container->getCompilerPassConfig()->getPasses() as $pass) {
+            if ($pass instanceof ValidateEnvPlaceholdersPass) {
+                $extensionConfig = $pass->getExtensionConfig();
+                break;
+            }
+        }
 
-        $configs = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($configs));
+        if (!isset($extensionConfig[$extensionAlias])) {
+            throw new \LogicException(sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
+        }
 
-        $processor = new Processor();
-        $config = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($processor->processConfiguration($configuration, $configs)));
+        $config = $container->resolveEnvPlaceholders($extensionConfig[$extensionAlias]);
 
         if (null === $path = $input->getArgument('path')) {
             $io->title(

Tests/Functional/ConfigDebugCommandTest.php

@@ -66,6 +66,14 @@ public function testDumpUndefinedBundleOption()
         $this->assertContains('Unable to find configuration for "test.foo"', $tester->getDisplay());
     }
 
+    public function testDumpWithPrefixedEnv()
+    {
+        $tester = $this->createCommandTester();
+        $tester->execute(['name' => 'FrameworkBundle']);
+
+        $this->assertContains("cookie_httponly: '%env(bool:COOKIE_HTTPONLY)%'", $tester->getDisplay());
+    }
+
     /**
      * @return CommandTester
      */

Tests/Functional/app/ConfigDump/config.yml

@@ -4,7 +4,10 @@ imports:
 framework:
     secret: '%secret%'
     default_locale: '%env(LOCALE)%'
+    session:
+        cookie_httponly: '%env(bool:COOKIE_HTTPONLY)%'
 
 parameters:
     env(LOCALE): en
+    env(COOKIE_HTTPONLY): '1'
     secret: test