diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md index 45af0903317d0..00d3b2fc4027b 100644 --- a/src/Symfony/Component/Form/CHANGELOG.md +++ b/src/Symfony/Component/Form/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG --- * Add support for displaying nested options in DebugCommand + * Add support for strings as data for the `MoneyType` 7.2 --- diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php index b03f8da4444fe..e9c9cb9e55259 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php @@ -70,7 +70,7 @@ public function reverseTransform(mixed $value): int|float|null if (null !== $value) { $value = (string) ($value * $this->divisor); - if ('float' === $this->input) { + if ('integer' !== $this->input) { return (float) $value; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php index 2657b03afb039..38dbfc038b63d 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php @@ -14,6 +14,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Exception\LogicException; use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer; +use Symfony\Component\Form\Extension\Core\DataTransformer\StringToFloatTransformer; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; @@ -38,6 +39,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $options['input'], )) ; + + if ('string' === $options['input']) { + $builder->addModelTransformer(new StringToFloatTransformer($options['scale'])); + } } public function buildView(FormView $view, FormInterface $form, array $options): void @@ -77,7 +82,7 @@ public function configureOptions(OptionsResolver $resolver): void $resolver->setAllowedTypes('html5', 'bool'); - $resolver->setAllowedValues('input', ['float', 'integer']); + $resolver->setAllowedValues('input', ['float', 'integer', 'string']); $resolver->setNormalizer('grouping', static function (Options $options, $value) { if ($value && $options['html5']) { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php index f9112ffcac74a..aa0d6c24993c8 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; +use Symfony\Component\Form\Exception\TransformationFailedException; use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Intl\Util\IntlTestHelper; @@ -146,4 +147,54 @@ public function testIntegerInputWithoutDivisor() $this->assertSame(1234567, $form->getData()); } + + public function testDefaultFormattingWithScaleAndStringInput() + { + $form = $this->factory->create(static::TESTED_TYPE, null, ['scale' => 2, 'input' => 'string']); + $form->setData('12345.67890'); + + $this->assertSame('12345.68', $form->createView()->vars['value']); + } + + public function testStringInputWithFloatData() + { + $this->expectException(TransformationFailedException::class); + $this->expectExceptionMessage('Expected a numeric string.'); + + $this->factory->create(static::TESTED_TYPE, 12345.6789, [ + 'input' => 'string', + 'scale' => 2, + ]); + } + + public function testStringInputWithIntData() + { + $this->expectException(TransformationFailedException::class); + $this->expectExceptionMessage('Expected a numeric string.'); + + $this->factory->create(static::TESTED_TYPE, 12345, [ + 'input' => 'string', + 'scale' => 2, + ]); + } + + public function testSubmitStringInputWithDefaultScale() + { + $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'string']); + $form->submit('1.234'); + + $this->assertSame('1.23', $form->getData()); + $this->assertSame(1.23, $form->getNormData()); + $this->assertSame('1.23', $form->getViewData()); + } + + public function testSubmitStringInputWithScale() + { + $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'string', 'scale' => 3]); + $form->submit('1.234'); + + $this->assertSame('1.234', $form->getData()); + $this->assertSame(1.234, $form->getNormData()); + $this->assertSame('1.234', $form->getViewData()); + } }