Merge pull request #17 from samsonasik/fix-13

Fixes #13 : reserved characters in path should be unencoded
zendframework · Apr 10, 2018 · fa7f669 · fa7f669
2 parents 43a82de + c6fe65b
commit fa7f669
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Uri.php b/src/Uri.php
@@ -1007,7 +1007,7 @@ public static function encodePath($path)
             ));
         }
 
-        $regex   = '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
+        $regex   = '/(?:[^' . self::CHAR_UNRESERVED . ')(:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
         $escaper = static::getEscaper();
         $replace = function ($match) use ($escaper) {
             return $escaper->escapeUrl($match[0]);

diff --git a/test/UriTest.php b/test/UriTest.php
@@ -1360,4 +1360,14 @@ public function testParseTwice()
         $this->assertNull($uri->getQuery());
         $this->assertNull($uri->getFragment());
     }
+
+    public function testReservedCharsInPathUnencoded()
+    {
+        $uri = new Uri();
+        $uri->setScheme('https');
+        $uri->setHost('api.linkedin.com');
+        $uri->setPath('/v1/people/~:(first-name,last-name,email-address,picture-url)');
+
+        $this->assertSame('https://api.linkedin.com/v1/people/~:(first-name,last-name,email-address,picture-url)', $uri->toString());
+    }
 }