feature symfony#30126 [Form] forward valid numeric values to transform() (xabbuh)

This PR was merged into the 3.4 branch. Discussion ---------- [Form] forward valid numeric values to transform() | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#30114 | License | MIT | Doc PR | Commits ------- 3be0d35 forward valid numeric values to transform()

Author: fabpot

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);

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) {

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));
+ }
 }