Skip to content

Commit 2ec86df

Browse files
xabbuhxabbuh
committed
Merge branch '4.4' into 5.4
* 4.4: [Form] Fix same choice loader with different choice values [Filesystem] Safeguard (sym)link calls
2 parents 39e4eda + 6b96295 commit 2ec86df

File tree

5 files changed

+58
-23
lines changed

5 files changed

+58
-23
lines changed

‎ChoiceList/Loader/AbstractChoiceLoader.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
abstract class AbstractChoiceLoader implements ChoiceLoaderInterface
2121
{
2222
/**
23-
* The loaded choice list.
23+
* The loaded choices.
2424
*
25-
* @var ArrayChoiceList
25+
* @var iterable|null
2626
*/
27-
private $choiceList;
27+
private $choices;
2828

2929
/**
3030
* @final
@@ -33,7 +33,7 @@ abstract class AbstractChoiceLoader implements ChoiceLoaderInterface
3333
*/
3434
public function loadChoiceList(callable $value = null): ChoiceListInterface
3535
{
36-
return $this->choiceList ?? ($this->choiceList = new ArrayChoiceList($this->loadChoices(), $value));
36+
return new ArrayChoiceList($this->choices ?? $this->choices = $this->loadChoices(), $value);
3737
}
3838

3939
/**
@@ -45,10 +45,6 @@ public function loadChoicesForValues(array $values, callable $value = null)
4545
return [];
4646
}
4747

48-
if ($this->choiceList) {
49-
return $this->choiceList->getChoicesForValues($values);
50-
}
51-
5248
return $this->doLoadChoicesForValues($values, $value);
5349
}
5450

@@ -66,10 +62,6 @@ public function loadValuesForChoices(array $choices, callable $value = null)
6662
return array_map($value, $choices);
6763
}
6864

69-
if ($this->choiceList) {
70-
return $this->choiceList->getValuesForChoices($choices);
71-
}
72-
7365
return $this->doLoadValuesForChoices($choices);
7466
}
7567

‎Tests/ChoiceList/LazyChoiceListTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testGetChoiceLoadersLoadsLoadedListOnFirstCall()
3232

3333
$this->assertSame(['RESULT'], $list->getChoices());
3434
$this->assertSame(['RESULT'], $list->getChoices());
35-
$this->assertSame(1, $calls);
35+
$this->assertSame(2, $calls);
3636
}
3737

3838
public function testGetValuesLoadsLoadedListOnFirstCall()
@@ -46,7 +46,7 @@ public function testGetValuesLoadsLoadedListOnFirstCall()
4646

4747
$this->assertSame(['RESULT'], $list->getValues());
4848
$this->assertSame(['RESULT'], $list->getValues());
49-
$this->assertSame(1, $calls);
49+
$this->assertSame(2, $calls);
5050
}
5151

5252
public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
@@ -60,7 +60,7 @@ public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
6060

6161
$this->assertSame(['RESULT'], $list->getStructuredValues());
6262
$this->assertSame(['RESULT'], $list->getStructuredValues());
63-
$this->assertSame(1, $calls);
63+
$this->assertSame(2, $calls);
6464
}
6565

6666
public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
@@ -79,7 +79,7 @@ public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
7979

8080
$this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
8181
$this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
82-
$this->assertSame(3, $calls);
82+
$this->assertSame(6, $calls);
8383
}
8484

8585
public function testGetChoicesForValuesForwardsCallIfListNotLoaded()
@@ -98,7 +98,7 @@ public function testGetChoicesForValuesForwardsCallIfListNotLoaded()
9898

9999
$this->assertSame(['foo', 'bar'], $list->getChoicesForValues(['a', 'b']));
100100
$this->assertSame(['foo', 'bar'], $list->getChoicesForValues(['a', 'b']));
101-
$this->assertSame(3, $calls);
101+
$this->assertSame(6, $calls);
102102
}
103103

104104
public function testGetChoicesForValuesUsesLoadedList()

‎Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,18 @@ public function testLoadChoiceList()
6767
$this->assertInstanceOf(ChoiceListInterface::class, self::$loader->loadChoiceList(self::$value));
6868
}
6969

70-
public function testLoadChoiceListOnlyOnce()
70+
public function testLoadChoicesOnlyOnce()
7171
{
72-
$loadedChoiceList = self::$loader->loadChoiceList(self::$value);
72+
$calls = 0;
73+
$loader = new CallbackChoiceLoader(function () use (&$calls) {
74+
++$calls;
7375

74-
$this->assertSame($loadedChoiceList, self::$loader->loadChoiceList(self::$value));
76+
return [1];
77+
});
78+
$loadedChoiceList = $loader->loadChoiceList();
79+
80+
$this->assertNotSame($loadedChoiceList, $loader->loadChoiceList());
81+
$this->assertSame(1, $calls);
7582
}
7683

7784
public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()

‎Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,19 @@ public function testLoadChoiceList()
6868
$this->assertInstanceOf(ChoiceListInterface::class, self::$loader->loadChoiceList(self::$value));
6969
}
7070

71-
public function testLoadChoiceListOnlyOnce()
71+
public function testLoadChoicesOnlyOnce()
7272
{
73-
$loadedChoiceList = self::$loader->loadChoiceList(self::$value);
73+
$calls = 0;
74+
$loader = new IntlCallbackChoiceLoader(function () use (&$calls) {
75+
++$calls;
7476

75-
$this->assertSame($loadedChoiceList, self::$loader->loadChoiceList(self::$value));
77+
return self::$choices;
78+
});
79+
80+
$loadedChoiceList = $loader->loadChoiceList(self::$value);
81+
82+
$this->assertNotSame($loadedChoiceList, $loader->loadChoiceList(self::$value));
83+
$this->assertSame(1, $calls);
7684
}
7785

7886
public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()

‎Tests/Extension/Core/Type/ChoiceTypeTest.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,4 +2264,32 @@ public function testUsingDeprecatedChoiceListFactory()
22642264

22652265
new ChoiceType(new DeprecatedChoiceListFactory());
22662266
}
2267+
2268+
public function testWithSameLoaderAndDifferentChoiceValueCallbacks()
2269+
{
2270+
$choiceLoader = new CallbackChoiceLoader(function () {
2271+
return [1, 2, 3];
2272+
});
2273+
2274+
$view = $this->factory->create(FormTypeTest::TESTED_TYPE)
2275+
->add('choice_one', self::TESTED_TYPE, [
2276+
'choice_loader' => $choiceLoader,
2277+
])
2278+
->add('choice_two', self::TESTED_TYPE, [
2279+
'choice_loader' => $choiceLoader,
2280+
'choice_value' => function ($choice) {
2281+
return $choice ? (string) $choice * 10 : '';
2282+
},
2283+
])
2284+
->createView()
2285+
;
2286+
2287+
$this->assertSame('1', $view['choice_one']->vars['choices'][0]->value);
2288+
$this->assertSame('2', $view['choice_one']->vars['choices'][1]->value);
2289+
$this->assertSame('3', $view['choice_one']->vars['choices'][2]->value);
2290+
2291+
$this->assertSame('10', $view['choice_two']->vars['choices'][0]->value);
2292+
$this->assertSame('20', $view['choice_two']->vars['choices'][1]->value);
2293+
$this->assertSame('30', $view['choice_two']->vars['choices'][2]->value);
2294+
}
22672295
}

0 commit comments

Comments
 (0)