fix rounding from string

syastrebov · syastrebov · commit 65e0b29c6ca8 · 2018-04-04T01:31:42.000+03:00
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -80,4 +80,12 @@ public function testFloatToIntConversionMismatchOnReversTransform()
         \Locale::setDefault('de_AT');
         $this->assertSame(3655, (int) $transformer->reverseTransform('36,55'));
     }
+
+    public function testFloatToIntConversionMismatchOnTransform()
+    {
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, MoneyToLocalizedStringTransformer::ROUND_DOWN, 100);
+        IntlTestHelper::requireFullIntl($this, false);
+        \Locale::setDefault('de_AT');
+        $this->assertSame('10,20', $transformer->transform('1020'));
+    }
 }
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -710,6 +710,7 @@ private function round($value, $precision)
         } elseif (isset(self::$customRoundingList[$roundingModeAttribute])) {
             $roundingCoef = pow(10, $precision);
             $value *= $roundingCoef;
+            $value = (float) (string) $value;
 
             switch ($roundingModeAttribute) {
                 case self::ROUND_CEILING:
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -428,6 +428,7 @@ public function formatRoundingModeRoundHalfUpProvider()
             // array(1.125, '1.13'),
             array(1.127, '1.13'),
             array(1.129, '1.13'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -451,6 +452,7 @@ public function formatRoundingModeRoundHalfDownProvider()
             array(1.125, '1.12'),
             array(1.127, '1.13'),
             array(1.129, '1.13'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -474,6 +476,7 @@ public function formatRoundingModeRoundHalfEvenProvider()
             array(1.125, '1.12'),
             array(1.127, '1.13'),
             array(1.129, '1.13'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -498,6 +501,7 @@ public function formatRoundingModeRoundCeilingProvider()
             array(-1.123, '-1.12'),
             array(-1.125, '-1.12'),
             array(-1.127, '-1.12'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -522,6 +526,7 @@ public function formatRoundingModeRoundFloorProvider()
             array(-1.123, '-1.13'),
             array(-1.125, '-1.13'),
             array(-1.127, '-1.13'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -546,6 +551,7 @@ public function formatRoundingModeRoundDownProvider()
             array(-1.123, '-1.12'),
             array(-1.125, '-1.12'),
             array(-1.127, '-1.12'),
+            array(1020 / 100, '10.20'),
         );
     }
 
@@ -570,6 +576,7 @@ public function formatRoundingModeRoundUpProvider()
             array(-1.123, '-1.13'),
             array(-1.125, '-1.13'),
             array(-1.127, '-1.13'),
+            array(1020 / 100, '10.20'),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,12 @@ public function testFloatToIntConversionMismatchOnReversTransform()`
`80`	`80`	`\Locale::setDefault('de_AT');`
`81`	`81`	`$this->assertSame(3655, (int) $transformer->reverseTransform('36,55'));`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ public function testFloatToIntConversionMismatchOnTransform()`
	`85`	`+ {`
	`86`	`+ $transformer = new MoneyToLocalizedStringTransformer(null, null, MoneyToLocalizedStringTransformer::ROUND_DOWN, 100);`
	`87`	`+ IntlTestHelper::requireFullIntl($this, false);`
	`88`	`+ \Locale::setDefault('de_AT');`
	`89`	`+ $this->assertSame('10,20', $transformer->transform('1020'));`
	`90`	`+ }`
`83`	`91`	`}`