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

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 <!-- if yes, also update src/**/CHANGELOG.md -->
| Deprecations? | no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md -->
| Issues        | Fix #... <!-- prefix each issue number with "Fix #"; no need to create an issue if none exists, explain below -->
| License       | MIT

Commits
-------

92ae810 [Translation] fix support of `TranslatableInterface` in `IdentityTranslator`

Author: nicolas-grekas

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]';
     }
 

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);
     }
 }

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()

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);
         }