Merge pull request #2272 from seamuslee001/php81_locale

PowerKiKi · web-flow · commit 2ee6df65bc0f · 2022-09-16T00:16:31.000+02:00
PHP8.1 Fix issue with passing NULL value for locale into string function
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
@@ -232,7 +232,7 @@ private function validateLocale($locale)
             $locale = str_replace('_', '-', $locale);
         }
 
-        if (strlen($locale) === 2) {
+        if ($locale !== null && strlen($locale) === 2) {
             return strtolower($locale) . '-' . strtoupper($locale);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private function validateLocale($locale)`
`232`	`232`	`$locale = str_replace('_', '-', $locale);`
`233`	`233`	`}`
`234`	`234`
`235`		`- if (strlen($locale) === 2) {`
	`235`	`+ if ($locale !== null && strlen($locale) === 2) {`
`236`	`236`	`return strtolower($locale) . '-' . strtoupper($locale);`
`237`	`237`	`}`
`238`	`238`