Merge branch '3.4' into 4.4

* 3.4: [Validator] Add missing vietnamese translations add German translation [Validator][ConstraintValidator] Update wrong PRETTY_DATE doc [DomCrawler][Form] Fix PHPDoc on get & offsetGet prevent method calls on null values Return int if scale = 0
symfony · Feb 29, 2020 · 677927d · 677927d
2 parents 077fef9 + 3b3e97f
commit 677927d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -279,7 +279,7 @@ private function round($number)
                     break;
             }
 
-            $number /= $roundingCoef;
+            $number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
         }
 
         return $number;

diff --git a/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -370,7 +370,7 @@ public function testReverseTransformWithRounding($scale, $input, $output, $round
     {
         $transformer = new NumberToLocalizedStringTransformer($scale, null, $roundingMode);
 
-        $this->assertEquals($output, $transformer->reverseTransform($input));
+        $this->assertSame($output, $transformer->reverseTransform($input));
     }
 
     public function testReverseTransformDoesNotRoundIfNoScale()
-Original file line number
+Diff line change
@@ Expand Up / @@ -279,7 +279,7 @@ private function round($number) @@
                         break;
                 }
-                $number /= $roundingCoef;
+                $number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
             }
             return $number;
@@ Expand Down @@