Merge branch '4.1'

* 4.1:
  [DI] align IniFileLoader to PHP bugfix #76965
  Remove unused dependency

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -50,7 +50,6 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\DependencyInjection\TranslatorPass;
 use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
-use Symfony\Component\Validator\Validation;
 use Symfony\Component\Workflow;
 
 abstract class FrameworkExtensionTest extends TestCase

src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php

@@ -70,7 +70,9 @@ public function supports($resource, $type = null)
     private function phpize($value)
     {
         // trim on the right as comments removal keep whitespaces
-        $value = rtrim($value);
+        if ($value !== $v = rtrim($value)) {
+            $value = '""' === substr_replace($v, '', 1, -1) ? substr($v, 1, -1) : $v;
+        }
         $lowercaseValue = strtolower($value);
 
         switch (true) {

src/Symfony/Component/DependencyInjection/Tests/Fixtures/ini/types.ini

@@ -11,9 +11,10 @@
   constant = PHP_VERSION
   12 = 12
   12_string = '12'
+  12_quoted_number = "12"
   12_comment = 12 ; comment
   12_string_comment = '12' ; comment
-  12_string_comment_again = "12" ; comment
+  12_quoted_number_comment = "12" ; comment
   -12 = -12
   0 = 0
   1 = 1

src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php

@@ -53,7 +53,6 @@ public function testTypeConversionsWithNativePhp($key, $value, $supported)
             $this->markTestSkipped(sprintf('Converting the value "%s" to "%s" is not supported by the IniFileLoader.', $key, $value));
         }
 
-        $this->loader->load('types.ini');
         $expected = parse_ini_file(__DIR__.'/../Fixtures/ini/types.ini', true, INI_SCANNER_TYPED);
         $this->assertSame($value, $expected['parameters'][$key], '->load() converts values to PHP types');
     }
@@ -73,9 +72,10 @@ public function getTypeConversions()
             array('constant', PHP_VERSION, true),
             array('12', 12, true),
             array('12_string', '12', true),
+            array('12_quoted_number', 12, false), // INI_SCANNER_RAW removes the double quotes
             array('12_comment', 12, true),
             array('12_string_comment', '12', true),
-            array('12_string_comment_again', '12', true),
+            array('12_quoted_number_comment', 12, false), // INI_SCANNER_RAW removes the double quotes
             array('-12', -12, true),
             array('1', 1, true),
             array('0', 0, true),