Use userspace intl for coercion

lib/DOM/traits/EscapeString.php

@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace dW\HTML5;
 
+use MensBeam\Intl\Encoding\UTF8;
+
 trait EscapeString {
     protected function escapeString(string $string, bool $attribute = false): string {
         # Escaping a string (for the purposes of the algorithm above) consists of
@@ -29,13 +31,15 @@ trait EscapeString {
         // See https://www.w3.org/TR/REC-xml/#NT-NameStartChar
         preg_match_all('/[^\-\.0-9\x{B7}\x{300}-\x{36F}\x{203F}-\x{2040}A-Za-z_\x{C0}-\x{D6}\x{D8}-\x{F6}\x{F8}-\x{2FF}\x{370}-\x{37D}\x{37F}-\x{1FFF}\x{200C}-\x{200D}\x{2070}-\x{218F}\x{2C00}-\x{2FEF}\x{3001}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFFD}\x{10000}-\x{EFFFF}]/u', $name, $m);
         foreach (array_unique($m[0], \SORT_STRING) as $c) {
-            $esc = "U".str_pad(strtoupper(dechex(\IntlChar::ord($c))), 6, "0", \STR_PAD_LEFT);
+            $o = (new UTF8($c))->nextCode();
+            $esc = "U".str_pad(strtoupper(dechex($o)), 6, "0", \STR_PAD_LEFT);
             $name = str_replace($c, $esc, $name);
         }
         // Apply stricter rules to the first character
         if (preg_match('/^[^A-Za-z_\x{C0}-\x{D6}\x{D8}-\x{F6}\x{F8}-\x{2FF}\x{370}-\x{37D}\x{37F}-\x{1FFF}\x{200C}-\x{200D}\x{2070}-\x{218F}\x{2C00}-\x{2FEF}\x{3001}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFFD}\x{10000}-\x{EFFFF}]/u', $name, $m)) {
             $c = $m[0];
-            $esc = "U".str_pad(strtoupper(dechex(\IntlChar::ord($c))), 6, "0", \STR_PAD_LEFT);
+            $o = (new UTF8($c))->nextCode();
+            $esc = "U".str_pad(strtoupper(dechex($o)), 6, "0", \STR_PAD_LEFT);
             $name = $esc.substr($name, strlen($c));
         }
         return $name;
@@ -44,7 +48,7 @@ trait EscapeString {
     protected function uncoerceName(string $name): string {
         preg_match_all('/U[0-9A-F]{6}/', $name, $m);
         foreach (array_unique($m[0], \SORT_STRING) as $o) {
-            $c = \IntlChar::chr(hexdec(substr($o, 1)));
+            $c = UTF8::encode(hexdec(substr($o, 1)));
             $name = str_replace($o, $c, $name);
         }
         return $name;