Fixed some issue

Nyholm · Nyholm · commit e89ef2fdea90 · 2018-06-08T22:25:03.000+02:00
diff --git a/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php b/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
@@ -22,7 +22,11 @@ class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFo
      */
     public function format($message, $locale, array $parameters = array())
     {
-        $formatter = new \MessageFormatter($locale, $message);
+        try {
+            $formatter = new \MessageFormatter($locale, $message);
+        } catch (\Throwable $e) {
+            throw new \InvalidArgumentException('Invalid message format.', $e);
+        }
         if (null === $formatter) {
             throw new \InvalidArgumentException(sprintf('Invalid message format. Reason: %s (error #%d)', intl_get_error_message(), intl_get_error_code()));
         }
diff --git a/src/Symfony/Component/Translation/Tests/Formatter/IntlMessageFormatterTest.php b/src/Symfony/Component/Translation/Tests/Formatter/IntlMessageFormatterTest.php
@@ -34,7 +34,7 @@ public function testFormat($expected, $message, $arguments)
 
     public function testFormatWithNamedArguments()
     {
-        if (PHP_VERSION_ID < 50500 || version_compare(INTL_ICU_VERSION, '4.8', '<')) {
+        if (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');
         }
 
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -451,10 +451,6 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface
      */
     private function getFormatter(string $domain)
     {
-        if (isset($this->formatters[$domain])) {
-            return $this->formatters[$domain];
-        }
-
-        return $this->formatters['_default'];
+        return $this->formatters[$domain] ?? $this->formatters['_default'];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,11 @@ class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFo`
`22`	`22`	`*/`
`23`	`23`	`public function format($message, $locale, array $parameters = array())`
`24`	`24`	`{`
`25`		`- $formatter = new \MessageFormatter($locale, $message);`
	`25`	`+ try {`
	`26`	`+ $formatter = new \MessageFormatter($locale, $message);`
	`27`	`+ } catch (\Throwable $e) {`
	`28`	`+ throw new \InvalidArgumentException('Invalid message format.', $e);`
	`29`	`+ }`
`26`	`30`	`if (null === $formatter) {`
`27`	`31`	`throw new \InvalidArgumentException(sprintf('Invalid message format. Reason: %s (error #%d)', intl_get_error_message(), intl_get_error_code()));`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testFormat($expected, $message, $arguments)`
`34`	`34`
`35`	`35`	`public function testFormatWithNamedArguments()`
`36`	`36`	`{`
`37`		`- if (PHP_VERSION_ID < 50500 \|\| version_compare(INTL_ICU_VERSION, '4.8', '<')) {`
	`37`	`+ if (version_compare(INTL_ICU_VERSION, '4.8', '<')) {`
`38`	`38`	`$this->markTestSkipped('Format with named arguments can only be run with ICU 4.8 or higher and PHP >= 5.5');`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -451,10 +451,6 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface`
`451`	`451`	`*/`
`452`	`452`	`private function getFormatter(string $domain)`
`453`	`453`	`{`
`454`		`- if (isset($this->formatters[$domain])) {`
`455`		`- return $this->formatters[$domain];`
`456`		`- }`
`457`		`-`
`458`		`- return $this->formatters['_default'];`
	`454`	`+ return $this->formatters[$domain] ?? $this->formatters['_default'];`
`459`	`455`	`}`
`460`	`456`	`}`