Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Fixes #13 : reserved characters in path should be unencoded #17

Merged
merged 2 commits into from
Apr 10, 2018
Merged

Fixes #13 : reserved characters in path should be unencoded #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb5e12
Fixes #13 : reserved characters in path should be unencoded
samsonasik Jul 14, 2017
c6fe65b
using )( same as suggested at https://github.com/zendframework/zend-d…
samsonasik Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
10 changes: 10 additions & 0 deletions test/UriTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,4 +1346,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());
}
}