allow modification of query data

Author: filecage

src/Uri.php

@@ -133,6 +133,15 @@ function getQuery () : string {
             return (string) ($this->query ?? '');
         }
 
+        /**
+         * Allows accessing the query data as object
+         *
+         * @return Query
+         */
+        function getQueryData () : Query {
+            return $this->query ?? new Query();
+        }
+
         /**
          * @return string
          */
@@ -142,20 +151,16 @@ function getScheme () : string {
 
         /**
          * @throws InvalidArgumentException
-         * @param string $query
+         * @param string|Query $query
          * @return static
          */
         function withQuery ($query) : static {
-            if (!is_string($query)) {
+            if (!is_string($query) && !$query instanceof Query) {
                 throw new InvalidArgumentException("Invalid URI query type: expected `string` but got `" . gettype($query) . "` instead");
             }
 
             $instance = clone $this;
-            if ($query === '') {
-                unset($instance->query);
-            } else {
-                $instance->query = UriParser::parseQuery($query);
-            }
+            $instance->query = ($query === '') ? null : (($query instanceof Query) ? $query : UriParser::parseQuery($query));
 
             return $instance;
         }

tests/UriTest.php

@@ -89,6 +89,19 @@ function testExpectsQueryToBeReset () {
         $this->assertSame('http://www.example.com', (string) $uriWithoutQuery);
     }
 
+    function testExpectsQueryToBeSetFromQueryObject () {
+        $uri = new Uri('http://www.example.com?foo=bar&baz=boo');
+        $query = $uri->getQueryData();
+
+        $queryModified = $query->withParameterKeyAndValue('bar', 'boo');
+        $uriWithModifiedQuery = $uri->withQuery($queryModified);
+
+        $this->assertNotSame($uri->getQueryData(), $uriWithModifiedQuery->getQueryData());
+        $this->assertNotSame($uri, $uriWithModifiedQuery, 'Expected immutability to be kept');
+        $this->assertSame('foo=bar&baz=boo&bar=boo', $uriWithModifiedQuery->getQuery());
+        $this->assertSame('http://www.example.com?foo=bar&baz=boo&bar=boo', (string) $uriWithModifiedQuery);
+    }
+
     function testExpectsPortToBeReset () {
         $uri = new Uri('http://www.example.com:1234');
         $uriWithoutPort = $uri->withPort(null);