Optimise code

VincentLanglet · VincentLanglet · commit d8f229c6fceb · 2025-07-15T13:58:01.000+02:00
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/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -41,10 +41,11 @@ public function trans(?string $id, array $parameters = [], ?string $domain = nul
             return '';
         }
 
-        $parameters = array_map(
-            fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($this, $locale) : $parameter,
-            $parameters,
-        );
+        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
`@@ -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`	`}`