diff --git a/Service/ServiceSubscriberTrait.php b/Service/ServiceSubscriberTrait.php
index ed4cec0..58ea7c5 100644
--- a/Service/ServiceSubscriberTrait.php
+++ b/Service/ServiceSubscriberTrait.php
@@ -53,7 +53,7 @@ public static function getSubscribedServices(): array
throw new \LogicException(\sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
}
- /* @var SubscribedService $attribute */
+ /** @var SubscribedService $attribute */
$attribute = $attribute->newInstance();
$attribute->key ??= self::class.'::'.$method->name;
$attribute->type ??= $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
diff --git a/Translation/Test/TranslatorTest.php b/Translation/Test/TranslatorTest.php
index da19d09..5342f5b 100644
--- a/Translation/Test/TranslatorTest.php
+++ b/Translation/Test/TranslatorTest.php
@@ -14,6 +14,7 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\TranslatableMessage;
use Symfony\Contracts\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorTrait;
@@ -124,10 +125,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/Translation/TranslatorTrait.php b/Translation/TranslatorTrait.php
index 06210b0..afedd99 100644
--- a/Translation/TranslatorTrait.php
+++ b/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);
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy