[Form] tweaked previous commit

fabpot · fabpot · commit 462a8c79add7 · 2011-06-07T21:45:36.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToBooleanChoicesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ScalarToBooleanChoicesTransformer.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Util\FormUtil;
 
 class ScalarToBooleanChoicesTransformer implements DataTransformerInterface
 {
@@ -51,18 +52,15 @@ public function transform($value)
             throw new UnexpectedTypeException($value, 'scalar');
         }
 
-        if (is_bool($value) || null === $value) {
-            $value = (int)$value;
-        }
-
         try {
             $choices = $this->choiceList->getChoices();
         } catch (\Exception $e) {
             throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);
         }
 
+        $value = FormUtil::toArrayKey($value);
         foreach (array_keys($choices) as $key) {
-            $choices[$key] = (string)$key === (string)$value;
+            $choices[$key] = $key === $value;
         }
 
         return $choices;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;`
`15`	`15`	`use Symfony\Component\Form\DataTransformerInterface;`
`16`	`16`	`use Symfony\Component\Form\Exception\UnexpectedTypeException;`
	`17`	`+use Symfony\Component\Form\Util\FormUtil;`
`17`	`18`
`18`	`19`	`class ScalarToBooleanChoicesTransformer implements DataTransformerInterface`
`19`	`20`	`{`
`@@ -51,18 +52,15 @@ public function transform($value)`
`51`	`52`	`throw new UnexpectedTypeException($value, 'scalar');`
`52`	`53`	`}`
`53`	`54`
`54`		`- if (is_bool($value) \|\| null === $value) {`
`55`		`- $value = (int)$value;`
`56`		`- }`
`57`		`-`
`58`	`55`	`try {`
`59`	`56`	`$choices = $this->choiceList->getChoices();`
`60`	`57`	`} catch (\Exception $e) {`
`61`	`58`	`throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);`
`62`	`59`	`}`
`63`	`60`
	`61`	`+ $value = FormUtil::toArrayKey($value);`
`64`	`62`	`foreach (array_keys($choices) as $key) {`
`65`		`- $choices[$key] = (string)$key === (string)$value;`
	`63`	`+ $choices[$key] = $key === $value;`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`return $choices;`