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

bug #37941 [TwigBridge] allow null for $message of filter method trans (Flinsch)

Browse Source 
This PR was merged into the 5.1 branch.

Discussion
----------

[TwigBridge] allow null for $message of filter method `trans`

| Q             | A
| ------------- | ---
| Branch?       | 5.0
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #37931
| License       | MIT

With Symfony 5.0, filter method `trans` of Symfony Twig Bridge does not allow null values for `$message` parameter anymore, breaking backward compatibility. See also #37931. The included commit provides a fix to this BC break by allowing null values again.

Commits
-------

039fc80d6c [TwigBridge] Fix #37931: BC break where filter method `trans` did not allow null values for `$message` parameter anymore
This commit is contained in:
Nicolas Grekas 2020-08-26 16:33:20 +02:00
commit 9c86cd2b4e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
View File

@ -92,8 +92,12 @@ final class TranslationExtension extends AbstractExtension
return $this->translationNodeVisitor ?: $this->translationNodeVisitor = new TranslationNodeVisitor();
}
public function trans(string $message, array $arguments = [], string $domain = null, string $locale = null, int $count = null): string
public function trans(?string $message, array $arguments = [], string $domain = null, string $locale = null, int $count = null): string
{
if (null === $message || '' === $message) {
return '';
}
if (null !== $count) {
$arguments['%count%'] = $count;
}

4
src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
View File

@ -118,6 +118,10 @@ class TranslationExtensionTest extends TestCase
['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|trans(count=count) }}', 'There is 5 apples', ['count' => 5]],
['{{ text|trans(count=5, arguments={\'%name%\': \'Symfony\'}) }}', 'There is 5 apples (Symfony)', ['text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)']],
['{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|trans({}, "messages", "fr", count) }}', 'There is 5 apples', ['count' => 5]],
// trans filter with null message
['{{ null|trans }}', ''],
['{{ foo|trans }}', '', ['foo' => null]],
];
}