8000 Merge branch '3.0' · symfony/symfony@8fc9dd9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8fc9dd9

Browse files
fabpotfabpot
committed
Merge branch '3.0'
* 3.0: [WIP] [3.0] [Form] fix tests added by #17760 by removing removed obsolete code [HttpFoundation] Remove @throws from ParameterBag::get() PHPDoc. This was for the now removed deep flag. [Form] refactor `RadioListMapper::mapDataToForm()` [Form] fix choice value "false" in ChoiceType
2 parents c2d1c02 + 039980c commit 8fc9dd9

File tree

11 files changed

+232
-37
lines 8000 changed

11 files changed

+232
-37
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ private function updateReferences($container, $currentId, $newId)
9696
$this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
9797
);
9898

99-
$definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);
10099
$definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
101100
}
102101
}
@@ -126,15 +125,6 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)
126125
return $arguments;
127126
}
128127

129-
private function updateFactoryServiceReference($factoryService, $currentId, $newId)
130-
{
131-
if (null === $factoryService) {
132-
return;
133-
}
134-
135-
return $currentId === $factoryService ? $newId : $currentId;
136-
}
137-
138128
private function updateFactoryReference($factory, $currentId, $newId)
139129
{
140130
if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public function testProcess()
2323
$container = new ContainerBuilder();
2424

2525
$aDefinition = $container-& 8000 gt;register('a', '\stdClass');
26-
$aDefinition->setFactoryService('b', false);
27-
2826
$aDefinition->setFactory(array(new Reference('b'), 'createA'));
2927

3028
$bDefinition = new Definition('\stdClass');
@@ -44,8 +42,6 @@ public function testProcess()
4442
'->process() replaces alias to actual.'
4543
);
4644

47-
$this->assertSame('b_alias', $aDefinition->getFactoryService(false));
48-
4945
$resolvedFactory = $aDefinition->getFactory(false);
5046
$this->assertSame('b_alias', (string) $resolvedFactory[0]);
5147
}

‎src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function __construct($choices, callable $value = null)
7070

7171
if (null === $value && $this->castableToString($choices)) {
7272
$value = function ($choice) {
73-
return (string) $choice;
73+
return false === $choice ? '0' : (string) $choice;
7474
};
7575
}
7676

@@ -229,11 +229,11 @@ private function castableToString(array $choices, array &$cache = array())
229229
continue;
230230
} elseif (!is_scalar($choice)) {
231231
return false;
232-
} elseif (isset($cache[(string) $choice])) {
232+
} elseif (isset($cache[$choice])) {
233233
return false;
234234
}
235235

236-
$cache[(string) $choice] = true;
236+
$cache[$choice] = true;
237237
}
238238

239239
return true;

‎src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ public function __construct(ChoiceListInterface $choiceList)
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function mapDataToForms($choice, $radios)
41+
public function mapDataToForms($data, $radios)
4242
{
43-
$valueMap = array_flip($this->choiceList->getValuesForChoices(array($choice)));
44-
4543
foreach ($radios as $radio) {
4644
$value = $radio->getConfig()->getOption('value');
47-
$radio->setData(isset($valueMap[$value]) ? true : false);
45+
$radio->setData($value === $data ? true : false);
4846
}
4947
}
5048

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function transform($choice)
3939

4040
public function reverseTransform($value)
4141
{
42-
if (null !== $value && !is_scalar($value)) {
43-
throw new TransformationFailedException('Expected a scalar.');
42+
if (null !== $value && !is_string($value)) {
43+
throw new TransformationFailedException('Expected a string or null.');
4444
}
4545

4646
$choices = $this->choiceList->getChoicesForValues(array((string) $value));

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
144144
$event->setData(null);
145145
}
146146
});
147+
// For radio lists, pre selection of the choice needs to pre set data
148+
// with the string value so it can be matched in
149+
// {@link \Symfony\Component\Form\Extension\Core\DataMapper\RadioListMapper::mapDataToForms()}
150+
$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
151+
$choiceList = $event->getForm()->getConfig()->getAttribute('choice_list');
152+
$value = current($choiceList->getValuesForChoices(array($event->getData())));
153+
$event->setData((string) $value);
154+
});
147155
}
148156
} elseif ($options['multiple']) {
149157
// <select> tag with "multiple" option

‎src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,29 @@ public function testGetChoicesForValuesWithContainingNull()
129129

130130
$this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('0')));
131131
}
132+
133+
public function testGetChoicesForValuesWithContainingFalseAndNull()
134+
{
135+
$choiceList = new ArrayChoiceList(array('False' => false, 'Null' => null));
136+
137+
$this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('1')));
138+
$this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));
139+
}
140+
141+
public function testGetChoicesForValuesWithContainingEmptyStringAndNull()
142+
{
143+
$choiceList = new ArrayChoiceList(array('Empty String' => '', 'Null' => null));
144+
145+
$this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('0')));
146+
$this->assertSame(array(0 => null), $choiceList->getChoicesForValues(array('1')));
147+
}
148+
149+
public function testGetChoicesForValuesWithContainingEmptyStringAndBooleans()
150+
{
151+
$choiceList = new ArrayChoiceList(array('Empty String' => '', 'True' => true, 'False' => false));
152+
153+
$this->assertSame(array(0 => ''), $choiceList->getChoicesForValues(array('')));
154+
$this->assertSame(array(0 => true), $choiceList->getChoicesForValues(array('1')));
155+
$this->assertSame(array(0 => false), $choiceList->getChoicesForValues(array('0')));
156+
}
132157
}

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,60 +17,80 @@
1717
class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase
1818
{
1919
protected $transformer;
20+
protected $transformerWithNull;
2021

2122
protected function setUp()
2223
{
23-
$list = new ArrayChoiceList(array('', false, 'X'));
24+
$list = new ArrayChoiceList(array('', false, 'X', true));
25+
$listWithNull = new ArrayChoiceList(array('', false, 'X', null));
2426

2527
$this->transformer = new ChoiceToValueTransformer($list);
28+
$this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);
2629
}
2730

2831
protected function tearDown()
2932
{
3033
$this->transformer = null;
34+
$this->transformerWithNull = null;
3135
}
3236

3337
public function transformProvider()
3438
{
3539
return array(
3640
// more extensive test set can be found in FormUtilTest
37-
array('', '0'),
38-
array(false, '1'),
41+
array('', '', '', '0'),
42+
array(false, '0', false, '1'),
43+
array('X', 'X', 'X', '2'),
44+
array(true, '1', null, '3'),
3945
);
4046
}
4147

4248
/**
4349
* @dataProvider transformProvider
4450
*/
45-
public function testTransform($in, $out)
51+
public function testTransform($in, $out, $inWithNull, $outWithNull)
4652
{
4753
$this->assertSame($out, $this->transformer->transform($in));
54+
$this->assertSame($outWithNull, $this->transformerWithNull->transform($inWithNull));
4855
}
4956

5057
public function reverseTransformProvider()
5158
{
5259
return array(
5360
// values are expected to be valid choice keys already and stay
5461
// the same
55-
array('0', ''),
56-
array('1', false),
57-
array('2', 'X'),
62+
array('', '', '0', ''),
63+
array('0', false, '1', false),
64+
array('X', 'X', '2', 'X'),
65+
array('1', true, '3', null),
5866
);
5967
}
6068

6169
/**
6270
* @dataProvider reverseTransformProvider
6371
*/
64-
public function testReverseTransform($in, $out)
72+
public function testReverseTransform($in, $out, $inWithNull, $outWithNull)
6573
{
6674
$this->assertSame($out, $this->transformer->reverseTransform($in));
75+
$this->assertSame($outWithNull, $this->transformerWithNull->reverseTransform($inWithNull));
76+
}
77+
78+
public function reverseTransformExpectsStringOrNullProvider()
79+
{
80+
return array(
81+
array(0),
82+
array(true),
83+
array(false),
84+
array(array()),
85+
);
6786
}
6887

6988
/**
89+
* @dataProvider reverseTransformExpectsStringOrNullProvider
7090
* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
7191
*/
72-
public function testReverseTransformExpectsScalar()
92+
public function testReverseTransformExpectsStringOrNull($value)
7393
{
74-
$this->transformer->reverseTransform(array());
94+
$this->transformer->reverseTransform($value);
7595
}
7696
}

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,34 @@
1717
class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
1818
{
1919
protected $transformer;
20+
protected $transformerWithNull;
2021

2122
protected function setUp()
2223
{
2324
$list = new ArrayChoiceList(array('', false, 'X'));
25+
$listWithNull = new ArrayChoiceList(array('', false, 'X', null));
26+
2427
$this->transformer = new ChoicesToValuesTransformer($list);
28+
$this->transformerWithNull = new ChoicesToValuesTransformer($listWithNull);
2529
}
2630

2731
protected function tearDown()
2832
{
2933
$this->transformer = null;
34+
$this->transformerWithNull = null;
3035
}
3136

3237
public function testTransform()
3338
{
3439
$in = array('', false, 'X');
35-
$out = array('0', '1', '2');
40+
$out = array('', '0', 'X');
3641

3742
$this->assertSame($out, $this->transformer->transform($in));
43+
44+
$in[] = null;
45+
$outWithNull = array('0', '1', '2', '3');
46+
47+
$this->assertSame($outWithNull, $this->transformerWithNull->transform($in));
3848
}
3949

4050
public function testTransformNull()
@@ -53,15 +63,21 @@ public function testTransformExpectsArray()
5363
public function testReverseTransform()
5464
{
5565
// values are expected to be valid choices and stay the same
56-
$in = array('0', '1', '2');
66+
$in = array('', '0', 'X');
5767
$out = array('', false, 'X');
5868

5969
$this->assertSame($out, $this->transformer->reverseTransform($in));
70+
// values are expected to be valid choices and stay the same
71+
$inWithNull = array('0','1','2','3');
72+
$out[] = null;
73+
74+
$this->assertSame($out, $this->transformerWithNull->reverseTransform($inWithNull));
6075
}
6176

6277
public function testReverseTransformNull()
6378
{
6479
$this->assertSame(array(), $this->transformer->reverseTransform(null));
80+
$this->assertSame(array(), $this->transformerWithNull->reverseTransform(null));
6581
}
6682

6783
/**

0 commit comments

Comments
 (0)
0