Remove translatable object handling from translators

natewiebe13 · natewiebe13 · commit f6370da78441 · 2020-08-11T13:43:51.000-04:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php
@@ -11,20 +11,12 @@
 
 namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;
 
-use Symfony\Component\Translation\Translatable;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class StubTranslator implements TranslatorInterface
 {
     public function trans($id, array $parameters = [], $domain = null, $locale = null): string
     {
-        if ($id instanceof Translatable) {
-            $parameters += $id->getParameters();
-            $id = $id->getMessageId();
-        }
-
-        $id = (string) $id;
-
         return '[trans]'.strtr($id, $parameters).'[/trans]';
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
@@ -108,7 +108,7 @@ public function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()
 
 class TranslatorWithTranslatorBag implements TranslatorInterface
 {
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null): string
+    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string
     {
     }
 }
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -47,17 +47,9 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null)
+    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
     {
-        if ($id instanceof Translatable) {
-            $parameters += $id->getParameters();
-            $domain = $id->getDomain();
-            $id = $id->getMessageId();
-        }
-
-        $id = (string) $id;
-
-        $trans = $this->translator->trans($id, $parameters, $domain, $locale);
+        $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale);
         $this->collectMessage($locale, $domain, $id, $trans, $parameters);
 
         return $trans;
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -44,17 +44,9 @@ public function __construct(TranslatorInterface $translator, LoggerInterface $lo
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null)
+    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
     {
-        if ($id instanceof Translatable) {
-            $parameters += $id->getParameters();
-            $domain = $id->getDomain();
-            $id = $id->getMessageId();
-        }
-
-        $id = (string) $id;
-
-        $trans = $this->translator->trans($id, $parameters, $domain, $locale);
+        $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale);
         $this->log($id, $domain, $locale);
 
         return $trans;
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -193,20 +193,12 @@ public function getFallbackLocales(): array
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null)
+    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
     {
-        if ($id instanceof Translatable) {
-            $parameters += $id->getParameters();
-            $domain = $id->getDomain();
-            $id = $id->getMessageId();
-        }
-
         if (null === $id || '' === $id) {
             return '';
         }
 
-        $id = (string) $id;
-
         if (null === $domain) {
             $domain = 'messages';
         }
diff --git a/src/Symfony/Contracts/Translation/TranslatorInterface.php b/src/Symfony/Contracts/Translation/TranslatorInterface.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Contracts\Translation;
 
-use Symfony\Component\Translation\Translatable;
-
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -54,14 +52,14 @@ interface TranslatorInterface
      *
      * @see https://en.wikipedia.org/wiki/ISO_31-11
      *
-     * @param string|Translatable $id         The message id (may also be an object that can be cast to string)
-     * @param array               $parameters An array of parameters for the message
-     * @param string|null         $domain     The domain for the message or null to use the default
-     * @param string|null         $locale     The locale or null to use the default
+     * @param string      $id         The message id (may also be an object that can be cast to string)
+     * @param array       $parameters An array of parameters for the message
+     * @param string|null $domain     The domain for the message or null to use the default
+     * @param string|null $locale     The locale or null to use the default
      *
      * @return string The translated string
      *
      * @throws \InvalidArgumentException If the locale contains invalid characters
      */
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null);
+    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null);
 }
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -12,7 +12,6 @@
 namespace Symfony\Contracts\Translation;
 
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
-use Symfony\Component\Translation\Translatable;
 
 /**
  * A trait to help implement TranslatorInterface and LocaleAwareInterface.
@@ -42,19 +41,12 @@ public function getLocale()
     /**
      * {@inheritdoc}
      */
-    public function trans($id, array $parameters = [], string $domain = null, string $locale = null): string
+    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
     {
-        if ($id instanceof Translatable) {
-            $parameters += $id->getParameters();
-            $id = $id->getMessageId();
-        }
-
         if (null === $id || '' === $id) {
             return '';
         }
 
-        $id = (string) $id;
-
         if (!isset($parameters['%count%']) || !is_numeric($parameters['%count%'])) {
             return strtr($id, $parameters);
         }

Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,12 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;`
`13`	`13`
`14`		`-use Symfony\Component\Translation\Translatable;`
`15`	`14`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`16`	`15`
`17`	`16`	`class StubTranslator implements TranslatorInterface`
`18`	`17`	`{`
`19`	`18`	`public function trans($id, array $parameters = [], $domain = null, $locale = null): string`
`20`	`19`	`{`
`21`		`- if ($id instanceof Translatable) {`
`22`		`- $parameters += $id->getParameters();`
`23`		`- $id = $id->getMessageId();`
`24`		`- }`
`25`		`-`
`26`		`- $id = (string) $id;`
`27`		`-`
`28`	`20`	`return '[trans]'.strtr($id, $parameters).'[/trans]';`
`29`	`21`	`}`
`30`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()`
`108`	`108`
`109`	`109`	`class TranslatorWithTranslatorBag implements TranslatorInterface`
`110`	`110`	`{`
`111`		`- public function trans($id, array $parameters = [], string $domain = null, string $locale = null): string`
	`111`	`+ public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string`
`112`	`112`	`{`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Contracts\Translation;`
`13`	`13`
`14`		`-use Symfony\Component\Translation\Translatable;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* @author Fabien Potencier <fabien@symfony.com>`
`18`	`16`	`*/`
`@@ -54,14 +52,14 @@ interface TranslatorInterface`
`54`	`52`	`*`
`55`	`53`	`* @see https://en.wikipedia.org/wiki/ISO_31-11`
`56`	`54`	`*`
`57`		`- * @param string\|Translatable $id The message id (may also be an object that can be cast to string)`
`58`		`- * @param array $parameters An array of parameters for the message`
`59`		`- * @param string\|null $domain The domain for the message or null to use the default`
`60`		`- * @param string\|null $locale The locale or null to use the default`
	`55`	`+ * @param string $id The message id (may also be an object that can be cast to string)`
	`56`	`+ * @param array $parameters An array of parameters for the message`
	`57`	`+ * @param string\|null $domain The domain for the message or null to use the default`
	`58`	`+ * @param string\|null $locale The locale or null to use the default`
`61`	`59`	`*`
`62`	`60`	`* @return string The translated string`
`63`	`61`	`*`
`64`	`62`	`* @throws \InvalidArgumentException If the locale contains invalid characters`
`65`	`63`	`*/`
`66`		`- public function trans($id, array $parameters = [], string $domain = null, string $locale = null);`
	`64`	`+ public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null);`
`67`	`65`	`}`