Allow the env() default value to be null

sroze · sroze · commit 92b7ec90457d · 2016-11-22T12:51:08.000Z
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -41,8 +41,8 @@ public function get($name)
             if ($this->has($name)) {
                 $defaultValue = parent::get($name);
 
-                if (!is_scalar($defaultValue)) {
-                    throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar, but "%s" given to "%s".', gettype($defaultValue), $name));
+                if (null !== $defaultValue && !is_scalar($defaultValue)) {
+                    throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', gettype($defaultValue), $name));
                 }
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -139,4 +139,24 @@ public function testResolveThrowsOnBadDefaultValue()
         $bag->set('env(Array_Var)', array());
         $bag->resolve();
     }
+
+    public function testGetEndAllowsNull()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->set('env(NULL_VAR)', null);
+        $bag->get('env(NULL_VAR)');
+        $bag->resolve();
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage The default value of an env() parameter must be scalar or null, but "array" given to "env(ARRAY_VAR)".
+     */
+    public function testGetThrowsOnBadDefaultValue()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->set('env(ARRAY_VAR)', array());
+        $bag->get('env(ARRAY_VAR)');
+        $bag->resolve();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ public function get($name)`
`41`	`41`	`if ($this->has($name)) {`
`42`	`42`	`$defaultValue = parent::get($name);`
`43`	`43`
`44`		`- if (!is_scalar($defaultValue)) {`
`45`		`- throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar, but "%s" given to "%s".', gettype($defaultValue), $name));`
	`44`	`+ if (null !== $defaultValue && !is_scalar($defaultValue)) {`
	`45`	`+ throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', gettype($defaultValue), $name));`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`