renaming

symfony · ewgRa · Nov 1, 2015 · Nov 2, 2015 · Nov 2, 2015 · Nov 3, 2015
commit 355ea1c7300bfd7e9cd424b8ff91cbf968a01dea
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -118,7 +118,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             }
         } else {
             // Otherwise use the original structure of the choices
-            self::addChoiceViewsGroupedBy(
+            self::addStructuredChoiceViews(
                 $list->getStructuredValues(),
                 $label,
                 $choices,
@@ -172,9 +172,9 @@ private static function addChoiceView($choice, $value, $label, $key, &$index, $a
         }
     }
 
-    private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
+    private static function addStructuredChoiceViews($structuredValues, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
     {
-        foreach ($groupBy as $key => $value) {
+        foreach ($structuredValues as $key => $value) {
             if (null === $value) {
                 continue;
             }
@@ -184,7 +184,7 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
                 $preferredViewsForGroup = array();
                 $otherViewsForGroup = array();
 
-                self::addChoiceViewsGroupedBy(
+                self::addStructuredChoiceViews(
                     $value,
                     $label,
                     $choices,