Simplify URI codebase

thephpleague · Dec 27, 2024 · cb21a4b · cb21a4b
1 parent 2b0e109
commit cb21a4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/interfaces/UriString.php b/interfaces/UriString.php
@@ -278,7 +278,7 @@ public static function buildAuthority(array $components): ?string
      *
      * @return ComponentMap
      */
-    public static function normalize(Stringable|string $uri): array
+    public static function parseAndNormalize(Stringable|string $uri): array
     {
         $components = UriString::parse($uri);
         if (null !== $components['scheme']) {

diff --git a/uri/Uri.php b/uri/Uri.php
@@ -1670,7 +1670,7 @@ public function equals(UriInterface|Stringable|string $uri, bool $excludeFragmen
      */
     public function normalize(): UriInterface
     {
-        return self::fromComponents(UriString::normalize($this->toString()));
+        return self::fromComponents(UriString::parseAndNormalize($this->toString()));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function normalize(): UriInterface
         {
-            return self::fromComponents(UriString::normalize($this->toString()));
+            return self::fromComponents(UriString::parseAndNormalize($this->toString()));
         }
         /**
@@ Expand Down @@