[Config] #7644 add tests for passing number looking attributes as str…

…ings
symfony · Apr 20, 2013 · d98118a · d98118a
1 parent 96251ac
commit d98118a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -117,7 +117,15 @@ public function getDataForPhpize()
             array(100.0, '1e2'),
             array(-120.0, '-1.2E2'),
             array(-10100.1, '-10100.1'),
-            array(-10100.1, '-10,100.1'),
+            array('-10,100.1', '-10,100.1'),
+            array('1234 5678 9101 1121 3141', '1234 5678 9101 1121 3141'),
+            array('1,2,3,4', '1,2,3,4'),
+            array('11,22,33,44', '11,22,33,44'),
+            array('11,222,333,4', '11,222,333,4'),
+            array('1,222,333,444', '1,222,333,444'),
+            array('11,222,333,444', '11,222,333,444'),
+            array('111,222,333,444', '111,222,333,444'),
+            array('1111,2222,3333,4444,5555', '1111,2222,3333,4444,5555'),
             array('foo', 'foo'),
         );
     }

diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -193,8 +193,8 @@ public static function phpize($value)
                 return false;
             case is_numeric($value):
                 return '0x' == $value[0].$value[1] ? hexdec($value) : floatval($value);
-            case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $value):
-                return floatval(str_replace(',', '', $value));
+            case preg_match('/^(-|\+)?[0-9]+(\.[0-9]+)?$/', $value):
+                return floatval($value);
             default:
                 return $value;
         }

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml
@@ -16,7 +16,7 @@
       <parameter>on</parameter>
       <parameter>off</parameter>
       <parameter key="float">1.3</parameter>
-      <parameter>1,000.3</parameter>
+      <parameter>1000.3</parameter>
       <parameter>a string</parameter>
       <parameter type="collection">
         <parameter>foo</parameter>