bug #17511 [Form] ArrayChoiceList can now deal with a null in choices (issei-m)

fabpot · fabpot · commit 8967076e50e1 · 2016-01-27T08:59:57.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] ArrayChoiceList can now deal with a null in choices re-create for mistaken #17502 --- | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Documentation says, since 2.7, choice value is treated as corresponding item value (if `choices_as_values` option is true). Null as well. ```php $builder->add('attending', 'choice', array( 'choices' => array( 'yes' => true, 'no' => false, 'maybe' => null, ), 'choices_as_values' => true, )); ``` But actually null doesn't work as expected since `ArrayChoiceList::getChoicesForValues()` uses `isset` to check whether given value exists in its choices. It should use `array_key_exists` instead to do so here. Commits ------- 68292bb [Form] ArrayChoiceList can now deal with a null in choices
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -141,7 +141,7 @@ public function getChoicesForValues(array $values)
         $choices = array();
 
         foreach ($values as $i => $givenValue) {
-            if (isset($this->choices[$givenValue])) {
+            if (array_key_exists($givenValue, $this->choices)) {
                 $choices[$i] = $this->choices[$givenValue];
             }
         }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -130,4 +130,11 @@ public function testCompareChoicesByIdentityByDefault()
         $this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => $obj2)));
         $this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => (object) array('value' => 'value2'))));
     }
+
+    public function testGetChoicesForValuesWithContainingNull()
+    {
+        $choiceList = new ArrayChoiceList(array('Null' => null));
+
+        $this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('0')));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function getChoicesForValues(array $values)`
`141`	`141`	`$choices = array();`
`142`	`142`
`143`	`143`	`foreach ($values as $i => $givenValue) {`
`144`		`- if (isset($this->choices[$givenValue])) {`
	`144`	`+ if (array_key_exists($givenValue, $this->choices)) {`
`145`	`145`	`$choices[$i] = $this->choices[$givenValue];`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,11 @@ public function testCompareChoicesByIdentityByDefault()`
`130`	`130`	`$this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => $obj2)));`
`131`	`131`	`$this->assertSame(array(2 => 'value2'), $choiceList->getValuesForChoices(array(2 => (object) array('value' => 'value2'))));`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ public function testGetChoicesForValuesWithContainingNull()`
	`135`	`+ {`
	`136`	`+ $choiceList = new ArrayChoiceList(array('Null' => null));`
	`137`	`+`
	`138`	`+ $this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('0')));`
	`139`	`+ }`
`133`	`140`	`}`