refactor: polish URI query helper types

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

system/HTTP/URI.php

@@ -876,15 +876,11 @@ public function addQuery(string $key, $value = null)
     }
 
     /**
-     * Return an instance with one query var added or replaced.
+     * Returns an instance with one query var added or replaced.
      *
      * Note: Method not in PSR-7
-     *
-     * @param int|string|null $value
-     *
-     * @return static
      */
-    public function withQueryVar(string $key, $value)
+    public function withQueryVar(string $key, int|string|null $value): static
     {
         $uri = clone $this;
 
@@ -894,15 +890,13 @@ public function withQueryVar(string $key, $value)
     }
 
     /**
-     * Return an instance with multiple query vars added or replaced.
+     * Returns an instance with multiple query vars added or replaced.
      *
      * Note: Method not in PSR-7
      *
      * @param array<string, int|string|null> $params
-     *
-     * @return static
      */
-    public function withQueryVars(array $params)
+    public function withQueryVars(array $params): static
     {
         $uri = clone $this;
 

tests/system/HTTP/URITest.php

@@ -842,6 +842,7 @@ public function testWithQueryVarAddsQueryVarWithoutMutatingOriginal(): void
 
         $new = $uri->withQueryVar('bar', 'baz');
 
+        $this->assertNotSame($uri, $new);
         $this->assertSame('http://example.com/foo?bar=baz', (string) $new);
         $this->assertSame('http://example.com/foo', (string) $uri);
     }
@@ -853,6 +854,7 @@ public function testWithQueryVarReplacesQueryVarAndPreservesFragment(): void
 
         $new = $uri->withQueryVar('bar', 'foz');
 
+        $this->assertNotSame($uri, $new);
         $this->assertSame('http://example.com/foo?bar=foz#section', (string) $new);
         $this->assertSame('http://example.com/foo?bar=baz#section', (string) $uri);
     }
@@ -864,6 +866,7 @@ public function testWithQueryVarKeepsEmptyStringQueryVar(): void
 
         $new = $uri->withQueryVar('bar', '');
 
+        $this->assertNotSame($uri, $new);
         $this->assertSame('http://example.com/foo?bar=', (string) $new);
         $this->assertSame('http://example.com/foo?bar=baz', (string) $uri);
     }
@@ -878,6 +881,7 @@ public function testWithQueryVarsAddsAndReplacesWithoutMutatingOriginal(): void
             'new' => 'value',
         ]);
 
+        $this->assertNotSame($uri, $new);
         $this->assertSame('http://example.com/foo?foo=bar&bar=baz&baz=updated&new=value#section', (string) $new);
         $this->assertSame('http://example.com/foo?foo=bar&bar=baz&baz=foz#section', (string) $uri);
     }