Imrpove Host normalization

Author: nyamsprod

interfaces/UriString.php

@@ -782,10 +782,6 @@ public static function isHost(Stringable|string|null $host): bool
      */
     private static function filterRegisteredName(string $host): void
     {
-        if ($host !== Encoder::decodeUnreservedCharacters($host)) {
-            throw new SyntaxError('Host `'.$host.'` is invalid: only UTF-8 characters sequence can be percent encoded in host.');
-        }
-
         $formattedHost = rawurldecode($host);
         if ($formattedHost !== $host) {
             if (IdnaConverter::toAscii($formattedHost)->hasErrors()) {

interfaces/UriStringTest.php

@@ -745,7 +745,6 @@ public static function invalidUriProvider(): array
             'invalid port (1)' => ['//host:port/path?query#fragment'],
             'invalid port (2)' => ['//host:-892358/path?query#fragment'],
             'invalid host' => ['http://exam ple.com'],
-            'invalid host with invalid encoded characters' => ['http://ex%61mple.com'],
             'invalid ipv6 host (1)' => ['scheme://[127.0.0.1]/path?query#fragment'],
             'invalid ipv6 host (2)' => ['scheme://]::1[/path?query#fragment'],
             'invalid ipv6 host (3)' => ['scheme://[::1|/path?query#fragment'],

uri/Uri.php

@@ -382,24 +382,23 @@ private function formatHost(?string $host): ?string
     private function formatRegisteredName(string $host): string
     {
         $formattedHost = rawurldecode($host);
-        if ($formattedHost !== $host) {
-
-            if (IdnaConverter::toAscii($formattedHost)->hasErrors()) {
-                throw new SyntaxError('The host `'.$host.'` is invalid : the registered name contains invalid characters.');
-            }
+        if ($formattedHost === $host) {
+            return match (1) {
+                preg_match(self::REGEXP_HOST_REGNAME, $formattedHost) => $formattedHost,
+                preg_match(self::REGEXP_HOST_GEN_DELIMS, $formattedHost) => throw new SyntaxError('The host `'.$host.'` is invalid : a registered name cannot contain URI delimiters or spaces.'),
+                default => IdnaConverter::toAsciiOrFail($host),
+            };
+        }
 
-            return (string) preg_replace_callback(
-                '/%[0-9A-F]{2}/i',
-                fn (array $matches) => strtoupper($matches[0]),
-                strtolower($host)
-            );
+        if (IdnaConverter::toAscii($formattedHost)->hasErrors()) {
+            throw new SyntaxError('The host `'.$host.'` is invalid : the registered name contains invalid characters.');
         }
 
-        return match (1) {
-            preg_match(self::REGEXP_HOST_REGNAME, $formattedHost) => $formattedHost,
-            preg_match(self::REGEXP_HOST_GEN_DELIMS, $formattedHost) => throw new SyntaxError('The host `'.$host.'` is invalid : a registered name cannot contain URI delimiters or spaces.'),
-            default => IdnaConverter::toAsciiOrFail($host),
-        };
+        return (string) preg_replace_callback(
+            '/%[0-9A-F]{2}/i',
+            fn (array $matches) => 1 === preg_match('/%([0-7][0-9a-f])/', $matches[0]) ? rawurldecode($matches[0]) : strtoupper($matches[0]),
+            strtolower($host)
+        );
     }
 
     /**
@@ -1185,7 +1184,6 @@ public function toDisplayString(): string
     {
         $components = $this->toComponents();
 
-
         unset($components['port']);
         if (null !== $components['host']) {
             $components['host'] = IdnaConverter::toUnicode($components['host'])->domain();