Added some more tests.

Author: Martin Brecht-Precht

Diff for: src/Url.php

@@ -359,6 +359,7 @@ public function removeQueryParameter(QueryParameterInterface $queryParameter)
 		for ($i = 0; $i < count($this->queryParameters); $i++) {
 			if ($this->queryParameters[$i]->getKey() === $queryParameter->getKey()) {
 				unset($this->queryParameters[$i]);
+				$this->queryParameters = array_values($this->queryParameters);
 				return $this;
 			}
 		}
@@ -378,6 +379,7 @@ public function removeQueryParameterByKey($key)
 		for ($i = 0; $i < count($this->queryParameters); $i++) {
 			if ($this->queryParameters[$i]->getKey() === $key) {
 				unset($this->queryParameters[$i]);
+				$this->queryParameters = array_values($this->queryParameters);
 				return $this;
 			}
 		}

Diff for: test/UrlTest.php

@@ -14,6 +14,12 @@ public function testParser()
 	{
 		$url = new Url('https://john:[email protected]:8443/path/to/resource?arg1=123&arg2=test#fragment');
 
+		$this->assertTrue($url->hasScheme());
+		$this->assertTrue($url->hasHostname());
+		$this->assertTrue($url->hasPath());
+
+		$this->assertEquals(2, $url->countQueryParameters());
+
 		$scheme = $url->getScheme();
 		fwrite(STDOUT, 'Scheme "' . $scheme . '"' . PHP_EOL);
 
@@ -37,9 +43,24 @@ public function testParser()
 			fwrite(STDOUT, 'Query parameter "' . $queryParameter->getKey() . '" is "' . $queryParameter->getValue() . '"' . PHP_EOL);
 		}
 
+		$url->setQueryParameters($queryParameters);
+
+		$queryParameter = new QueryParameter('arrrrrg1', '789');
+		$queryParameter
+			->setKey('arg1')
+			->setValue('456');
+		$url
+			->addQueryParameter($queryParameter)
+			->removeQueryParameter($queryParameter);
+
 		$fragment = $url->getFragment();
 		fwrite(STDOUT, 'Fragment "' . $fragment . '"' . PHP_EOL);
 
+		$queryParameter = new QueryParameter('arrrrrg1', '789');
+		$queryParameter
+			->setKey('arg1')
+			->setValue('456');
+
 		$url
 			->setScheme('http')
 			->setHostname('yourdomain.com')
@@ -48,7 +69,7 @@ public function testParser()
 			->setPassword('supersecret')
 			->setPath('path/to/another/resource')
 			->removeQueryParameterByKey('arg2')
-			->addQueryParameter(new QueryParameter('arg1', '456'))
+			->addQueryParameter($queryParameter)
 			->addQueryParameter(new QueryParameter('arg3', 'test'))
 			->setFragment('target');