Merge branch '3.4' into 4.4

* 3.4: Various cleanups
symfony · May 30, 2020 · 79d3ef9 · 79d3ef9
2 parents a538e0a + b0cd62e
commit 79d3ef9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Formatter/IntlFormatter.php b/Formatter/IntlFormatter.php
@@ -40,7 +40,7 @@ public function formatIntl(string $message, string $locale, array $parameters =
             try {
                 $this->cache[$locale][$message] = $formatter = new \MessageFormatter($locale, $message);
             } catch (\IntlException $e) {
-                throw new InvalidArgumentException(sprintf('Invalid message format (error #%d): '.intl_get_error_message(), intl_get_error_code()), 0, $e);
+                throw new InvalidArgumentException(sprintf('Invalid message format (error #%d): ', intl_get_error_code()).intl_get_error_message(), 0, $e);
             }
         }
 
@@ -52,7 +52,7 @@ public function formatIntl(string $message, string $locale, array $parameters =
         }
 
         if (false === $message = $formatter->format($parameters)) {
-            throw new InvalidArgumentException(sprintf('Unable to format message (error #%s): '.$formatter->getErrorMessage(), $formatter->getErrorCode()));
+            throw new InvalidArgumentException(sprintf('Unable to format message (error #%s): ', $formatter->getErrorCode()).$formatter->getErrorMessage());
         }
 
         return $message;

diff --git a/Loader/XliffFileLoader.php b/Loader/XliffFileLoader.php
@@ -58,7 +58,7 @@ private function extract($resource, MessageCatalogue $catalogue, string $domain)
 
         $xliffVersion = XliffUtils::getVersionNumber($dom);
         if ($errors = XliffUtils::validateSchema($dom)) {
-            throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: '.XliffUtils::getErrorsAsString($errors), $resource));
+            throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: ', $resource).XliffUtils::getErrorsAsString($errors));
         }
 
         if ('1.2' === $xliffVersion) {