[Form] Cast choices value callback result to string

Matth-- · Matth-- · commit 040c4d00e050 · 2023-01-17T14:31:53.000+01:00
If using "multiple" and "choice_value" on a CollectionType or EntityType, the result for the callback needs to be a string. By forcing a string cast, default values will show up in the form view.
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -88,9 +88,9 @@ protected function setUp(): void
         ;
 
         $this->objectLoader = $this->createMock(EntityLoaderInterface::class);
-        $this->obj1 = (object) ['name' => 'A'];
-        $this->obj2 = (object) ['name' => 'B'];
-        $this->obj3 = (object) ['name' => 'C'];
+        $this->obj1 = (object) ['name' => 'A', 'id' => 1];
+        $this->obj2 = (object) ['name' => 'B', 'id' => 2];
+        $this->obj3 = (object) ['name' => 'C', 'id' => 3];
 
         $this->om->expects($this->any())
             ->method('getRepository')
@@ -190,6 +190,22 @@ public function testLoadValuesForChoicesDoesNotLoadIfEmptyChoices()
         $this->assertSame([], $loader->loadValuesForChoices([]));
     }
 
+    public function testLoadValuesForChoicesCastsTypesToStringWithValueCallback()
+    {
+        $loader = new DoctrineChoiceLoader(
+            $this->om,
+            $this->class,
+            $this->idReader
+        );
+
+        $this->repository->expects($this->never())
+            ->method('findAll');
+
+        $this->assertSame(['2', '3'], $loader->loadValuesForChoices([$this->obj2, $this->obj3], function ($item) {
+            return $item->id;
+        }));
+    }
+
     /**
      * @group legacy
      */
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php
@@ -59,7 +59,9 @@ public function loadValuesForChoices(array $choices, callable $value = null)
 
         if ($value) {
             // if a value callback exists, use it
-            return array_map($value, $choices);
+            return array_map(function ($item) use ($value) {
+                return (string) $value($item);
+            }, $choices);
         }
 
         return $this->doLoadValuesForChoices($choices);
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
@@ -90,6 +90,23 @@ public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()
         );
     }
 
+    public function testLoadValuesForChoicesCastsCallbackItemsToString()
+    {
+         $choices = [
+            (object) ['id' => 2],
+            (object) ['id' => 3],
+        ];
+
+        $value = function ($item) {
+            return $item->id;
+        };
+
+        $this->assertSame(
+            ['2', '3'],
+            self::$loader->loadValuesForChoices($choices, $value)
+        );
+    }
+
     public function testLoadValuesForChoicesLoadsChoiceListOnFirstCall()
     {
         $this->assertSame(

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,9 @@ public function loadValuesForChoices(array $choices, callable $value = null)`
`59`	`59`
`60`	`60`	`if ($value) {`
`61`	`61`	`// if a value callback exists, use it`
`62`		`- return array_map($value, $choices);`
	`62`	`+ return array_map(function ($item) use ($value) {`
	`63`	`+ return (string) $value($item);`
	`64`	`+ }, $choices);`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`return $this->doLoadValuesForChoices($choices);`