Urn and Uri normalization and comparison

Author: nyamsprod

Encoder.php

@@ -92,7 +92,20 @@ public static function encodeUser(Stringable|string|null $component): ?string
      */
     public static function normalizeUser(Stringable|string|null $user): ?string
     {
-        return self::encodeUser(self::decodeUnreservedCharacters($user));
+        return self::normalize(self::encodeUser(self::decodeUnreservedCharacters($user)));
+    }
+
+    private static function normalize(?string $component): ?string
+    {
+        if (null === $component) {
+            return null;
+        }
+
+        return (string) preg_replace_callback(
+            '/%[0-9a-f]{2}/i',
+            static fn (array $found) => strtoupper($found[0]),
+            $component
+        );
     }
 
     /**
@@ -126,7 +139,7 @@ public static function encodePassword(#[SensitiveParameter] Stringable|string|nu
      */
     public static function normalizePassword(#[SensitiveParameter] Stringable|string|null $password): ?string
     {
-        return self::encodePassword(self::decodeUnreservedCharacters($password));
+        return self::normalize(self::encodePassword(self::decodeUnreservedCharacters($password)));
     }
 
     /**
@@ -259,7 +272,7 @@ public static function decodePath(Stringable|string|null $path): ?string
      */
     public static function normalizePath(Stringable|string|null $component): ?string
     {
-        return self::encodePath(self::decodePath($component));
+        return self::normalize(self::encodePath(self::decodePath($component)));
     }
 
     /**
@@ -295,7 +308,7 @@ public static function decodeQuery(Stringable|string|null $path): ?string
      */
     public static function normalizeQuery(Stringable|string|null $query): ?string
     {
-        return self::encodeQueryOrFragment(self::decodeQuery($query));
+        return self::normalize(self::encodeQueryOrFragment(self::decodeQuery($query)));
     }
 
     /**
@@ -325,7 +338,7 @@ public static function decodeFragment(Stringable|string|null $path): ?string
      */
     public static function normalizeFragment(Stringable|string|null $fragment): ?string
     {
-        return self::encodeQueryOrFragment(self::decodeFragment($fragment));
+        return self::normalize(self::encodeQueryOrFragment(self::decodeFragment($fragment)));
     }
 
     /**