symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToBooleanArrayTransformer.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
Lines changed: 2 additions & 2 deletions
@@ -60,14 +60,14 @@ public function transform($choice)
             throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);
         }
 
-        $index = current($this->choiceList->getIndicesForChoices(array($choice)));
+        $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));
 
         foreach ($values as $i => $value) {
-            $values[$i] = $i === $index;
+            $values[$i] = isset($valueMap[$value]);
         }
 
         if ($this->placeholderPresent) {
-            $values['placeholder'] = false === $index;
+            $values['placeholder'] = 0 === count($valueMap);
         }
 
         return $values;
 
@@ -58,10 +58,10 @@ public function transform($array)
             throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);
         }
 
-        $indexMap = array_flip($this->choiceList->getIndicesForChoices($array));
+        $valueMap = array_flip($this->choiceList->getValuesForChoices($array));
 
         foreach ($values as $i => $value) {
-            $values[$i] = isset($indexMap[$i]);
+            $values[$i] = isset($valueMap[$value]);
         }
 
         return $values;
 
@@ -57,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             // Check if the choices already contain the empty value
             // Only add the empty value option if this is not the case
-            if (null !== $options['empty_value'] && 0 === count($options['choice_list']->getIndicesForValues(array('')))) {
+            if (null !== $options['empty_value'] && 0 === count($options['choice_list']->getChoicesForValues(array('')))) {
                 $placeholderView = new ChoiceView(null, '', $options['empty_value']);
 
                 // "placeholder" is a reserved index
@@ -120,7 +120,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
         // Check if the choices already contain the empty value
         // Only add the empty value option if this is not the case
-        if (null !== $options['empty_value'] && 0 === count($options['choice_list']->getIndicesForValues(array('')))) {
+        if (null !== $options['empty_value'] && 0 === count($options['choice_list']->getChoicesForValues(array('')))) {
             $view->vars['empty_value'] = $options['empty_value'];
         }
Original file line number	Diff line number	Diff line change
`@@ -60,14 +60,14 @@ public function transform($choice)`
`60`	`60`	`throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);`
`61`	`61`	`}`
`62`	`62`
`63`		`- $index = current($this->choiceList->getIndicesForChoices(array($choice)));`
	`63`	`+ $valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));`
`64`	`64`
`65`	`65`	`foreach ($values as $i => $value) {`
`66`		`- $values[$i] = $i === $index;`
	`66`	`+ $values[$i] = isset($valueMap[$value]);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`if ($this->placeholderPresent) {`
`70`		`- $values['placeholder'] = false === $index;`
	`70`	`+ $values['placeholder'] = 0 === count($valueMap);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`return $values;`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ public function transform($array)`
`58`	`58`	`throw new TransformationFailedException('Can not get the choice list', $e->getCode(), $e);`
`59`	`59`	`}`
`60`	`60`
`61`		`- $indexMap = array_flip($this->choiceList->getIndicesForChoices($array));`
	`61`	`+ $valueMap = array_flip($this->choiceList->getValuesForChoices($array));`
`62`	`62`
`63`	`63`	`foreach ($values as $i => $value) {`
`64`		`- $values[$i] = isset($indexMap[$i]);`
	`64`	`+ $values[$i] = isset($valueMap[$value]);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return $values;`