[Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers

nicolas-grekas · nicolas-grekas · commit 03c008cdbfa7 · 2016-03-15T16:37:19.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -122,12 +122,16 @@ public function reverseTransform($value)
             $value = str_replace(',', $decSep, $value);
         }
 
-        if (!strstr($value, $decSep) && PHP_INT_SIZE === 8) {
-            $result = $formatter->parse($value, \NumberFormatter::TYPE_INT64, $position);
+        if (false !== strpos($value, $decSep)) {
+            $type = \NumberFormatter::TYPE_DOUBLE;
         } else {
-            $result = $formatter->parse($value, \NumberFormatter::TYPE_DOUBLE, $position);
+            $type = PHP_INT_SIZE === 8
+                ? \NumberFormatter::TYPE_INT64
+                : \NumberFormatter::TYPE_INT32;
         }
 
+        $result = $formatter->parse($value, $type, $position);
+
         if (intl_is_failure($formatter->getErrorCode())) {
             throw new TransformationFailedException($formatter->getErrorMessage());
         }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -438,6 +438,6 @@ public function testReverseTransformBigint()
     {
         $transformer = new NumberToLocalizedStringTransformer(null, true);
 
-        $this->assertEquals(401657096594165125, (int) $transformer->reverseTransform((string) 401657096594165125));
+        $this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,16 @@ public function reverseTransform($value)`
`122`	`122`	`$value = str_replace(',', $decSep, $value);`
`123`	`123`	`}`
`124`	`124`
`125`		`- if (!strstr($value, $decSep) && PHP_INT_SIZE === 8) {`
`126`		`- $result = $formatter->parse($value, \NumberFormatter::TYPE_INT64, $position);`
	`125`	`+ if (false !== strpos($value, $decSep)) {`
	`126`	`+ $type = \NumberFormatter::TYPE_DOUBLE;`
`127`	`127`	`} else {`
`128`		`- $result = $formatter->parse($value, \NumberFormatter::TYPE_DOUBLE, $position);`
	`128`	`+ $type = PHP_INT_SIZE === 8`
	`129`	`+ ? \NumberFormatter::TYPE_INT64`
	`130`	`+ : \NumberFormatter::TYPE_INT32;`
`129`	`131`	`}`
`130`	`132`
	`133`	`+ $result = $formatter->parse($value, $type, $position);`
	`134`	`+`
`131`	`135`	`if (intl_is_failure($formatter->getErrorCode())) {`
`132`	`136`	`throw new TransformationFailedException($formatter->getErrorMessage());`
`133`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,6 +438,6 @@ public function testReverseTransformBigint()`
`438`	`438`	`{`
`439`	`439`	`$transformer = new NumberToLocalizedStringTransformer(null, true);`
`440`	`440`
`441`		`- $this->assertEquals(401657096594165125, (int) $transformer->reverseTransform((string) 401657096594165125));`
	`441`	`+ $this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));`
`442`	`442`	`}`
`443`	`443`	`}`