fix handling null as empty data

xabbuh · xabbuh · commit b5aa55dab982 · 2020-07-06T14:28:35.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -143,11 +143,11 @@ public function transform($value)
      */
     public function reverseTransform($value)
     {
-        if (!\is_string($value)) {
+        if (null !== $value && !\is_string($value)) {
             throw new TransformationFailedException('Expected a string.');
         }
 
-        if ('' === $value) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -85,4 +85,19 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedD
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
+
+    public function testSubmitNullWithEmptyDataSetToNull()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'empty_data' => null,
+        ]);
+        $form->submit(null);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertTrue($form->isSynchronized());
+        $this->assertTrue($form->isValid());
+        $this->assertSame('', $form->getViewData());
+        $this->assertNull($form->getNormData());
+        $this->assertNull($form->getData());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,11 @@ public function transform($value)`
`143`	`143`	`*/`
`144`	`144`	`public function reverseTransform($value)`
`145`	`145`	`{`
`146`		`- if (!\is_string($value)) {`
	`146`	`+ if (null !== $value && !\is_string($value)) {`
`147`	`147`	`throw new TransformationFailedException('Expected a string.');`
`148`	`148`	`}`
`149`	`149`
`150`		`- if ('' === $value) {`
	`150`	`+ if (null === $value \|\| '' === $value) {`
`151`	`151`	`return null;`
`152`	`152`	`}`
`153`	`153`