From 2abf85599d32535efbabe70f297314ea4c4976a1 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 7 Jun 2019 12:53:37 +0200
Subject: [PATCH] accept floats for input="string" in NumberType

---
 .../Form/Extension/Core/Type/NumberType.php   |  9 +++++++++
 .../Extension/Core/Type/NumberTypeTest.php    | 20 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 4c1f1fd71f..54cbb758ee 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\StringToFloatTransformer;
@@ -37,6 +38,14 @@ class NumberType extends AbstractType
 
         if ('string' === $options['input']) {
             $builder->addModelTransformer(new StringToFloatTransformer($options['scale']));
+            $builder->addModelTransformer(new CallbackTransformer(
+                function ($value) {
+                    return \is_float($value) || \is_int($value) ? (string) $value : $value;
+                },
+                function ($value) {
+                    return $value;
+                }
+            ));
         }
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
index 2cae8bba48..6d8ab4539d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -77,6 +77,26 @@ class NumberTypeTest extends BaseTypeTest
         $this->assertSame('12345,68', $form->createView()->vars['value']);
     }
 
+    public function testStringInputWithFloatData(): void
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, 12345.6789, [
+            'input' => 'string',
+            'scale' => 2,
+        ]);
+
+        $this->assertSame('12345,68', $form->createView()->vars['value']);
+    }
+
+    public function testStringInputWithIntData(): void
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, 12345, [
+            'input' => 'string',
+            'scale' => 2,
+        ]);
+
+        $this->assertSame('12345,00', $form->createView()->vars['value']);
+    }
+
     public function testDefaultFormattingWithRounding(): void
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['scale' => 0, 'rounding_mode' => \NumberFormatter::ROUND_UP]);