bug #18179 [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers (ovrflo, nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 18615fccf04f · 2016-03-15T16:48:36.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18077, #18067 | License | MIT | Doc PR | - Commits ------- 03c008c [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers 6b6073f [Form] Fix INT64 cast to float in IntegerType.
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -122,7 +122,15 @@ public function reverseTransform($value)
             $value = str_replace(',', $decSep, $value);
         }
 
-        $result = $formatter->parse($value, \NumberFormatter::TYPE_DOUBLE, $position);
+        if (false !== strpos($value, $decSep)) {
+            $type = \NumberFormatter::TYPE_DOUBLE;
+        } else {
+            $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
@@ -433,4 +433,11 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
 
         $transformer->reverseTransform("12\xc2\xa0345,678foo");
     }
+
+    public function testReverseTransformBigint()
+    {
+        $transformer = new NumberToLocalizedStringTransformer(null, true);
+
+        $this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -433,4 +433,11 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()`
`433`	`433`
`434`	`434`	`$transformer->reverseTransform("12\xc2\xa0345,678foo");`
`435`	`435`	`}`
	`436`	`+`
	`437`	`+ public function testReverseTransformBigint()`
	`438`	`+ {`
	`439`	`+ $transformer = new NumberToLocalizedStringTransformer(null, true);`
	`440`	`+`
	`441`	`+ $this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));`
	`442`	`+ }`
`436`	`443`	`}`