[DI] Updated return types of key env var resolver

bobvandevijver · bobvandevijver · commit d2ec98324951 · 2018-05-05T09:59:44.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -41,7 +41,7 @@ public static function getProvidedTypes()
             'float' => 'float',
             'int' => 'int',
             'json' => 'array',
-            'key' => 'string',
+            'key' => 'bool|int|float|string|array',
             'resolve' => 'string',
             'string' => 'string',
         );
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -38,7 +38,7 @@ public function testSimpleProcessor()
             'float' => array('float'),
             'int' => array('int'),
             'json' => array('array'),
-            'key' => array('string'),
+            'key' => array('bool', 'int', 'float', 'string', 'array'),
             'resolve' => array('string'),
             'string' => array('string'),
         );
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -379,19 +379,35 @@ public function invalidArrayValues()
         );
     }
 
-    public function testGetEnvKey()
+    /**
+     * @dataProvider arrayValues
+     */
+    public function testGetEnvKey($value)
     {
         $processor = new EnvVarProcessor(new Container());
 
-        $this->assertSame('password', $processor->getEnv('key', 'index:foo', function ($name) {
+        $this->assertSame($value['index'], $processor->getEnv('key', 'index:foo', function ($name) use ($value) {
             $this->assertSame('foo', $name);
 
-            return array(
-                'index' => 'password',
-            );
+            return $value;
         }));
     }
 
+    public function arrayValues()
+    {
+        return array(
+            array(array('index' => 'password')),
+            array(array('index' => 'true')),
+            array(array('index' => false)),
+            array(array('index' => '1')),
+            array(array('index' => 1)),
+            array(array('index' => '1.1')),
+            array(array('index' => 1.1)),
+            array(array('index' => array())),
+            array(array('index' => array('val1', 'val2'))),
+        );
+    }
+
     public function testGetEnvKeyChained()
     {
         $processor = new EnvVarProcessor(new Container());
