bug #31164 [Validator] fix LegacyTranslatorProxy (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5379e7317f4f · 2019-04-18T15:30:30.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [Validator] fix LegacyTranslatorProxy | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31161 | License | MIT | Doc PR | - Commits ------- b1f3284 [Validator] fix LegacyTranslatorProxy
diff --git a/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php b/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php
@@ -22,15 +22,26 @@ class LegacyTranslatorProxy implements LegacyTranslatorInterface, TranslatorInte
 {
     private $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    /**
+     * @param LegacyTranslatorInterface|TranslatorInterface $translator
+     */
+    public function __construct($translator)
     {
-        if (!$translator instanceof LocaleAwareInterface) {
+        if ($translator instanceof LegacyTranslatorInterface) {
+            // no-op
+        } elseif (!$translator instanceof TranslatorInterface) {
+            throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s" or "%s".', __METHOD__, TranslatorInterface::class, LegacyTranslatorInterface::class));
+        } elseif (!$translator instanceof LocaleAwareInterface) {
             throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s".', __METHOD__, LocaleAwareInterface::class));
         }
+
         $this->translator = $translator;
     }
 
-    public function getTranslator(): TranslatorInterface
+    /**
+     * @return LegacyTranslatorInterface|TranslatorInterface
+     */
+    public function getTranslator()
     {
         return $this->translator;
     }

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,26 @@ class LegacyTranslatorProxy implements LegacyTranslatorInterface, TranslatorInte`
`22`	`22`	`{`
`23`	`23`	`private $translator;`
`24`	`24`
`25`		`- public function __construct(TranslatorInterface $translator)`
	`25`	`+ /**`
	`26`	`+ * @param LegacyTranslatorInterface\|TranslatorInterface $translator`
	`27`	`+ */`
	`28`	`+ public function __construct($translator)`
`26`	`29`	`{`
`27`		`- if (!$translator instanceof LocaleAwareInterface) {`
	`30`	`+ if ($translator instanceof LegacyTranslatorInterface) {`
	`31`	`+ // no-op`
	`32`	`+ } elseif (!$translator instanceof TranslatorInterface) {`
	`33`	`+ throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s" or "%s".', __METHOD__, TranslatorInterface::class, LegacyTranslatorInterface::class));`
	`34`	`+ } elseif (!$translator instanceof LocaleAwareInterface) {`
`28`	`35`	`throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s".', __METHOD__, LocaleAwareInterface::class));`
`29`	`36`	`}`
	`37`	`+`
`30`	`38`	`$this->translator = $translator;`
`31`	`39`	`}`
`32`	`40`
`33`		`- public function getTranslator(): TranslatorInterface`
	`41`	`+ /**`
	`42`	`+ * @return LegacyTranslatorInterface\|TranslatorInterface`
	`43`	`+ */`
	`44`	`+ public function getTranslator()`
`34`	`45`	`{`
`35`	`46`	`return $this->translator;`
`36`	`47`	`}`