Fix bug where scheme was being URL encoded

Author: jeremykendall

src/Pdp/Uri/Url.php

@@ -121,7 +121,7 @@ public function __toString()
         $url = null;
 
         if ($this->scheme) {
-            $url .= urlencode($this->scheme) . '://';
+            $url .= $this->scheme . '://';
         }
 
         if ($this->user) {

tests/src/Pdp/Uri/UrlTest.php

@@ -149,4 +149,19 @@ public function testIdnToAscii()
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Scheme should not be URL encoded
+     *
+     * @group issue46
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.1
+     */
+    public function testToStringDoesNotUrlEncodeScheme()
+    {
+        // The '+' should not be URL encoded when output to string
+        $spec = 'fake-scheme+RFC-3986.compliant://www.graphstory.com';
+        $url = $this->parser->parseUrl($spec);
+        $this->assertEquals($spec, $url->__toString());
+    }
 }