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

bug #40124 [Form] merge translation parameters with value configured for parent form (xabbuh)

Browse Source 
This PR was merged into the 5.2 branch.

Discussion
----------

[Form] merge translation parameters with value configured for parent form

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #39874
| License       | MIT
| Doc PR        |

Commits
-------

3de453c368 merge translation parameters with value configured for parent form
This commit is contained in:
Nicolas Grekas 2021-02-07 19:43:45 +01:00
commit b9af88f9db
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
View File

@ -185,14 +185,16 @@ class ViolationMapper implements ViolationMapperInterface
if (null !== $this->translator) {
$form = $scope;
$translationParameters = $form->getConfig()->getOption('label_translation_parameters', []);
do {
$translationDomain = $form->getConfig()->getOption('translation_domain');
$translationParameters = array_merge($form->getConfig()->getOption('label_translation_parameters', []), $translationParameters);
} while (null === $translationDomain && null !== $form = $form->getParent());
$label = $this->translator->trans(
$label,
$scope->getConfig()->getOption('label_translation_parameters', []),
$translationParameters,
$translationDomain
);
}

38
src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
View File

@ -1786,6 +1786,44 @@ class ViolationMapperTest extends TestCase
$this->assertSame('Message "translated foo label"', $errors[0]->getMessage());
}
public function testLabelPlaceholderTranslatedWithTranslationParametersMergedFromParentForm()
{
$translator = $this->createMock(TranslatorInterface::class);
$translator->expects($this->any())
->method('trans')
->with('foo', [
'{{ param_defined_in_parent }}' => 'param defined in parent value',
'{{ param_defined_in_child }}' => 'param defined in child value',
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child child value',
])
->willReturn('translated foo label')
;
$this->mapper = new ViolationMapper(null, $translator);
$form = $this->getForm('', null, null, [], false, true, [
'label_translation_parameters' => [
'{{ param_defined_in_parent }}' => 'param defined in parent value',
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child parent value',
],
]);
$child = $this->getForm('foo', 'foo', null, [], false, true, [
'label' => 'foo',
'label_translation_parameters' => [
'{{ param_defined_in_child }}' => 'param defined in child value',
'{{ param_defined_in_parent_overridden_in_child }}' => 'param defined in parent overridden in child child value',
],
]);
$form->add($child);
$violation = new ConstraintViolation('Message "{{ label }}"', null, [], null, 'data.foo', null);
$this->mapper->mapViolation($violation, $form);
$errors = iterator_to_array($child->getErrors());
$this->assertCount(1, $errors, $child->getName().' should have an error, but has none');
$this->assertSame('Message "translated foo label"', $errors[0]->getMessage());
}
public function testTranslatorNotCalledWithoutLabel()
{
$renderer = $this->getMockBuilder(FormRenderer::class)