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

Merge pull request #381 from guzzle/querystring-guess-aggregator

Browse Source 
Guessing when to use DefaultAggregator vs PhpAggregator when parsing que...
This commit is contained in:
Michael Dowling 2013-07-13 22:32:36 -07:00
commit 2c4ece62e1
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
namespace Guzzle\Http;
use Guzzle\Common\Collection;
use Guzzle\Http\QueryAggregator\DuplicateAggregator;
use Guzzle\Http\QueryAggregator\QueryAggregatorInterface;
use Guzzle\Http\QueryAggregator\PhpAggregator;
@ -33,7 +34,7 @@ class QueryString extends Collection
protected $aggregator;
/** @var array Cached PHP aggregator */
protected static $defaultAggregator = null;
private static $defaultAggregator = null;
/**
* Parse a query string into a QueryString object
@ -45,31 +46,39 @@ class QueryString extends Collection
public static function fromString($query)
{
$q = new static();
if ($query === '') {
return $q;
}
if ($query || $query === '0') {
if ($query[0] == '?') {
$query = substr($query, 1);
$foundDuplicates = $foundPhpStyle = false;
foreach (explode('&', $query) as $kvp) {
$parts = explode('=', $kvp, 2);
$key = rawurldecode($parts[0]);
if ($paramIsPhpStyleArray = substr($key, -2) == '[]') {
$foundPhpStyle = true;
$key = substr($key, 0, -2);
}
foreach (explode('&', $query) as $kvp) {
$parts = explode('=', $kvp, 2);
$key = rawurldecode($parts[0]);
if ($paramIsPhpStyleArray = substr($key, -2) == '[]') {
$key = substr($key, 0, -2);
}
if (isset($parts[1])) {
$value = rawurldecode(str_replace('+', '%20', $parts[1]));
if ($paramIsPhpStyleArray && !$q->hasKey($key)) {
$value = array($value);
}
if (isset($parts[1])) {
$value = rawurldecode(str_replace('+', '%20', $parts[1]));
if (isset($q[$key])) {
$q->add($key, $value);
$foundDuplicates = true;
} elseif ($paramIsPhpStyleArray) {
$q[$key] = array($value);
} else {
$q->add($key, null);
$q[$key] = $value;
}
} else {
$q->add($key, null);
}
}
// Use the duplicate aggregator if duplicates were found and not using PHP style arrays
if ($foundDuplicates && !$foundPhpStyle) {
$q->setAggregator(new DuplicateAggregator());
}
return $q;
}

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

@ -217,4 +217,16 @@ class QueryStringTest extends \Guzzle\Tests\GuzzleTestCase
$query = QueryString::fromString('data=mF0b3IiLCJUZWFtIERldiJdfX0=');
$this->assertEquals('mF0b3IiLCJUZWFtIERldiJdfX0=', $query->get('data'));
}
public function testGuessesIfDuplicateAggregatorShouldBeUsed()
{
$query = QueryString::fromString('test=a&test=b');
$this->assertEquals('test=a&test=b', (string) $query);
}
public function testGuessesIfDuplicateAggregatorShouldBeUsedAndChecksForPhpStyle()
{
$query = QueryString::fromString('test[]=a&test[]=b');
$this->assertEquals('test%5B0%5D=a&test%5B1%5D=b', (string) $query);
}
}