[DI] Avoid leaking unused env placeholders

symfony · nicolas-grekas · Jun 23, 2018 · Jun 22, 2018 · Jun 22, 2018 · 41f8494722b98d51a92f7c1516ed16fa0c93503b
commit 41f8494722b98d51a92f7c1516ed16fa0c93503b
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -84,6 +84,8 @@ public function process(ContainerBuilder $container)
        } finally {
            BaseNode::resetPlaceholders();
        }
+
+        $resolvingBag->clearUnusedEnvPlaceholders();
    }

    private static function getType($value): string

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -87,6 +87,11 @@ public function getUnusedEnvPlaceholders(): array
        return $this->unusedEnvPlaceholders;
    }

+    public function clearUnusedEnvPlaceholders()
+    {
+        $this->unusedEnvPlaceholders = array();
+    }
+
    /**
     * Merges the env placeholders of another EnvPlaceholderParameterBag.
     */

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -226,14 +226,29 @@ public function testEnvWithVariableNode(): void
    public function testConfigurationWithoutRootNode(): void
    {
        $container = new ContainerBuilder();
-        $container->registerExtension($ext = new EnvExtension(new EnvConfigurationWithoutRootNode()));
+        $container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));
        $container->loadFromExtension('env_extension');

        $this->doProcess($container);

        $this->addToAssertionCount(1);
    }

+    public function testDiscardedEnvInConfig(): void
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('env(BOOLISH)', '1');
+        $container->setParameter('boolish', '%env(BOOLISH)%');
+        $container->registerExtension(new EnvExtension());
+        $container->prependExtensionConfig('env_extension', array(
+            'array_node' => array('bool_force_cast' => '%boolish%'),
+        ));
+
+        $container->compile(true);
+
+        $this->assertSame('1', $container->getParameter('boolish'));
+    }
+
    private function doProcess(ContainerBuilder $container): void
    {
        (new MergeExtensionConfigurationPass())->process($container);
@@ -260,8 +275,19 @@ public function getConfigTreeBuilder()
                        ->ifTrue(function ($value) { return !is_array($value); })
                        ->then(function ($value) { return array('child_node' => $value); })
                    ->end()
+                    ->beforeNormalization()
+                        ->ifArray()
+                        ->then(function (array $v) {
+                            if (isset($v['bool_force_cast'])) {
+                                $v['bool_force_cast'] = (bool) $v['bool_force_cast'];
+                            }
+
+                            return $v;
+                        })
+                    ->end()
                    ->children()
                        ->scalarNode('child_node')->end()
+                        ->booleanNode('bool_force_cast')->end()
                        ->integerNode('int_unset_at_zero')
                            ->validate()
                                ->ifTrue(function ($value) { return 0 === $value; })