diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Form] Fix field_value Twig helper

Browse Source
This commit is contained in:
Titouan Galopin 2020-10-07 10:47:49 +02:00
parent 494ef421c5
commit 7b414a96df
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -103,7 +103,10 @@ final class FormExtension extends AbstractExtension
return $view->vars['full_name'];
}
public function getFieldValue(FormView $view): string
/**
* @return string|array
*/
public function getFieldValue(FormView $view)
{
return $view->vars['value'];
}

52
src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionFieldHelpersTest.php
View File

@ -49,7 +49,12 @@ class FormExtensionFieldHelpersTest extends FormIntegrationTestCase
$this->rawExtension = new FormExtension();
$this->translatorExtension = new FormExtension(new StubTranslator());
$form = $this->factory->createNamedBuilder('register', FormType::class, ['username' => 'tgalopin'])
$data = [
'username' => 'tgalopin',
'choice_multiple' => ['sugar', 'salt'],
];
$form = $this->factory->createNamedBuilder('register', FormType::class, $data)
->add('username', TextType::class, [
'label' => 'base.username',
'label_translation_parameters' => ['%label_brand%' => 'Symfony'],
@ -77,6 +82,14 @@ class FormExtensionFieldHelpersTest extends FormIntegrationTestCase
],
'choice_translation_domain' => 'forms',
])
->add('choice_multiple', ChoiceType::class, [
'choices' => [
'base.sugar' => 'sugar',
'base.salt' => 'salt',
],
'multiple' => true,
'expanded' => true,
])
->getForm()
;
@ -95,6 +108,7 @@ class FormExtensionFieldHelpersTest extends FormIntegrationTestCase
public function testFieldValue()
{
$this->assertSame('tgalopin', $this->rawExtension->getFieldValue($this->view->children['username']));
$this->assertSame(['sugar', 'salt'], $this->rawExtension->getFieldValue($this->view->children['choice_multiple']));
}
public function testFieldLabel()
@ -234,4 +248,40 @@ class FormExtensionFieldHelpersTest extends FormIntegrationTestCase
$this->assertSame('jp', $choicesArray[1]['choices'][1]['value']);
$this->assertSame('[trans]base.jp[/trans]', $choicesArray[1]['choices'][1]['label']);
}
public function testFieldChoicesMultiple()
{
$choices = $this->rawExtension->getFieldChoices($this->view->children['choice_multiple']);
$choicesArray = [];
foreach ($choices as $label => $value) {
$choicesArray[] = ['label' => $label, 'value' => $value];
}
$this->assertCount(2, $choicesArray);
$this->assertSame('sugar', $choicesArray[0]['value']);
$this->assertSame('base.sugar', $choicesArray[0]['label']);
$this->assertSame('salt', $choicesArray[1]['value']);
$this->assertSame('base.salt', $choicesArray[1]['label']);
}
public function testFieldTranslatedChoicesMultiple()
{
$choices = $this->translatorExtension->getFieldChoices($this->view->children['choice_multiple']);
$choicesArray = [];
foreach ($choices as $label => $value) {
$choicesArray[] = ['label' => $label, 'value' => $value];
}
$this->assertCount(2, $choicesArray);
$this->assertSame('sugar', $choicesArray[0]['value']);
$this->assertSame('[trans]base.sugar[/trans]', $choicesArray[0]['label']);
$this->assertSame('salt', $choicesArray[1]['value']);
$this->assertSame('[trans]base.salt[/trans]', $choicesArray[1]['label']);
}
}