Fixes according to feedback

Nyholm · Nyholm · commit 2aa7181e1514 · 2018-09-04T00:13:51.000+02:00
diff --git a/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php b/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
@@ -15,7 +15,7 @@
  * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
  */
-class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
+class IntlMessageFormatter implements MessageFormatterInterface
 {
     /**
      * {@inheritdoc}
@@ -38,12 +38,4 @@ public function format($message, $locale, array $parameters = array())
 
         return $message;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function choiceFormat($message, $number, $locale, array $parameters = array())
-    {
-        return $this->format($message, $locale, $parameters);
-    }
 }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -205,17 +205,13 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
-        if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {
-            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($this->formatter)));
-        }
-
         if (null === $domain) {
             $domain = 'messages';
         }
 
         $formatter = $this->getFormatter($domain);
         if (!$formatter instanceof ChoiceMessageFormatterInterface) {
-            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', get_class($formatter)));
+            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($formatter)));
         }
 
         $id = (string) $id;

Original file line number	Diff line number	Diff line change
`@@ -205,17 +205,13 @@ public function trans($id, array $parameters = array(), $domain = null, $locale`
`205`	`205`	`*/`
`206`	`206`	`public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)`
`207`	`207`	`{`
`208`		`- if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {`
`209`		`- throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($this->formatter)));`
`210`		`- }`
`211`		`-`
`212`	`208`	`if (null === $domain) {`
`213`	`209`	`$domain = 'messages';`
`214`	`210`	`}`
`215`	`211`
`216`	`212`	`$formatter = $this->getFormatter($domain);`
`217`	`213`	`if (!$formatter instanceof ChoiceMessageFormatterInterface) {`
`218`		`- throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', get_class($formatter)));`
	`214`	`+ throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($formatter)));`
`219`	`215`	`}`
`220`	`216`
`221`	`217`	`$id = (string) $id;`