Add test for useRawQueryString constructor parameter

Author: paulbalandan

system/HTTP/URI.php

@@ -245,7 +245,13 @@ public static function removeDotSegments(string $path): string
      */
     public function __construct(?string $uri = null, bool $useRawQueryString = false)
     {
-        $this->useRawQueryString($useRawQueryString)->setUri($uri);
+        $this->useRawQueryString($useRawQueryString);
+
+        if ($uri === null) {
+            return;
+        }
+
+        $this->setUri($uri);
     }
 
     /**
@@ -285,12 +291,8 @@ public function useRawQueryString(bool $raw = true)
      *
      * @throws HTTPException
      */
-    private function setUri(?string $uri = null): self
+    private function setUri(string $uri): self
     {
-        if ($uri === null) {
-            return $this;
-        }
-
         $parts = parse_url($uri);
 
         if (is_array($parts)) {

tests/system/HTTP/URITest.php

@@ -477,16 +477,24 @@ public function testSetQuerySetsValue(): void
         $this->assertSame($expected, (string) $uri);
     }
 
-    public function testSetQuerySetsValueWithUseRawQueryString(): void
+    public function testUseRawQueryStringAtConstructor(): void
+    {
+        $url = 'http://example.com/path?key=value&second.key=value.2';
+        $uri = new URI($url, true);
+
+        $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
+        $this->assertSame($url, (string) $uri);
+    }
+
+    public function testUseRawQueryStringAtSetter(): void
     {
         $url = 'http://example.com/path';
         $uri = new URI($url);
 
         $uri->useRawQueryString()->setQuery('?key=value&second.key=value.2');
 
         $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
-        $expected = 'http://example.com/path?key=value&second.key=value.2';
-        $this->assertSame($expected, (string) $uri);
+        $this->assertSame('http://example.com/path?key=value&second.key=value.2', (string) $uri);
     }
 
     public function testSetQueryArraySetsValue(): void