Merge branch 'hotfix/258'

Close #258

Author: weierophinney

CHANGELOG.md

@@ -33,6 +33,11 @@ All notable changes to this project will be documented in this file, in reverse
   fix for the `PhpInputStream::read()` method to ensure string content that
   evaluates as empty (including `0`) is still cached.
 
+- [#258](https://github.com/zendframework/zend-diactoros/pull/258) updates the
+  `Uri::filterPath()` method to allow parens within a URI path, per [RFC 3986
+  section 3.3](https://tools.ietf.org/html/rfc3986#section-3.3) (parens are
+  within the character set "sub-delims").
+
 ## 1.4.0 - 2017-04-06
 
 ### Added

src/Uri.php

@@ -556,7 +556,7 @@ private function filterScheme($scheme)
     private function filterPath($path)
     {
         $path = preg_replace_callback(
-            '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/u',
+            '/(?:[^' . self::CHAR_UNRESERVED . ')(:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/u',
             [$this, 'urlEncodeChar'],
             $path
         );

test/UriTest.php

@@ -617,4 +617,14 @@ public function testAuthorityIsPrefixedByDoubleSlashIfPresent()
         $uri = (new Uri())->withHost('example.com');
         $this->assertEquals('//example.com', (string) $uri);
     }
+
+    public function testReservedCharsInPathUnencoded()
+    {
+        $uri = (new Uri())
+            ->withScheme('https')
+            ->withHost('api.linkedin.com')
+            ->withPath('/v1/people/~:(first-name,last-name,email-address,picture-url)');
+
+        $this->assertContains('/v1/people/~:(first-name,last-name,email-address,picture-url)', (string) $uri);
+    }
 }