bug #61111 [Translation] fix support of TranslatableInterface in IdentityTranslator (VincentLanglet)

nicolas-grekas · nicolas-grekas · commit 4acd05c2d4e5 · 2025-07-15T14:06:42.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Translation] fix support of `TranslatableInterface` in `IdentityTranslator` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix #...  | License | MIT Commits ------- 92ae810 [Translation] fix support of `TranslatableInterface` in `IdentityTranslator`
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php
@@ -11,12 +11,19 @@
 
 namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;
 
+use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class StubTranslator implements TranslatorInterface
 {
     public function trans($id, array $parameters = [], $domain = null, $locale = null): string
     {
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($this, $locale);
+            }
+        }
+
         return '[trans]'.strtr($id, $parameters).'[/trans]';
     }
 
diff --git a/src/Symfony/Component/Translation/TranslatableMessage.php b/src/Symfony/Component/Translation/TranslatableMessage.php
@@ -52,9 +52,13 @@ public function getDomain(): ?string
 
     public function trans(TranslatorInterface $translator, ?string $locale = null): string
     {
-        return $translator->trans($this->getMessage(), array_map(
-            static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
-            $this->getParameters()
-        ), $this->getDomain(), $locale);
+        $parameters = $this->getParameters();
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($translator, $locale);
+            }
+        }
+
+        return $translator->trans($this->getMessage(), $parameters, $this->getDomain(), $locale);
     }
 }
diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Contracts\Translation\Test;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Contracts\Translation\TranslatorTrait;
 
@@ -116,10 +117,12 @@ public function testGetLocaleReturnsDefaultLocaleIfNotSet()
 
     public static function getTransTests()
     {
-        return [
-            ['Symfony is great!', 'Symfony is great!', []],
-            ['Symfony is awesome!', 'Symfony is %what%!', ['%what%' => 'awesome']],
-        ];
+        yield ['Symfony is great!', 'Symfony is great!', []];
+        yield ['Symfony is awesome!', 'Symfony is %what%!', ['%what%' => 'awesome']];
+
+        if (class_exists(TranslatableMessage::class)) {
+            yield ['He said "Symfony is awesome!".', 'He said "%what%".', ['%what%' => new TranslatableMessage('Symfony is %what%!', ['%what%' => 'awesome'])]];
+        }
     }
 
     public static function getTransChoiceTests()
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -41,6 +41,12 @@ public function trans(?string $id, array $parameters = [], ?string $domain = nul
             return '';
         }
 
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($this, $locale);
+            }
+        }
+
         if (!isset($parameters['%count%']) || !is_numeric($parameters['%count%'])) {
             return strtr($id, $parameters);
         }

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,19 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;`
`13`	`13`
	`14`	`+use Symfony\Contracts\Translation\TranslatableInterface;`
`14`	`15`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`15`	`16`
`16`	`17`	`class StubTranslator implements TranslatorInterface`
`17`	`18`	`{`
`18`	`19`	`public function trans($id, array $parameters = [], $domain = null, $locale = null): string`
`19`	`20`	`{`
	`21`	`+ foreach ($parameters as $k => $v) {`
	`22`	`+ if ($v instanceof TranslatableInterface) {`
	`23`	`+ $parameters[$k] = $v->trans($this, $locale);`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+`
`20`	`27`	`return '[trans]'.strtr($id, $parameters).'[/trans]';`
`21`	`28`	`}`
`22`	`29`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,13 @@ public function getDomain(): ?string`
`52`	`52`
`53`	`53`	`public function trans(TranslatorInterface $translator, ?string $locale = null): string`
`54`	`54`	`{`
`55`		`- return $translator->trans($this->getMessage(), array_map(`
`56`		`- static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,`
`57`		`- $this->getParameters()`
`58`		`- ), $this->getDomain(), $locale);`
	`55`	`+ $parameters = $this->getParameters();`
	`56`	`+ foreach ($parameters as $k => $v) {`
	`57`	`+ if ($v instanceof TranslatableInterface) {`
	`58`	`+ $parameters[$k] = $v->trans($translator, $locale);`
	`59`	`+ }`
	`60`	`+ }`
	`61`	`+`
	`62`	`+ return $translator->trans($this->getMessage(), $parameters, $this->getDomain(), $locale);`
`59`	`63`	`}`
`60`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,12 @@ public function trans(?string $id, array $parameters = [], ?string $domain = nul`
`41`	`41`	`return '';`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ foreach ($parameters as $k => $v) {`
	`45`	`+ if ($v instanceof TranslatableInterface) {`
	`46`	`+ $parameters[$k] = $v->trans($this, $locale);`
	`47`	`+ }`
	`48`	`+ }`
	`49`	`+`
`44`	`50`	`if (!isset($parameters['%count%']) \|\| !is_numeric($parameters['%count%'])) {`
`45`	`51`	`return strtr($id, $parameters);`
`46`	`52`	`}`