Commit22f3851

committed

[Form] Fixed trimming choice values

1 parent1067468 commit22f3851Copy full SHA for 22f3851

File tree

+34

-0

lines changed

src/Symfony/Component/Form
- Extension/Core/Type
  - ChoiceType.php
- Tests/Extension/Core/Type
  - ChoiceTypeTest.php

+34

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,7 @@ public function configureOptions(OptionsResolver $resolver)`
`413`	`413`	`// See https://github.com/symfony/symfony/pull/5582`
`414`	`414`	`'data_class' =>null,`
`415`	`415`	`'choice_translation_domain' =>true,`
	`416`	`+'trim' =>false,`
`416`	`417`	`));`
`417`	`418`
`418`	`419`	`$resolver->setNormalizer('choices',$choicesNormalizer);`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2421,4 +2421,37 @@ public function invalidNestedValueTestMatrix()`
`2421`	`2421`	`'multiple, expanded' =>array(true,true,array(array())),`
`2422`	`2422`	`);`
`2423`	`2423`	`}`
	`2424`	`+`
	`2425`	`+/**`
	`2426`	`+ * @dataProvider provideTrimCases`
	`2427`	`+ */`
	`2428`	`+publicfunctiontestTrimIsDisabled($multiple,$expanded)`
	`2429`	`+ {`
	`2430`	`+$form =$this->factory->create(static::TESTED_TYPE,null,array(`
	`2431`	`+'multiple' =>$multiple,`
	`2432`	`+'expanded' =>$expanded,`
	`2433`	`+'choices' =>array(`
	`2434`	`+'a' =>'1',`
	`2435`	`+ ),`
	`2436`	`+'choices_as_values' =>true,`
	`2437`	`+ ));`
	`2438`	`+`
	`2439`	`+$submittedData =' 1';`
	`2440`	`+`
	`2441`	`+$form->submit($multiple ? (array)$submittedData :$submittedData);`
	`2442`	`+`
	`2443`	`+// When the choice does not exist the transformation fails`
	`2444`	`+$this->assertFalse($form->isSynchronized());`
	`2445`	`+$this->assertNull($form->getData());`
	`2446`	`+ }`
	`2447`	`+`
	`2448`	`+publicfunctionprovideTrimCases()`
	`2449`	`+ {`
	`2450`	`+returnarray(`
	`2451`	`+'Simple' =>array(false,false),`
	`2452`	`+'Multiple' =>array(true,false),`
	`2453`	`+'Simple expanded' =>array(false,true),`
	`2454`	`+'Multiple expanded' =>array(true,true),`
	`2455`	`+ );`
	`2456`	`+ }`
`2424`	`2457`	`}`

Comments

(0)