[Form] Fix show float values as choices values in ChoiceType

yceruto · yceruto · commit 35642288faeb · 2016-11-05T14:02:34.000-04:00
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -236,7 +236,11 @@ private function castableToString(array $choices, array &$cache = array())
                 continue;
             } elseif (!is_scalar($choice)) {
                 return false;
-            } elseif (isset($cache[$choice])) {
+            }
+
+            $choice = false === $choice ? '0' : (string) $choice;
+
+            if (isset($cache[$choice])) {
                 return false;
             }
 
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -34,12 +34,12 @@ protected function createChoiceList()
 
     protected function getChoices()
     {
-        return array(0, 1, '1', 'a', false, true, $this->object, null);
+        return array(0, 1, 1.5, '1', 'a', false, true, $this->object, null);
     }
 
     protected function getValues()
     {
-        return array('0', '1', '2', '3', '4', '5', '6', '7');
+        return array('0', '1', '2', '3', '4', '5', '6', '7', '8');
     }
 
     /**
@@ -162,4 +162,13 @@ public function testGetChoicesForValuesWithContainingEmptyStringAndBooleans()
         $this->assertSame(array(0 => true), $choiceList->getChoicesForValues(array('1')));
         $this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));
     }
+
+    public function testGetChoicesForValuesWithContainingEmptyStringAndFloats()
+    {
+        $choiceList = new ArrayChoiceList(array('Empty String' => '', '1/3' => 0.3, '1/2' => 0.5));
+
+        $this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('')));
+        $this->assertSame(array(0 => 0.3), $choiceList->getChoicesForValues(array('0.3')));
+        $this->assertSame(array(0 => 0.5), $choiceList->getChoicesForValues(array('0.5')));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ protected function createChoiceList()`
`34`	`34`
`35`	`35`	`protected function getChoices()`
`36`	`36`	`{`
`37`		`- return array(0, 1, '1', 'a', false, true, $this->object, null);`
	`37`	`+ return array(0, 1, 1.5, '1', 'a', false, true, $this->object, null);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`protected function getValues()`
`41`	`41`	`{`
`42`		`- return array('0', '1', '2', '3', '4', '5', '6', '7');`
	`42`	`+ return array('0', '1', '2', '3', '4', '5', '6', '7', '8');`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`@@ -162,4 +162,13 @@ public function testGetChoicesForValuesWithContainingEmptyStringAndBooleans()`
`162`	`162`	`$this->assertSame(array(0 => true), $choiceList->getChoicesForValues(array('1')));`
`163`	`163`	`$this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));`
`164`	`164`	`}`
	`165`	`+`
	`166`	`+ public function testGetChoicesForValuesWithContainingEmptyStringAndFloats()`
	`167`	`+ {`
	`168`	`+ $choiceList = new ArrayChoiceList(array('Empty String' => '', '1/3' => 0.3, '1/2' => 0.5));`
	`169`	`+`
	`170`	`+ $this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('')));`
	`171`	`+ $this->assertSame(array(0 => 0.3), $choiceList->getChoicesForValues(array('0.3')));`
	`172`	`+ $this->assertSame(array(0 => 0.5), $choiceList->getChoicesForValues(array('0.5')));`
	`173`	`+ }`
`165`	`174`	`}`