[Form] Fixed: Support objects with __toString() in choice groups

Author: webmozart

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -329,6 +329,8 @@ private static function addChoiceViewGroupedBy($groupBy, $choice, $key, $label,
             return;
         }
 
+        $groupLabel = (string) $groupLabel;
+
         // Initialize the group views if necessary. Unnnecessarily built group
         // views will be cleaned up at the end of createView()
         if (!isset($preferredViews[$groupLabel])) {

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -77,6 +77,13 @@ public function getGroup($object)
         return $this->obj1 === $object || $this->obj2 === $object ? 'Group 1' : 'Group 2';
     }
 
+    public function getGroupAsObject($object)
+    {
+        return $this->obj1 === $object || $this->obj2 === $object
+            ? new DefaultChoiceListFactoryTest_Castable('Group 1')
+            : new DefaultChoiceListFactoryTest_Castable('Group 2');
+    }
+
     protected function setUp()
     {
         $this->obj1 = (object) array('label' => 'A', 'index' => 'w', 'value' => 'a', 'preferred' => false, 'group' => 'Group 1', 'attr' => array());
@@ -581,6 +588,19 @@ public function testCreateViewFlatGroupByAsCallable()
         $this->assertGroupedView($view);
     }
 
+    public function testCreateViewFlatGroupByObjectThatCanBeCastToString()
+    {
+        $view = $this->factory->createView(
+            $this->list,
+            array($this->obj2, $this->obj3),
+            null, // label
+            null, // index
+            array($this, 'getGroupAsObject')
+        );
+
+        $this->assertGroupedView($view);
+    }
+
     public function testCreateViewFlatGroupByAsClosure()
     {
         $obj1 = $this->obj1;
@@ -897,3 +917,18 @@ private function assertGroupedView($view)
         ), $view);
     }
 }
+
+class DefaultChoiceListFactoryTest_Castable
+{
+    private $property;
+
+    public function __construct($property)
+    {
+        $this->property = $property;
+    }
+
+    public function __toString()
+    {
+        return $this->property;
+    }
+}