forward valid numeric values to transform()

xabbuh · xabbuh · commit 3be0d35b17cf · 2019-02-09T15:44:59.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -23,6 +23,12 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform
 {
     private $divisor;
 
+    /**
+     * @param int|null  $scale
+     * @param bool|null $grouping
+     * @param int|null  $roundingMode
+     * @param int|null  $divisor
+     */
     public function __construct($scale = 2, $grouping = true, $roundingMode = self::ROUND_HALF_UP, $divisor = 1)
     {
         if (null === $grouping) {
@@ -58,7 +64,7 @@ public function transform($value)
             if (!is_numeric($value)) {
                 throw new TransformationFailedException('Expected a numeric.');
             }
-            $value = (string) ($value / $this->divisor);
+            $value /= $this->divisor;
         }
 
         return parent::transform($value);
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -78,6 +78,11 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
 
     private $scale;
 
+    /**
+     * @param int|null  $scale
+     * @param bool|null $grouping
+     * @param int|null  $roundingMode
+     */
     public function __construct($scale = null, $grouping = false, $roundingMode = self::ROUND_HALF_UP)
     {
         if (null === $grouping) {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -17,6 +17,18 @@
 
 class MoneyToLocalizedStringTransformerTest extends TestCase
 {
+    private $previousLocale;
+
+    protected function setUp()
+    {
+        $this->previousLocale = setlocale(LC_ALL, '0');
+    }
+
+    protected function tearDown()
+    {
+        setlocale(LC_ALL, $this->previousLocale);
+    }
+
     public function testTransform()
     {
         // Since we test against "de_AT", we need the full implementation
@@ -73,7 +85,7 @@ public function testReverseTransformEmpty()
         $this->assertNull($transformer->reverseTransform(''));
     }
 
-    public function testFloatToIntConversionMismatchOnReversTransform()
+    public function testFloatToIntConversionMismatchOnReverseTransform()
     {
         $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
         IntlTestHelper::requireFullIntl($this, false);
@@ -90,4 +102,16 @@ public function testFloatToIntConversionMismatchOnTransform()
 
         $this->assertSame('10,20', $transformer->transform(1020));
     }
+
+    public function testValidNumericValuesWithNonDotDecimalPointCharacter()
+    {
+        // calling setlocale() here is important as it changes the representation of floats when being cast to strings
+        setlocale(LC_ALL, 'de_AT.UTF-8');
+
+        $transformer = new MoneyToLocalizedStringTransformer(4, null, null, 100);
+        IntlTestHelper::requireFullIntl($this, false);
+        \Locale::setDefault('de_AT');
+
+        $this->assertSame('0,0035', $transformer->transform(12 / 34));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,12 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform`
`23`	`23`	`{`
`24`	`24`	`private $divisor;`
`25`	`25`
	`26`	`+ /**`
	`27`	`+ * @param int\|null $scale`
	`28`	`+ * @param bool\|null $grouping`
	`29`	`+ * @param int\|null $roundingMode`
	`30`	`+ * @param int\|null $divisor`
	`31`	`+ */`
`26`	`32`	`public function __construct($scale = 2, $grouping = true, $roundingMode = self::ROUND_HALF_UP, $divisor = 1)`
`27`	`33`	`{`
`28`	`34`	`if (null === $grouping) {`
`@@ -58,7 +64,7 @@ public function transform($value)`
`58`	`64`	`if (!is_numeric($value)) {`
`59`	`65`	`throw new TransformationFailedException('Expected a numeric.');`
`60`	`66`	`}`
`61`		`- $value = (string) ($value / $this->divisor);`
	`67`	`+ $value /= $this->divisor;`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`return parent::transform($value);`