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

Merge remote-tracking branch 'schmittjoh/urlRegression' into fixurlRegression

Browse Source
This commit is contained in:
Michael Dowling 2013-11-21 12:45:14 -08:00
commit b98389ea31
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Guzzle/Http/Url.php
View File

@ -518,7 +518,7 @@ class Url
if (!$path) {
if (count($query)) {
$this->query = $query;
$this->addQuery($query, $strictRfc386);
}
} else {
if ($path[0] == '/') {
@ -529,11 +529,24 @@ class Url
$this->path .= '/' . $path;
}
$this->normalizePath();
$this->query = $query;
$this->addQuery($query, $strictRfc386);
}
$this->fragment = $url->getFragment();
return $this;
}
private function addQuery(QueryString $new, $strictRfc386)
{
if ($strictRfc386) {
$this->query = $new;
return;
}
foreach ($new as $k => $v) {
$this->query->add($k, $v);
}
}
}

6
tests/Guzzle/Tests/Http/ClientTest.php
View File

@ -244,9 +244,9 @@ class ClientTest extends \Guzzle\Tests\GuzzleTestCase
array($u, 'relative/path/to/resource?a=b&c=d', $u . 'relative/path/to/resource?a=b&c=d'),
array($u, '/absolute/path/to/resource', $this->getServer()->getUrl() . 'absolute/path/to/resource'),
array($u, '/absolute/path/to/resource?a=b&c=d', $this->getServer()->getUrl() . 'absolute/path/to/resource?a=b&c=d'),
array($u2, '/absolute/path/to/resource?a=b&c=d', $this->getServer()->getUrl() . 'absolute/path/to/resource?a=b&c=d'),
array($u2, 'relative/path/to/resource', $this->getServer()->getUrl() . 'base/relative/path/to/resource'),
array($u2, 'relative/path/to/resource?another=query', $this->getServer()->getUrl() . 'base/relative/path/to/resource?another=query')
array($u2, '/absolute/path/to/resource?a=b&c=d', $this->getServer()->getUrl() . 'absolute/path/to/resource?z=1&a=b&c=d'),
array($u2, 'relative/path/to/resource', $this->getServer()->getUrl() . 'base/relative/path/to/resource?z=1'),
array($u2, 'relative/path/to/resource?another=query', $this->getServer()->getUrl() . 'base/relative/path/to/resource?z=1&another=query')
);
}

4
tests/Guzzle/Tests/Http/UrlTest.php
View File

@ -154,7 +154,9 @@ class UrlTest extends \Guzzle\Tests\GuzzleTestCase
array('http://u:a@www.example.com/path', 'test', 'http://u:a@www.example.com/path/test'),
array('http://www.example.com/path', 'http://u:a@www.example.com/', 'http://u:a@www.example.com/'),
array('/path?q=2', 'http://www.test.com/', 'http://www.test.com/path?q=2'),
array('http://api.flickr.com/services/', 'http://www.flickr.com/services/oauth/access_token', 'http://www.flickr.com/services/oauth/access_token')
array('http://api.flickr.com/services/', 'http://www.flickr.com/services/oauth/access_token', 'http://www.flickr.com/services/oauth/access_token'),
array('http://www.example.com/?foo=bar', 'some/path', 'http://www.example.com/some/path?foo=bar'),
array('http://www.example.com/?foo=bar', 'some/path?boo=moo', 'http://www.example.com/some/path?foo=bar&boo=moo'),
);
}