fix bug: transposing a parsed uri forgets any parameters changed in q…

…uery string

CHANGELOG.md

@@ -1,3 +1,9 @@
+5.1.1 (2014-10-03)
+------------------
+
+  * fixed bug: transposing a parsed uri forgot any parameters changed in query string
+
+
 5.1.0 (2014-09-29)
 ------------------
 

src/main/php/peer/ParsedUri.php

@@ -32,10 +32,13 @@ class ParsedUri
     /**
      * constructor
      *
-     * @param   string  $uri
+     * Passing a query string will omit any query string already present in $uri.
+     *
+     * @param   string                      $uri          uri to parse
+     * @param   \stubbles\peer\QueryString  $queryString  optional  parameters when not in uri
      * @throws  \stubbles\peer\MalformedUriException
      */
-    public function __construct($uri)
+    public function __construct($uri, QueryString $queryString = null)
     {
         $this->uri = ((!is_array($uri)) ? (parse_url($uri)): ($uri));
         if (!is_array($this->uri)) {
@@ -46,10 +49,14 @@ public function __construct($uri)
             $this->uri['host'] = strtolower($this->uri['host']);
         }
 
-        try {
-            $this->queryString = new QueryString((isset($this->uri['query'])) ? ($this->uri['query']) : (null));
-        } catch (\InvalidArgumentException $iae) {
-            throw new MalformedUriException($iae->getMessage(), $iae);
+        if (null !== $queryString) {
+            $this->queryString = $queryString;
+        } else {
+            try {
+                $this->queryString = new QueryString((isset($this->uri['query'])) ? ($this->uri['query']) : (null));
+            } catch (\InvalidArgumentException $iae) {
+                throw new MalformedUriException($iae->getMessage(), $iae);
+            }
         }
 
         // bugfix for a PHP issue: ftp://user:@auxiliary.kl-s.com/
@@ -75,7 +82,7 @@ public function __construct($uri)
      */
     public function transpose(array $changedUri)
     {
-        return new self(array_merge($this->uri, $changedUri));
+        return new self(array_merge($this->uri, $changedUri), $this->queryString);
     }
 
     /**

src/test/php/peer/ParsedUriTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * This file is part of stubbles.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package  stubbles
+ */
+namespace stubbles\peer;
+/**
+ * Test for stubbles\peer\ParsedUri.
+ *
+ * @group  peer
+ * @since  5.1.1
+ */
+class ParsedUriTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function transposeKeepsChangedParameters()
+    {
+        $parsedUri = new ParsedUri('http://example.com/?foo=bar&baz=303');
+        $parsedUri->queryString()->addParam('baz', '313');
+        $parsedUri->queryString()->addParam('dummy', 'example');
+        $this->assertEquals(
+                'https://example.com/?foo=bar&baz=313&dummy=example',
+                $parsedUri->transpose(['scheme' => 'https'])->asStringWithoutPort()
+        );
+    }
+}