allows modifying Query

Author: filecage

src/Components/Query.php

@@ -13,7 +13,7 @@
     final class Query {
 
         /**
-         * @var QueryParameter[]
+         * @var array<string, QueryParameter>
          */
         private array $queryParameters;
 
@@ -30,15 +30,17 @@ static function createFromString (string $query) : Query {
          * @param QueryParameter ...$queryParameters
          */
         function __construct (QueryParameter ...$queryParameters) {
-            $this->queryParameters = $queryParameters;
+            foreach ($queryParameters as $queryParameter) {
+                $this->queryParameters[$queryParameter->getKey()] = $queryParameter;
+            }
         }
 
         /**
          * @param string $key
          * @return bool
          */
         function hasParameter (string $key) : bool {
-            return $this->getParameter($key) !== null; // todo: we could build an index and read from that instead
+            return isset($this->queryParameters[$key]);
         }
 
         /**
@@ -47,13 +49,32 @@ function hasParameter (string $key) : bool {
          * @return QueryParameter|null
          */
         function getParameter (string $key) : ?QueryParameter {
-            foreach ($this->queryParameters as $parameter) {
-                if ($parameter->getKey() === $key) {
-                    return $parameter;
-                }
-            }
+            return $this->queryParameters[$key] ?? null;
+        }
+
+        function withParameter (QueryParameter $queryParameter) : self {
+            $instance = clone $this;
+            $instance->queryParameters[$queryParameter->getKey()] = $queryParameter;
+
+            return $instance;
+        }
+
+        function withParameterKeyRemoved (string $queryParameterKey) : self {
+            $instance = clone $this;
+            unset($instance->queryParameters[$queryParameterKey]);
 
-            return null;
+            return $instance;
+        }
+
+        /**
+         * @throws InvalidArgumentException
+         * @param string $key
+         * @param mixed $value
+         *
+         * @return self
+         */
+        function withParameterKeyAndValue (string $key, mixed $value) : self {
+            return $this->withParameter(QueryParameter::create($key, $value));
         }
 
         /**

tests/QueryComponentTest.php

@@ -5,6 +5,7 @@
     use PHPUnit\Framework\TestCase;
     use UriManage\Components\Query;
     use UriManage\Components\QueryParameters\QueryParameter;
+    use UriManage\Components\QueryParameters\StringQueryParameter;
 
     class QueryComponentTest extends TestCase {
 
@@ -69,4 +70,28 @@ function provideParseableQueryStrings () : \Generator {
             ];
         }
 
+        function testExpectsQueryParameterToBeAdded () {
+            $query = new Query(new StringQueryParameter('baz', 'boo'));
+            $query = $query->withParameter(new StringQueryParameter('foo', 'bar'));
+
+            $this->assertTrue($query->hasParameter('foo'));
+            $this->assertSame('baz=boo&foo=bar', (string) $query);
+        }
+
+        function testExpectsQueryParameterKeyAndvalueToBeAdded () {
+            $query = new Query(new StringQueryParameter('baz', 'boo'));
+            $query = $query->withParameterKeyAndValue('foo', 'bar');
+
+            $this->assertTrue($query->hasParameter('foo'));
+            $this->assertSame('baz=boo&foo=bar', (string) $query);
+        }
+
+        function testExpectsQueryParameterToBeRemoved () {
+            $query = new Query(new StringQueryParameter('foo', 'bar'), new StringQueryParameter('baz', 'boo'));
+            $query = $query->withParameterKeyRemoved('foo');
+
+            $this->assertFalse($query->hasParameter('foo'));
+            $this->assertSame('baz=boo', (string) $query);
+        }
+
     }