merged branch stloyd/ScalarTransformer (PR symfony#2341)

fabpot · fabpot · commit f22566ca196a · 2011-10-07T14:06:24.000+02:00
Commits ------- 95049ef [Form] Added type check to `ScalarToChoiceTransformer` Discussion ---------- [2.0][Form] Added type check to ScalarToChoiceTransformer Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: -
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToChoiceTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToChoiceTransformer.php
@@ -13,16 +13,25 @@
 
 use Symfony\Component\Form\Util\FormUtil;
 use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 class ScalarToChoiceTransformer implements DataTransformerInterface
 {
     public function transform($value)
     {
+        if (null !== $value && !is_scalar($value)) {
+            throw new UnexpectedTypeException($value, 'scalar');
+        }
+
         return FormUtil::toArrayKey($value);
     }
 
     public function reverseTransform($value)
     {
+        if (null !== $value && !is_scalar($value)) {
+            throw new UnexpectedTypeException($value, 'scalar');
+        }
+
         return $value;
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/ScalarToChoiceTransformerTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/ScalarToChoiceTransformerTest.php
@@ -62,4 +62,20 @@ public function testReverseTransform($in, $out)
     {
         $this->assertSame($out, $this->transformer->transform($in));
     }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testTransformExpectsScalar()
+    {
+        $this->transformer->transform(array());
+    }
+
+    /**
+     * @expectedException Symfony\Component\Form\Exception\UnexpectedTypeException
+     */
+    public function testReverseTransformExpectsScalar()
+    {
+        $this->transformer->reverseTransform(array());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,25 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Util\FormUtil;`
`15`	`15`	`use Symfony\Component\Form\DataTransformerInterface;`
	`16`	`+use Symfony\Component\Form\Exception\UnexpectedTypeException;`
`16`	`17`
`17`	`18`	`class ScalarToChoiceTransformer implements DataTransformerInterface`
`18`	`19`	`{`
`19`	`20`	`public function transform($value)`
`20`	`21`	`{`
	`22`	`+ if (null !== $value && !is_scalar($value)) {`
	`23`	`+ throw new UnexpectedTypeException($value, 'scalar');`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`return FormUtil::toArrayKey($value);`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`public function reverseTransform($value)`
`25`	`30`	`{`
	`31`	`+ if (null !== $value && !is_scalar($value)) {`
	`32`	`+ throw new UnexpectedTypeException($value, 'scalar');`
	`33`	`+ }`
	`34`	`+`
`26`	`35`	`return $value;`
`27`	`36`	`}`
`28`	`37`	`}`