bug #28540 [Intl] parse numbers terminated with decimal separator (xabbuh)

nicolas-grekas · nicolas-grekas · commit 40b547e122c3 · 2018-09-22T09:42:26.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Intl] parse numbers terminated with decimal separator | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28500 | License | MIT | Doc PR | Commits ------- 4225f36 parse numbers terminated with decimal separator
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -516,7 +516,7 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
         $groupSep = $this->getAttribute(self::GROUPING_USED) ? ',' : '';
 
         // Any string before the numeric value causes error in the parsing
-        if (preg_match("/^-?(?:\.\d++|([\d{$groupSep}]++)(?:\.\d++)?)/", $value, $matches)) {
+        if (preg_match("/^-?(?:\.\d++|([\d{$groupSep}]++)(?:\.\d*+)?)/", $value, $matches)) {
             $value = $matches[0];
             $position = \strlen($value);
             if ($error = $groupSep && isset($matches[1]) && !preg_match('/^\d{1,3}+(?:(?:,\d{3})++|\d*+)$/', $matches[1])) {
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -654,6 +654,7 @@ public function parseProvider()
             array('-123,4567', false, '->parse() does not parse when invalid grouping used.', 9),
             array('-123,,456', false, '->parse() does not parse when invalid grouping used.', 4),
             array('-123,,456', -123.0, '->parse() parses when grouping is disabled.', 4, false),
+            array('239.', 239.0, '->parse() parses when string ends with decimal separator.', 4, false),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -654,6 +654,7 @@ public function parseProvider()`
`654`	`654`	`array('-123,4567', false, '->parse() does not parse when invalid grouping used.', 9),`
`655`	`655`	`array('-123,,456', false, '->parse() does not parse when invalid grouping used.', 4),`
`656`	`656`	`array('-123,,456', -123.0, '->parse() parses when grouping is disabled.', 4, false),`
	`657`	`+ array('239.', 239.0, '->parse() parses when string ends with decimal separator.', 4, false),`
`657`	`658`	`);`
`658`	`659`	`}`
`659`	`660`