Merge pull request #235 from ajgarlag/master

Prefix authority with double slash if present.
zendframework · Apr 6, 2017 · 1ebb557 · 1ebb557
2 parents 8a71cfc + 95e0522
commit 1ebb557
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Uri.php b/src/Uri.php
@@ -470,11 +470,11 @@ private static function createUriString($scheme, $authority, $path, $query, $fra
         $uri = '';
 
         if (! empty($scheme)) {
-            $uri .= sprintf('%s://', $scheme);
+            $uri .= sprintf('%s:', $scheme);
         }
 
         if (! empty($authority)) {
-            $uri .= $authority;
+            $uri .= '//' . $authority;
         }
 
         if ($path) {

diff --git a/test/UriTest.php b/test/UriTest.php
@@ -609,6 +609,12 @@ public function utf8QueryStringsDataProvider()
     public function testUriDoesNotAppendColonToHostIfPortIsEmpty()
     {
         $uri = (new Uri())->withHost('google.com');
-        $this->assertEquals('google.com', (string) $uri);
+        $this->assertEquals('//google.com', (string) $uri);
+    }
+
+    public function testAuthorityIsPrefixedByDoubleSlashIfPresent()
+    {
+        $uri = (new Uri())->withHost('example.com');
+        $this->assertEquals('//example.com', (string) $uri);
     }
 }