[Form] Fix same choice loader with different choice values

Author: HeahDude

ChoiceList/Loader/CallbackChoiceLoader.php

@@ -23,11 +23,11 @@ class CallbackChoiceLoader implements ChoiceLoaderInterface
     private $callback;
 
     /**
-     * The loaded choice list.
+     * The loaded choices.
      *
-     * @var ArrayChoiceList
+     * @var array|null
      */
-    private $choiceList;
+    private $choices;
 
     /**
      * @param callable $callback The callable returning an array of choices
@@ -42,11 +42,11 @@ public function __construct(callable $callback)
      */
     public function loadChoiceList($value = null)
     {
-        if (null !== $this->choiceList) {
-            return $this->choiceList;
+        if (null === $this->choices) {
+            $this->choices = ($this->callback)();
         }
 
-        return $this->choiceList = new ArrayChoiceList(($this->callback)(), $value);
+        return new ArrayChoiceList($this->choices, $value);
     }
 
     /**

Tests/ChoiceList/LazyChoiceListTest.php

@@ -32,7 +32,7 @@ public function testGetChoiceLoadersLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getChoices());
         $this->assertSame(['RESULT'], $list->getChoices());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetValuesLoadsLoadedListOnFirstCall()
@@ -46,7 +46,7 @@ public function testGetValuesLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getValues());
         $this->assertSame(['RESULT'], $list->getValues());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
@@ -60,7 +60,7 @@ public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getStructuredValues());
         $this->assertSame(['RESULT'], $list->getStructuredValues());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
@@ -79,7 +79,7 @@ public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
         $this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
-        $this->assertSame(3, $calls);
+        $this->assertSame(6, $calls);
     }
 
     public function testGetChoicesForValuesForwardsCallIfListNotLoaded()
@@ -98,7 +98,7 @@ public function testGetChoicesForValuesForwardsCallIfListNotLoaded()
 
         $this->assertSame(['foo', 'bar'], $list->getChoicesForValues(['a', 'b']));
         $this->assertSame(['foo', 'bar'], $list->getChoicesForValues(['a', 'b']));
-        $this->assertSame(3, $calls);
+        $this->assertSame(6, $calls);
     }
 
     public function testGetChoicesForValuesUsesLoadedList()

Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php

@@ -67,11 +67,18 @@ public function testLoadChoiceList()
         $this->assertInstanceOf(ChoiceListInterface::class, self::$loader->loadChoiceList(self::$value));
     }
 
-    public function testLoadChoiceListOnlyOnce()
+    public function testLoadChoicesOnlyOnce()
     {
-        $loadedChoiceList = self::$loader->loadChoiceList(self::$value);
+        $calls = 0;
+        $loader = new CallbackChoiceLoader(function () use (&$calls) {
+            ++$calls;
 
-        $this->assertSame($loadedChoiceList, self::$loader->loadChoiceList(self::$value));
+            return [1];
+        });
+        $loadedChoiceList = $loader->loadChoiceList();
+
+        $this->assertNotSame($loadedChoiceList, $loader->loadChoiceList());
+        $this->assertSame(1, $calls);
     }
 
     public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()

Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php

@@ -68,11 +68,19 @@ public function testLoadChoiceList()
         $this->assertInstanceOf(ChoiceListInterface::class, self::$loader->loadChoiceList(self::$value));
     }
 
-    public function testLoadChoiceListOnlyOnce()
+    public function testLoadChoicesOnlyOnce()
     {
-        $loadedChoiceList = self::$loader->loadChoiceList(self::$value);
+        $calls = 0;
+        $loader = new IntlCallbackChoiceLoader(function () use (&$calls) {
+            ++$calls;
 
-        $this->assertSame($loadedChoiceList, self::$loader->loadChoiceList(self::$value));
+            return self::$choices;
+        });
+
+        $loadedChoiceList = $loader->loadChoiceList(self::$value);
+
+        $this->assertNotSame($loadedChoiceList, $loader->loadChoiceList(self::$value));
+        $this->assertSame(1, $calls);
     }
 
     public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()

Tests/Extension/Core/Type/ChoiceTypeTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
@@ -2165,4 +2166,32 @@ public function expandedIsEmptyWhenNoRealChoiceIsSelectedProvider()
             'Placeholder submitted / single / not required / with a placeholder -> should not be empty' => [false, '', false, false, 'ccc'], // The placeholder is a selected value
         ];
     }
+
+    public function testWithSameLoaderAndDifferentChoiceValueCallbacks()
+    {
+        $choiceLoader = new CallbackChoiceLoader(function () {
+            return [1, 2, 3];
+        });
+
+        $view = $this->factory->create(FormTypeTest::TESTED_TYPE)
+            ->add('choice_one', self::TESTED_TYPE, [
+                'choice_loader' => $choiceLoader,
+            ])
+            ->add('choice_two', self::TESTED_TYPE, [
+                'choice_loader' => $choiceLoader,
+                'choice_value' => function ($choice) {
+                    return $choice ? (string) $choice * 10 : '';
+                },
+            ])
+            ->createView()
+        ;
+
+        $this->assertSame('1', $view['choice_one']->vars['choices'][0]->value);
+        $this->assertSame('2', $view['choice_one']->vars['choices'][1]->value);
+        $this->assertSame('3', $view['choice_one']->vars['choices'][2]->value);
+
+        $this->assertSame('10', $view['choice_two']->vars['choices'][0]->value);
+        $this->assertSame('20', $view['choice_two']->vars['choices'][1]->value);
+        $this->assertSame('30', $view['choice_two']->vars['choices'][2]->value);
+    }
 }