[2.7] [WIP] Fix for symfony#14583

phansys · phansys · commit 93bb427252ad · 2015-05-12T11:13:53.000-03:00
| Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#14583 | License | MIT | Doc PR | Fixes symfony#14583.
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -43,13 +43,13 @@ public function reverseTransform($value)
             throw new TransformationFailedException('Expected a scalar.');
         }
 
+        if (null === $value || '' === $value) {
+            return;
+        }
+
         $choices = $this->choiceList->getChoicesForValues(array((string) $value));
 
         if (1 !== count($choices)) {
-            if (null === $value || '' === $value) {
-                return;
-            }
-
             throw new TransformationFailedException(sprintf('The choice "%s" does not exist or is not unique', $value));
         }
 
