Merge branch '4.4' into 5.0

* 4.4: Tweak the code to avoid fabbot false positives
symfony · Apr 12, 2020 · 73df1f6 · 73df1f6
2 parents 99b8317 + 9d5ca86
commit 73df1f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Loader/JsonFileLoader.php b/Loader/JsonFileLoader.php
@@ -30,7 +30,7 @@ protected function loadResource($resource)
             $messages = json_decode($data, true);
 
             if (0 < $errorCode = json_last_error()) {
-                throw new InvalidResourceException(sprintf('Error parsing JSON - %s.', $this->getJSONErrorMessage($errorCode)));
+                throw new InvalidResourceException('Error parsing JSON: '.$this->getJSONErrorMessage($errorCode));
             }
         }
 

diff --git a/Loader/XliffFileLoader.php b/Loader/XliffFileLoader.php
@@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, string $domain)
         try {
             $dom = XmlUtils::loadFile($resource);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s": %s.', $resource, $e->getMessage()), $e->getCode(), $e);
+            throw new InvalidResourceException(sprintf('Unable to load "%s": '.$e->getMessage(), $resource), $e->getCode(), $e);
         }
 
         $xliffVersion = XliffUtils::getVersionNumber($dom);