[DependencyInjection] fixed ini file values conversion

fabpot · fabpot · commit ea41f768380f · 2016-10-17T21:05:57.000-07:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\Config\Util\XmlUtils;
 
 /**
  * IniFileLoader loads parameters from INI files.
@@ -30,14 +31,14 @@ public function load($resource, $type = null)
 
         $this->container->addResource(new FileResource($path));
 
-        $result = parse_ini_file($path, true);
+        $result = parse_ini_file($path, true, INI_SCANNER_RAW);
         if (false === $result || array() === $result) {
             throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));
         }
 
         if (isset($result['parameters']) && is_array($result['parameters'])) {
             foreach ($result['parameters'] as $key => $value) {
-                $this->container->setParameter($key, $value);
+                $this->container->setParameter($key, XmlUtils::phpize($value));
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ini/types.ini b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ini/types.ini
@@ -0,0 +1,16 @@
+[parameters]
+  true = true
+  false = false
+  null = null
+  12 = 12
+  -12 = -12
+  0 = 0
+  1 = 1
+  0b0110 = 0b0110
+  11112222333344445555 = 1111,2222,3333,4444,5555
+  0777 = 0777
+  255 = 0xFF
+  100.0 = 1e2
+  -120.0 = -1.2E2
+  -10100.1 = -10100.1
+  -10,100.1 = -10,100.1
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -17,20 +17,13 @@
 
 class IniFileLoaderTest extends \PHPUnit_Framework_TestCase
 {
-    protected static $fixturesPath;
-
     protected $container;
     protected $loader;
 
-    public static function setUpBeforeClass()
-    {
-        self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
-    }
-
     protected function setUp()
     {
         $this->container = new ContainerBuilder();
-        $this->loader = new IniFileLoader($this->container, new FileLocator(self::$fixturesPath.'/ini'));
+        $this->loader = new IniFileLoader($this->container, new FileLocator(realpath(__DIR__.'/../Fixtures/').'/ini'));
     }
 
     public function testIniFileCanBeLoaded()
@@ -39,6 +32,29 @@ public function testIniFileCanBeLoaded()
         $this->assertEquals(array('foo' => 'bar', 'bar' => '%foo%'), $this->container->getParameterBag()->all(), '->load() takes a single file name as its first argument');
     }
 
+    public function testTypeConversions()
+    {
+        $this->loader->load('types.ini');
+        $expected = array(
+            'true' => true,
+            'false' => false,
+            'null' => null,
+            '12' => 12,
+            '-12' => -12,
+            '1' => 1,
+            '0' => 0,
+            '0b0110' => 6,
+            '11112222333344445555' => '1111,2222,3333,4444,5555',
+            '0777' => 0777,
+            '255' => 0xFF,
+            '100.0' => 1e2,
+            '-120.0' => -1.2E2,
+            '-10100.1' => -10100.1,
+            '-10,100.1' => '-10,100.1',
+        );
+        $this->assertEquals($expected, $this->container->getParameterBag()->all(), '->load() converts values to PHP types');
+    }
+
     /**
      * @expectedException        \InvalidArgumentException
      * @expectedExceptionMessage The file "foo.ini" does not exist (in:
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -164,6 +164,7 @@ public function testLoadImports()
         );
 
         $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
+        $this->assertTrue($actual['imported_from_ini']);
 
         // Bad import throws no exception due to ignore_errors value.
         $loader->load('services4_bad_import.xml');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -115,6 +115,7 @@ public function testLoadImports()
         $actual = $container->getParameterBag()->all();
         $expected = array('foo' => 'bar', 'values' => array(true, false), 'bar' => '%foo%', 'escape' => '@escapeme', 'foo_bar' => new Reference('foo_bar'), 'mixedcase' => array('MixedCaseKey' => 'value'), 'imported_from_ini' => true, 'imported_from_xml' => true);
         $this->assertEquals(array_keys($expected), array_keys($actual), '->load() imports and merges imported files');
+        $this->assertTrue($actual['imported_from_ini']);
 
         // Bad import throws no exception due to ignore_errors value.
         $loader->load('services4_bad_import.yml');

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Config\Resource\FileResource;`
`15`	`15`	`use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
	`16`	`+use Symfony\Component\Config\Util\XmlUtils;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* IniFileLoader loads parameters from INI files.`
`@@ -30,14 +31,14 @@ public function load($resource, $type = null)`
`30`	`31`
`31`	`32`	`$this->container->addResource(new FileResource($path));`
`32`	`33`
`33`		`- $result = parse_ini_file($path, true);`
	`34`	`+ $result = parse_ini_file($path, true, INI_SCANNER_RAW);`
`34`	`35`	`if (false === $result \|\| array() === $result) {`
`35`	`36`	`throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`if (isset($result['parameters']) && is_array($result['parameters'])) {`
`39`	`40`	`foreach ($result['parameters'] as $key => $value) {`
`40`		`- $this->container->setParameter($key, $value);`
	`41`	`+ $this->container->setParameter($key, XmlUtils::phpize($value));`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`