[DI][Config] Fix empty env validation

ro0NL · ro0NL · commit d40a4f409d4d · 2018-04-04T18:31:13.000+02:00
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -476,6 +476,14 @@ protected function allowPlaceholders(): bool
         return true;
     }
 
+    /**
+     * Tests if a placeholder is being handled currently.
+     */
+    protected function isHandlingPlaceholder(): bool
+    {
+        return null !== $this->handlingPlaceholder;
+    }
+
     /**
      * Gets allowed dynamic types for this node.
      */
diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php
@@ -52,6 +52,10 @@ protected function validateType($value)
      */
     protected function isValueEmpty($value)
     {
+        if ($this->isHandlingPlaceholder()) {
+            return false;
+        }
+
         return null === $value || '' === $value;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -196,6 +196,19 @@ public function testEnvIsNotUnset()
         $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
+    public function testEmptyEnvWithCannotBeEmptyForScalarNode(): void
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension($ext = new EnvExtension());
+        $container->prependExtensionConfig('env_extension', $expected = array(
+            'scalar_node_not_empty' => '%env(SOME)%',
+        ));
+
+        $this->doProcess($container);
+
+        $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
+    }
+
     private function doProcess(ContainerBuilder $container): void
     {
         (new MergeExtensionConfigurationPass())->process($container);
@@ -213,6 +226,7 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->scalarNode('scalar_node')->end()
+                ->scalarNode('scalar_node_not_empty')->cannotBeEmpty()->end()
                 ->integerNode('int_node')->end()
                 ->floatNode('float_node')->end()
                 ->booleanNode('bool_node')->end()

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ protected function validateType($value)`
`52`	`52`	`*/`
`53`	`53`	`protected function isValueEmpty($value)`
`54`	`54`	`{`
	`55`	`+ if ($this->isHandlingPlaceholder()) {`
	`56`	`+ return false;`
	`57`	`+ }`
	`58`	`+`
`55`	`59`	`return null === $value \|\| '' === $value;`
`56`	`60`	`}`
`57`	`61`