don't reject floats in StringToFloatTransformer

xabbuh · xabbuh · commit 292de1cd7d26 · 2019-06-20T23:15:32.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/StringToFloatTransformer.php
@@ -34,7 +34,7 @@ public function transform($value)
             return null;
         }
 
-        if (!\is_string($value) || !is_numeric($value)) {
+        if ((!\is_string($value) || !is_numeric($value)) && !\is_float($value)) {
             throw new TransformationFailedException('Expected a numeric string.');
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/StringToFloatTransformerTest.php
@@ -36,6 +36,7 @@ public function provideTransformations(): array
             ['1.', 1.],
             ['1.0', 1.],
             ['1.23', 1.23],
+            [1.23, 1.23],
         ];
     }
 
@@ -55,13 +56,13 @@ public function testTransform($from, $to): void
     public function testFailIfTransformingANonString(): void
     {
         $transformer = new StringToFloatTransformer();
-        $transformer->transform(1.0);
+        $transformer->transform([1.0]);
     }
 
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      */
-    public function testFailIfTransformingANonNumericString(): void
+    public function testFailIfTransformingNonNumericValues(): void
     {
         $transformer = new StringToFloatTransformer();
         $transformer->transform('foobar');

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function transform($value)`
`34`	`34`	`return null;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (!\is_string($value) \|\| !is_numeric($value)) {`
	`37`	`+ if ((!\is_string($value) \|\| !is_numeric($value)) && !\is_float($value)) {`
`38`	`38`	`throw new TransformationFailedException('Expected a numeric string.');`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function provideTransformations(): array`
`36`	`36`	`['1.', 1.],`
`37`	`37`	`['1.0', 1.],`
`38`	`38`	`['1.23', 1.23],`
	`39`	`+ [1.23, 1.23],`
`39`	`40`	`];`
`40`	`41`	`}`
`41`	`42`
`@@ -55,13 +56,13 @@ public function testTransform($from, $to): void`
`55`	`56`	`public function testFailIfTransformingANonString(): void`
`56`	`57`	`{`
`57`	`58`	`$transformer = new StringToFloatTransformer();`
`58`		`- $transformer->transform(1.0);`
	`59`	`+ $transformer->transform([1.0]);`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`/**`
`62`	`63`	`* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException`
`63`	`64`	`*/`
`64`		`- public function testFailIfTransformingANonNumericString(): void`
	`65`	`+ public function testFailIfTransformingNonNumericValues(): void`
`65`	`66`	`{`
`66`	`67`	`$transformer = new StringToFloatTransformer();`
`67`	`68`	`$transformer->transform('foobar');`