Merge pull request #553 from marcwieland95/fix-mb_encoding_aliases

oscarotero · web-flow · commit 56efec666844 · 2024-12-12T10:56:59.000+01:00
fix: make sure to pass the correct argument to mb_encoding_aliases()
diff --git a/src/Document.php b/src/Document.php
@@ -32,7 +32,7 @@ public function __construct(Extractor $extractor)
         if (!empty($match[1])) {
             $encoding = trim($match[1], ',');
             try {
-                $ret = mb_encoding_aliases($encoding);
+                $ret = mb_encoding_aliases($encoding ?? '');
                 if ($ret === false) {
                     $encoding = null;
                 }
@@ -46,7 +46,7 @@ public function __construct(Extractor $extractor)
                 $encoding = trim($match[1], ',');
             }
             try {
-                $ret = mb_encoding_aliases($encoding);
+                $ret = mb_encoding_aliases($encoding ?? '');
                 if ($ret === false) {
                     $encoding = null;
                 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(Extractor $extractor)`
`32`	`32`	`if (!empty($match[1])) {`
`33`	`33`	`$encoding = trim($match[1], ',');`
`34`	`34`	`try {`
`35`		`- $ret = mb_encoding_aliases($encoding);`
	`35`	`+ $ret = mb_encoding_aliases($encoding ?? '');`
`36`	`36`	`if ($ret === false) {`
`37`	`37`	`$encoding = null;`
`38`	`38`	`}`
`@@ -46,7 +46,7 @@ public function __construct(Extractor $extractor)`
`46`	`46`	`$encoding = trim($match[1], ',');`
`47`	`47`	`}`
`48`	`48`	`try {`
`49`		`- $ret = mb_encoding_aliases($encoding);`
	`49`	`+ $ret = mb_encoding_aliases($encoding ?? '');`
`50`	`50`	`if ($ret === false) {`
`51`	`51`	`$encoding = null;`
`52`	`52`	`}`