[DI] Fix accepting null as default env param value

nicolas-grekas · nicolas-grekas · commit 7625166b4e1f · 2016-11-15T07:20:37.000-05:00
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -96,7 +96,7 @@ public function resolve()
             }
             if (is_numeric($default = $this->parameters[$name])) {
                 $this->parameters[$name] = (string) $default;
-            } elseif (!is_string($default)) {
+            } elseif (null !== $default && !is_string($default)) {
                 throw new RuntimeException(sprintf('The default value of env parameter "%s" must be string or null, %s given.', $env, gettype($default)));
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -113,21 +113,30 @@ public function testMergeWithDifferentIdentifiersForPlaceholders()
     public function testResolveEnvCastsIntToString()
     {
         $bag = new EnvPlaceholderParameterBag();
-        $bag->get('env(INT)');
-        $bag->set('env(INT)', 2);
+        $bag->get('env(INT_VAR)');
+        $bag->set('env(Int_Var)', 2);
         $bag->resolve();
-        $this->assertSame('2', $bag->all()['env(int)']);
+        $this->assertSame('2', $bag->all()['env(int_var)']);
+    }
+
+    public function testResolveEnvAllowsNull()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->get('env(NULL_VAR)');
+        $bag->set('env(Null_Var)', null);
+        $bag->resolve();
+        $this->assertNull($bag->all()['env(null_var)']);
     }
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage The default value of env parameter "ARRAY" must be string or null, array given.
+     * @expectedExceptionMessage The default value of env parameter "ARRAY_VAR" must be string or null, array given.
      */
     public function testResolveThrowsOnBadDefaultValue()
     {
         $bag = new EnvPlaceholderParameterBag();
-        $bag->get('env(ARRAY)');
-        $bag->set('env(ARRAY)', array());
+        $bag->get('env(ARRAY_VAR)');
+        $bag->set('env(Array_Var)', array());
         $bag->resolve();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function resolve()`
`96`	`96`	`}`
`97`	`97`	`if (is_numeric($default = $this->parameters[$name])) {`
`98`	`98`	`$this->parameters[$name] = (string) $default;`
`99`		`- } elseif (!is_string($default)) {`
	`99`	`+ } elseif (null !== $default && !is_string($default)) {`
`100`	`100`	`throw new RuntimeException(sprintf('The default value of env parameter "%s" must be string or null, %s given.', $env, gettype($default)));`
`101`	`101`	`}`
`102`	`102`	`}`