minor #41562 [Translation] Don't pass null to strtoupper() (derrabus)

nicolas-grekas · nicolas-grekas · commit b87de425c062 · 2021-06-06T11:29:15.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Translation] Don't pass null to strtoupper() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Part of #41552 | License | MIT | Doc PR | N/A This error popped up on 5.3, but not on 4.4. That's why I missed it when fixing the other occurrence with #41240. Commits ------- 3c8cf9a [Translation] Don't pass null to strtoupper()
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -76,7 +76,7 @@ private function extract($resource, MessageCatalogue $catalogue, string $domain)
     private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)
     {
         $xml = simplexml_import_dom($dom);
-        $encoding = strtoupper($dom->encoding);
+        $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;
 
         $namespace = 'urn:oasis:names:tc:xliff:document:1.2';
         $xml->registerXPathNamespace('xliff', $namespace);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private function extract($resource, MessageCatalogue $catalogue, string $domain)`
`76`	`76`	`private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)`
`77`	`77`	`{`
`78`	`78`	`$xml = simplexml_import_dom($dom);`
`79`		`- $encoding = strtoupper($dom->encoding);`
	`79`	`+ $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;`
`80`	`80`
`81`	`81`	`$namespace = 'urn:oasis:names:tc:xliff:document:1.2';`
`82`	`82`	`$xml->registerXPathNamespace('xliff', $namespace);`