Normalize host to lowercase

Author: nyamsprod

interfaces/Encoder.php

@@ -296,15 +296,16 @@ public static function normalizeHost(Stringable|string|null $host): ?string
             $host = (string) $host;
         }
 
-        if (null === $host || '' === $host) {
-            return $host;
-        }
-
-        if (false !== filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) || IPv6Converter::isIpv6($host)) {
+        if (null === $host || '' === $host || false !== filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
             return $host;
         }
 
         $host = strtolower($host);
+        if (IPv6Converter::isIpv6($host)) {
+            [$ipAddress, $zoneIdentifier] = explode('%', $host) + [1 => null];
+
+            return IPv6Converter::build(['ipAddress' => strtolower((string) $ipAddress), 'zoneIdentifier' =>  $zoneIdentifier]);
+        }
 
         return (!str_contains($host, '%')) ? $host : preg_replace_callback(
             '/%[a-fA-F0-9]{2}/',

interfaces/IPv6/Converter.php

@@ -84,7 +84,7 @@ public static function expand(Stringable|string|null $host): ?string
         return self::build($components);
     }
 
-    private static function build(array $components): string
+    public static function build(array $components): string
     {
         $components['ipAddress'] ??= null;
         $components['zoneIdentifier'] ??= null;

interfaces/UriString.php

@@ -296,20 +296,22 @@ public static function parseNormalized(Stringable|string $uri): array
         static $isSupported = null;
         $isSupported ??= (function_exists('\idn_to_ascii') && defined('\INTL_IDNA_VARIANT_UTS46'));
 
-        if (null !== $components['host'] &&
-            false === filter_var($components['host'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) &&
-            !IPv6Converter::isIpv6($components['host'])
-        ) {
-            $decodedHost = rawurldecode($components['host']);
-            $components['host'] = (string) preg_replace_callback(
-                '/%[0-9A-F]{2}/i',
-                fn (array $matches): string => strtoupper($matches[0]),
-                strtolower($components['host'])
-            );
-            if ($isSupported) {
-                $host = IdnaConverter::toAscii($decodedHost);
-                if (!$host->hasErrors()) {
-                    $components['host'] = $host->domain();
+        if (null !== $components['host'] && false === filter_var($components['host'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            // if host is IPv6 it should be lowercased according to
+            // https://www.rfc-editor.org/rfc/rfc5952#section-4.3
+            $components['host'] = strtolower($components['host']);
+            if (!IPv6Converter::isIpv6($components['host'])) {
+                $decodedHost = rawurldecode($components['host']);
+                $components['host'] = (string) preg_replace_callback(
+                    '/%[0-9A-F]{2}/i',
+                    fn (array $matches): string => strtoupper($matches[0]),
+                    $components['host']
+                );
+                if ($isSupported) {
+                    $host = IdnaConverter::toAscii($decodedHost);
+                    if (!$host->hasErrors()) {
+                        $components['host'] = $host->domain();
+                    }
                 }
             }
         }