浏览代码

Revert "[DependencyInjection] fixed array support for the ini loader"

This reverts commit e0ace8eaee2756c60d79681d907b01875d06e7dc.
Fabien Potencier 13 年之前
父节点
当前提交
fa13469bba

+ 4 - 6
src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php

@@ -42,12 +42,10 @@ class IniFileLoader extends FileLoader
 
         if (isset($result['parameters']) && is_array($result['parameters'])) {
             foreach ($result['parameters'] as $key => $value) {
-                if (!is_array($value)) {
-                    switch (strtolower($value)) {
-                        case 'true' : $value = true ; break;
-                        case 'false': $value = false; break;
-                        case 'null' : $value = null ; break;
-                    }
+                switch (strtolower($value)) {
+                    case 'true' : $value = true ; break;
+                    case 'false': $value = false; break;
+                    case 'null' : $value = null ; break;
                 }
                 $this->container->setParameter($key, $value);
             }

+ 0 - 3
tests/Symfony/Tests/Component/DependencyInjection/Fixtures/ini/parameters.ini

@@ -1,6 +1,3 @@
 [parameters]
   foo = bar
   bar = %foo%
-  versions[] = "1"
-  versions[] = "2"
-  versions[] = "3"

+ 1 - 1
tests/Symfony/Tests/Component/DependencyInjection/Loader/IniFileLoaderTest.php

@@ -33,7 +33,7 @@ class IniFileLoaderTest extends \PHPUnit_Framework_TestCase
         $container = new ContainerBuilder();
         $loader = new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini'));
         $loader->load('parameters.ini');
-        $this->assertEquals(array('foo' => 'bar', 'bar' => '%foo%', 'versions' => array(1, 2, 3)), $container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
+        $this->assertEquals(array('foo' => 'bar', 'bar' => '%foo%'), $container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
 
         $container = new ContainerBuilder();
         $loader = new IniFileLoader($container, new FileLocator(self::$fixturesPath.'/ini'));