enhance URI class

Author: hafezdivandari

composer.json

@@ -36,7 +36,7 @@
         "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.25.1",
         "league/flysystem-local": "^3.25.1",
-        "league/uri": "^7.4",
+        "league/uri": "^7.5.1",
         "monolog/monolog": "^3.0",
         "nesbot/carbon": "^2.72.2|^3.4",
         "nunomaduro/termwind": "^2.0",

src/Illuminate/Support/Uri.php

@@ -23,6 +23,11 @@ class Uri implements Htmlable, Responsable
      */
     protected static ?Closure $urlGeneratorResolver = null;
 
+    /**
+     * The URI instance.
+     */
+    protected UriInterface $uri;
+
     /**
      * Create a new parsed URI instance.
      */
@@ -75,29 +80,17 @@ public function scheme(): ?string
      */
     public function user(bool $withPassword = false): ?string
     {
-        if ($withPassword) {
-            return $this->uri->getUserInfo();
-        }
-
-        $userInfo = $this->uri->getUserInfo();
-
-        if (is_null($userInfo)) {
-            return null;
-        }
-
-        return str_contains($userInfo, ':')
-            ? Str::before($userInfo, ':')
-            : $userInfo;
+        return $withPassword
+            ? $this->uri->getUserInfo()
+            : $this->uri->getUsername();
     }
 
     /**
      * Get the password from the URI.
      */
     public function password(): ?string
     {
-        $userInfo = $this->uri->getUserInfo();
-
-        return ! is_null($userInfo) ? Str::after($userInfo, ':') : null;
+        return $this->uri->getPassword();
     }
 
     /**
@@ -272,7 +265,7 @@ public function withFragment(string $fragment): static
      */
     public function redirect(int $status = 302, array $headers = []): RedirectResponse
     {
-        return new RedirectResponse((string) $this, $status, $headers);
+        return new RedirectResponse($this->value(), $status, $headers);
     }
 
     /**
@@ -283,7 +276,7 @@ public function redirect(int $status = 302, array $headers = []): RedirectRespon
      */
     public function toResponse($request)
     {
-        return new RedirectResponse((string) $this);
+        return new RedirectResponse($this->value());
     }
 
     /**
@@ -293,7 +286,7 @@ public function toResponse($request)
      */
     public function toHtml()
     {
-        return (string) $this;
+        return $this->value();
     }
 
     /**
@@ -309,7 +302,7 @@ public function value(): string
      */
     public function isEmpty(): bool
     {
-        return trim((string) $this) === '';
+        return trim($this->value()) === '';
     }
 
     /**

src/Illuminate/Support/UriQueryString.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\InteractsWithData;
+use League\Uri\QueryString;
 
 class UriQueryString implements Arrayable
 {
@@ -81,13 +82,7 @@ public function value(): string
      */
     public function toArray()
     {
-        if (is_null($query = $this->uri->getUri()->getQuery())) {
-            return [];
-        }
-
-        parse_str($query, $currentQuery);
-
-        return $currentQuery;
+        return QueryString::extract($this->value());
     }
 
     /**

src/Illuminate/Support/composer.json

@@ -50,7 +50,7 @@
         "illuminate/filesystem": "Required to use the Composer class (^11.0).",
         "laravel/serializable-closure": "Required to use the once function (^1.3).",
         "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).",
-        "league/uri": "Required to use the Uri class (^7.4).",
+        "league/uri": "Required to use the Uri class (^7.5.1).",
         "ramsey/uuid": "Required to use Str::uuid() (^4.7).",
         "symfony/process": "Required to use the Composer class (^7.0).",
         "symfony/uid": "Required to use Str::ulid() (^7.0).",

tests/Support/SupportUriTest.php

@@ -34,7 +34,7 @@ public function test_basic_uri_interactions()
 
     public function test_complicated_query_string_parsing()
     {
-        $uri = Uri::of('https://example.com/users?key_1=value&key_2[sub_field]=value&key_3[]=value&key_4[9]=value&key_5[][][foo][9]=bar&flag_value');
+        $uri = Uri::of('https://example.com/users?key_1=value&key_2[sub_field]=value&key_3[]=value&key_4[9]=value&key_5[][][foo][9]=bar&key.6=value&flag_value');
 
         $this->assertEquals([
             'key_1' => 'value',
@@ -56,10 +56,11 @@ public function test_complicated_query_string_parsing()
                     ],
                 ],
             ],
+            'key.6' => 'value',
             'flag_value' => '',
         ], $uri->query()->all());
 
-        $this->assertEquals('key_1=value&key_2[sub_field]=value&key_3[]=value&key_4[9]=value&key_5[][][foo][9]=bar&flag_value', $uri->query()->decode());
+        $this->assertEquals('key_1=value&key_2[sub_field]=value&key_3[]=value&key_4[9]=value&key_5[][][foo][9]=bar&key.6=value&flag_value', $uri->query()->decode());
     }
 
     public function test_uri_building()