mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 02:22:57 +01:00
Code Issues Releases Wiki Activity

Treat '+' as encoded space when parsing query string

Browse Source 
According to RFC1738 (implemented by urlencode) spaces are encoded as
plus symbols. However, RFC3986 (imeplemented by rawurlencode) states
that spaces should be encoded as '%20'.

When parsing a query string that was encoded with urlencode we should
treat plus symbols as spaces.

fixes #105
This commit is contained in:
Matt Button 2012-07-19 13:46:45 +01:00
parent 9f57a33055
commit aeeb31a4ed
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Guzzle/Http/QueryString.php
View File

@ -57,11 +57,18 @@ class QueryString extends Collection
}
foreach (explode('&', $query) as $kvp) {
$parts = explode('=', $kvp);
$key = rawurldecode($parts[0]);
$key = rawurldecode($parts[0]);
$value = '';
if (substr($key, -2) == '[]') {
$key = substr($key, 0, -2);
}
$q->add($key, isset($parts[1]) ? rawurldecode($parts[1]) : '');
if (isset($parts[1])) {
$value = rawurldecode(str_replace('+', '%20', $parts[1]));
}
$q->add($key, $value);
}
}

9
tests/Guzzle/Tests/Http/QueryStringTest.php
View File

@ -246,4 +246,13 @@ class QueryStringTest extends \Guzzle\Tests\GuzzleTestCase
$query = QueryString::fromString('?foo=baz&bar=boo');
$this->assertEquals('?foo=baz&bar=boo', (string) $query);
}
/**
* @covers Guzzle\Http\QueryString::fromString
*/
public function testConvertsPlusSymbolsToSpaces()
{
$query = QueryString::fromString('var=foo+bar');
$this->assertEquals('foo bar', $query->get('var'));
}
}