bug #31761 [TwigBridge] suggest Translation Component when TranslationExtension is used (nicolas-grekas)

fabpot · fabpot · commit d8224b87c84a · 2019-06-01T11:33:08.000+03:00
This PR was merged into the 4.3 branch. Discussion ---------- [TwigBridge] suggest Translation Component when TranslationExtension is used | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31754 | License | MIT | Doc PR | - Commits ------- d4a9e7e [TwigBridge] suggest Translation Component when TranslationExtension is used
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -49,11 +49,19 @@ public function __construct($translator = null, NodeVisitorInterface $translatio
     }
 
     /**
-     * @deprecated since Symfony 4.2
+     * @return TranslatorInterface|null
      */
     public function getTranslator()
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        if (null === $this->translator) {
+            if (!interface_exists(TranslatorInterface::class)) {
+                throw new \LogicException(sprintf('You cannot use the "%s" if the Translation Contracts are not available. Try running "composer require symfony/translation".', __CLASS__));
+            }
+
+            $this->translator = new class() implements TranslatorInterface {
+                use TranslatorTrait;
+            };
+        }
 
         return $this->translator;
     }
@@ -108,31 +116,22 @@ public function trans($message, array $arguments = [], $domain = null, $locale =
         if (null !== $count) {
             $arguments['%count%'] = $count;
         }
-        if (null === $this->translator) {
-            $this->translator = new class() implements TranslatorInterface {
-                use TranslatorTrait;
-            };
-        }
 
-        return $this->translator->trans($message, $arguments, $domain, $locale);
+        return $this->getTranslator()->trans($message, $arguments, $domain, $locale);
     }
 
     /**
      * @deprecated since Symfony 4.2, use the trans() method instead with a %count% parameter
      */
     public function transchoice($message, $count, array $arguments = [], $domain = null, $locale = null)
     {
-        if (null === $this->translator) {
-            $this->translator = new class() implements TranslatorInterface {
-                use TranslatorTrait;
-            };
-        }
+        $translator = $this->getTranslator();
 
-        if ($this->translator instanceof TranslatorInterface) {
-            return $this->translator->trans($message, array_merge(['%count%' => $count], $arguments), $domain, $locale);
+        if ($translator instanceof TranslatorInterface) {
+            return $translator->trans($message, array_merge(['%count%' => $count], $arguments), $domain, $locale);
         }
 
-        return $this->translator->transChoice($message, $count, array_merge(['%count%' => $count], $arguments), $domain, $locale);
+        return $translator->transChoice($message, $count, array_merge(['%count%' => $count], $arguments), $domain, $locale);
     }
 
     /**
