Handle conflict in DefaultChoiceListFactory

HeahDude · HeahDude · commit 2807562296ef · 2015-08-27T11:05:22.000+02:00
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -65,15 +65,17 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         if ($list instanceof LegacyChoiceListAdapter && empty($preferredChoices)
             && null === $label && null === $index && null === $groupBy && null === $attr && null === $labelAttr) {
             $mapToNonLegacyChoiceView = function (LegacyChoiceView $choiceView) {
-                return new ChoiceView($choiceView->data, $choiceView->value, $choiceView->label);
+                $choiceView = new ChoiceView($choiceView->data, $choiceView->value, $choiceView->label);
             };
 
             $adaptedList = $list->getAdaptedList();
 
-            return new ChoiceListView(
-                array_map($mapToNonLegacyChoiceView, $adaptedList->getRemainingViews()),
-                array_map($mapToNonLegacyChoiceView, $adaptedList->getPreferredViews())
-            );
+            $remainingViews = $adaptedList->getRemainingViews();
+            $preferredViews = $adaptedList->getPreferredViews();
+            array_walk_recursive($remainingViews, $mapToNonLegacyChoiceView);
+            array_walk_recursive($preferredViews, $mapToNonLegacyChoiceView);
+
+            return new ChoiceListView($remainingViews, $preferredViews);
         }
 
         $preferredViews = array();
