fixed some issues.

aitboudad · aitboudad · commit d3e208cd2cc5 · 2015-07-01T12:29:05.000Z
diff --git a/src/Symfony/Component/Translation/Formatter/DefaultMessageFormatter.php b/src/Symfony/Component/Translation/Formatter/DefaultMessageFormatter.php
@@ -21,7 +21,7 @@ class DefaultMessageFormatter implements MessageFormatterInterface
     /**
      * @var MessageSelector
      */
-    protected $selector;
+    private $selector;
 
     /**
      * @param MessageSelector $selector Message selector to choose pluralization messages.
@@ -36,9 +36,7 @@ public function __construct(MessageSelector $selector = null)
      */
     public function format($locale, $id, $number = null, array $arguments = array())
     {
-        $pattern = ($number !== null)
-            ? $this->selector->choose($id, (int) $number, $locale)
-            : $id;
+        $pattern = null !== $number ? $this->selector->choose($id, (int) $number, $locale) : $id;
 
         return strtr($pattern, $arguments);
     }
diff --git a/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php b/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
@@ -21,32 +21,20 @@ class IntlMessageFormatter implements MessageFormatterInterface
      */
     public function format($locale, $id, $number = null, array $arguments = array())
     {
-        if ($number !== null) {
+        if (null !== $number) {
             array_unshift($arguments, $number);
         }
 
         $formatter = new \MessageFormatter($locale, $id);
 
         if (null === $formatter) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    'Invalid message format. Reason: %s (error #%d)',
-                    intl_get_error_message(),
-                    intl_get_error_code()
-                )
-            );
+            throw new \InvalidArgumentException(sprintf('Invalid message format. Reason: %s (error #%d)', intl_get_error_message(), intl_get_error_code()));
         }
 
         $message = $formatter->format($arguments);
 
         if ($formatter->getErrorCode() !== U_ZERO_ERROR) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    'Unable to format message. Reason: %s (error #%s)',
-                    $formatter->getErrorMessage(),
-                    $formatter->getErrorCode()
-                )
-            );
+            throw new \InvalidArgumentException(sprintf('Unable to format message. Reason: %s (error #%s)', $formatter->getErrorMessage(), $formatter->getErrorCode()));
         }
 
         return $message;
diff --git a/src/Symfony/Component/Translation/IdentityTranslator.php b/src/Symfony/Component/Translation/IdentityTranslator.php
@@ -39,6 +39,9 @@ public function __construct($formatter = null)
         }
 
         $this->formatter = $formatter ?: new DefaultMessageFormatter();
+        if (!$this->formatter instanceof MessageFormatterInterface) {
+            throw new \InvalidArgumentException(sprintf('The message formatter "%s" must implement MessageFormatterInterface.', get_class($this->formatter)));
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/Tests/Formatter/IntlMessageFormatterTest.php b/src/Symfony/Component/Translation/Tests/Formatter/IntlMessageFormatterTest.php
@@ -36,8 +36,8 @@ public function testFormat($expected, $message, $number, $arguments)
 
     public function testFormatWithNamedArguments()
     {
-        if (version_compare(PHP_VERSION, '5.5.0', '<') || version_compare(INTL_ICU_VERSION, '4.8', '<')) {
-            $this->markTestSkipped('Format with named arguments can only be run with ICU 4.8 or higher');
+        if (PHP_VERSION_ID < 50500 || version_compare(INTL_ICU_VERSION, '4.8', '<')) {
+            $this->markTestSkipped('Format with named arguments can only be run with ICU 4.8 or higher and PHP >= 5.5');
         }
 
         $chooseMessage = <<<_MSG_
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -93,7 +93,11 @@ public function __construct($locale, $formatter = null, $cacheDir = null, $debug
             @trigger_error('Passing a MessageSelector instance into the '.__METHOD__.' as a second argument is deprecated since version 2.8 and will be removed in 3.0. Inject a MessageFormatterInterface instance instead.', E_USER_DEPRECATED);
             $formatter = new DefaultMessageFormatter($formatter);
         }
+
         $this->formatter = $formatter ?: new DefaultMessageFormatter();
+        if (!$this->formatter instanceof MessageFormatterInterface) {
+            throw new \InvalidArgumentException(sprintf('The message formatter "%s" must implement MessageFormatterInterface.', get_class($this->formatter)));
+        }
 
         $this->cacheDir = $cacheDir;
         $this->debug = $debug;

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ public function __construct($formatter = null)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$this->formatter = $formatter ?: new DefaultMessageFormatter();`
	`42`	`+ if (!$this->formatter instanceof MessageFormatterInterface) {`
	`43`	`+ throw new \InvalidArgumentException(sprintf('The message formatter "%s" must implement MessageFormatterInterface.', get_class($this->formatter)));`
	`44`	`+ }`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public function testFormat($expected, $message, $number, $arguments)`
`36`	`36`
`37`	`37`	`public function testFormatWithNamedArguments()`
`38`	`38`	`{`
`39`		`- if (version_compare(PHP_VERSION, '5.5.0', '<') \|\| version_compare(INTL_ICU_VERSION, '4.8', '<')) {`
`40`		`- $this->markTestSkipped('Format with named arguments can only be run with ICU 4.8 or higher');`
	`39`	`+ if (PHP_VERSION_ID < 50500 \|\| version_compare(INTL_ICU_VERSION, '4.8', '<')) {`
	`40`	`+ $this->markTestSkipped('Format with named arguments can only be run with ICU 4.8 or higher and PHP >= 5.5');`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`$chooseMessage = <<<_MSG_`