Merge branch '4.2'

xabbuh · xabbuh · commit f806e68613f0 · 2019-03-25T14:12:22.000+01:00
* 4.2:
  Debug finalized config in debug:config
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/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(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/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
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml b/src/Symfony/Bundle/FrameworkBundle/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
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -28,11 +28,15 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface
 {
     private static $typeFixtures = ['array' => [], 'bool' => false, 'float' => 0.0, 'int' => 0, 'string' => ''];
 
+    private $extensionConfig = [];
+
     /**
      * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
+        $this->extensionConfig = [];
+
         if (!class_exists(BaseNode::class) || !$extensions = $container->getExtensions()) {
             return;
         }
@@ -77,7 +81,7 @@ public function process(ContainerBuilder $container)
                 }
 
                 try {
-                    $processor->processConfiguration($configuration, $config);
+                    $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
                 } catch (TreeWithoutRootNodeException $e) {
                 }
             }
@@ -88,6 +92,18 @@ public function process(ContainerBuilder $container)
         $resolvingBag->clearUnusedEnvPlaceholders();
     }
 
+    /**
+     * @internal
+     */
+    public function getExtensionConfig(): array
+    {
+        try {
+            return $this->extensionConfig;
+        } finally {
+            $this->extensionConfig = [];
+        }
+    }
+
     private static function getType($value): string
     {
         switch ($type = \gettype($value)) {

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,15 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface`
`28`	`28`	`{`
`29`	`29`	`private static $typeFixtures = ['array' => [], 'bool' => false, 'float' => 0.0, 'int' => 0, 'string' => ''];`
`30`	`30`
	`31`	`+ private $extensionConfig = [];`
	`32`	`+`
`31`	`33`	`/**`
`32`	`34`	`* {@inheritdoc}`
`33`	`35`	`*/`
`34`	`36`	`public function process(ContainerBuilder $container)`
`35`	`37`	`{`
	`38`	`+ $this->extensionConfig = [];`
	`39`	`+`
`36`	`40`	`if (!class_exists(BaseNode::class) \|\| !$extensions = $container->getExtensions()) {`
`37`	`41`	`return;`
`38`	`42`	`}`
`@@ -77,7 +81,7 @@ public function process(ContainerBuilder $container)`
`77`	`81`	`}`
`78`	`82`
`79`	`83`	`try {`
`80`		`- $processor->processConfiguration($configuration, $config);`
	`84`	`+ $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);`
`81`	`85`	`} catch (TreeWithoutRootNodeException $e) {`
`82`	`86`	`}`
`83`	`87`	`}`
`@@ -88,6 +92,18 @@ public function process(ContainerBuilder $container)`
`88`	`92`	`$resolvingBag->clearUnusedEnvPlaceholders();`
`89`	`93`	`}`
`90`	`94`
	`95`	`+ /**`
	`96`	`+ * @internal`
	`97`	`+ */`
	`98`	`+ public function getExtensionConfig(): array`
	`99`	`+ {`
	`100`	`+ try {`
	`101`	`+ return $this->extensionConfig;`
	`102`	`+ } finally {`
	`103`	`+ $this->extensionConfig = [];`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`91`	`107`	`private static function getType($value): string`
`92`	`108`	`{`
`93`	`109`	`switch ($type = \gettype($value)) {`