fix: PHP 8.2 deprecation warning for mb_convert_encoding

inpsyde · Feb 27, 2024 · f842c30 · f842c30
1 parent 9af2c19
commit f842c30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/OutputFilter/AttributesOutputFilter.php b/src/OutputFilter/AttributesOutputFilter.php
@@ -45,7 +45,7 @@ public function __invoke(string $html, Asset $asset): string
         $doc = new \DOMDocument();
         libxml_use_internal_errors(true);
         @$doc->loadHTML(
-            mb_encode_numericentity($html, [0x80, 0xFFFF, 0, 0xFFFF], "UTF-8"),
+            mb_encode_numericentity($html, [0x80, 0x10FFFF, 0, ~0], "UTF-8"),
             LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD
         );
         libxml_clear_errors();
@@ -60,7 +60,7 @@ public function __invoke(string $html, Asset $asset): string
             $this->applyAttributes($script, $attributes);
         }
 
-        return $this->removeRootElement($doc->saveHTML());
+        return $this->removeRootElement(html_entity_decode($doc->saveHTML()));
     }
 
     /**

diff --git a/tests/phpunit/Unit/OutputFilter/AttributesOutputFilterTest.php b/tests/phpunit/Unit/OutputFilter/AttributesOutputFilterTest.php
@@ -218,5 +218,10 @@ public function provideRenderWithInlineScripts(): \Generator
             $multiLineJs,
             $multiLineJs,
         ];
+
+        yield 'before and after multibyte line' => [
+            '<script>(function(){ console.log("Lösungen ї 𠀋"); })();</script>',
+            '<script>(function(){ console.log("Lösungen ї 𠀋"); })();</script>',
+        ];
     }
 }