Fixed deprecation warnings about passing null as parameter

symfony · May 16, 2021 · 424d29d · 424d29d
1 parent ff6e63c
commit 424d29d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Loader/XliffFileLoader.php b/Loader/XliffFileLoader.php
@@ -129,7 +129,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
     private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)
     {
         $xml = simplexml_import_dom($dom);
-        $encoding = strtoupper($dom->encoding);
+        $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;
 
         $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:2.0');
 

diff --git a/Translator.php b/Translator.php
@@ -507,7 +507,7 @@ protected function computeFallbackLocales($locale)
      */
     protected function assertValidLocale($locale)
     {
-        if (1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
+        if (null !== $locale && 1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
             throw new InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
         }
     }