symfony · iamluc · Feb 14, 2014
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -70,11 +70,14 @@ class ObjectChoiceList extends ChoiceList
     *                                                    stored in the array key pointing to the nested
     *                                                    array. The topmost level of the hierarchy may also
     *                                                    be a \Traversable.
-     * @param string                   $labelPath         A property path pointing to the property used
-     *                                                    for the choice labels. The value is obtained
-             *                                            by calling the getter on the object. If the
-     *                                                    path is NULL, the object's __toString() method
+     * @param string|\Closure          $labelPath         A property path pointing to the property used
+     *                                                    for the choice labels.
+     *                                                    If the path is a string, the value is obtained
+     *                                                    by calling the getter on the object.
+     *                                                    If the path is NULL, the object's __toString() method
     *                                                    is used instead.
+     *                                                    If the path is a Closure, the closure is called with
+     *                                                    the choice as first argument.
     * @param array                    $preferredChoices  A flat array of choices that should be
     *                                                    presented to the user with priority.
     * @param string                   $groupPath         A property path pointing to the property used
@@ -88,10 +91,16 @@ class ObjectChoiceList extends ChoiceList
    public function __construct($choices, $labelPath = null, array $preferredChoices = array(), $groupPath = null, $valuePath = null, PropertyAccessorInterface $propertyAccessor = null)
    {
        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
-        $this->labelPath = null !== $labelPath ? new PropertyPath($labelPath) : null;
        $this->groupPath = null !== $groupPath ? new PropertyPath($groupPath) : null;
        $this->valuePath = null !== $valuePath ? new PropertyPath($valuePath) : null;

+        $this->labelPath = null;
+        if ($labelPath instanceof \Closure) {
+            $this->labelPath = $labelPath;
+        } elseif (is_string($labelPath)) {
+            $this->labelPath = new PropertyPath($labelPath);
+        }
+
        parent::__construct($choices, array(), $preferredChoices);
    }

@@ -173,7 +182,11 @@ private function extractLabels($choices, array &$labels)
                $labels[$i] = array();
                $this->extractLabels($choice, $labels[$i]);
            } elseif ($this->labelPath) {
-                $labels[$i] = $this->propertyAccessor->getValue($choice, $this->labelPath);
+                if ($this->labelPath instanceof \Closure) {
+                    $labels[$i] = call_user_func($this->labelPath, $choice);
+                } else {
+                    $labels[$i] = $this->propertyAccessor->getValue($choice, $this->labelPath);
+                }
            } elseif (method_exists($choice, '__toString')) {
                $labels[$i] = (string) $choice;
            } else {

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php
@@ -154,6 +154,32 @@ public function testInitArrayWithValuePath()
        $this->assertEquals(array(0 => new ChoiceView($this->obj1, '10', 'A'), 3 => new ChoiceView($this->obj4, '40', 'D')), $this->list->getRemainingViews());
    }

+    public function testInitArrayWithClosure()
+    {
+        $this->obj1 = (object) array('name' => 'A', 'id' => 10);
+        $this->obj2 = (object) array('name' => 'B', 'id' => 20);
+        $this->obj3 = (object) array('name' => 'C', 'id' => 30);
+        $this->obj4 = (object) array('name' => 'D', 'id' => 40);
+
+        $prefix = '--> ';
+        $closure = function ($choice) use ($prefix) {
+            return $prefix.$choice->name.' ('.$choice->id.')';
+        };
+
+        $this->list = new ObjectChoiceList(
+            array($this->obj1, $this->obj2, $this->obj3, $this->obj4),
+            $closure,
+            array($this->obj2, $this->obj3),
+            null,
+            'id'
+        );
+
+        $this->assertSame(array($this->obj1, $this->obj2, $this->obj3, $this->obj4), $this->list->getChoices());
+        $this->assertSame(array('10', '20', '30', '40'), $this->list->getValues());
+        $this->assertEquals(array(1 => new ChoiceView($this->obj2, '20', '--> B (20)'), 2 => new ChoiceView($this->obj3, '30', '--> C (30)')), $this->list->getPreferredViews());
+        $this->assertEquals(array(0 => new ChoiceView($this->obj1, '10', '--> A (10)'), 3 => new ChoiceView($this->obj4, '40', '--> D (40)')), $this->list->getRemainingViews());
+    }
+
    public function testInitArrayUsesToString()
    {
        $this->obj1 = new ObjectChoiceListTest_EntityWithToString('A');