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

some smaller refactoring

Browse Source
This commit is contained in:
Tobias Schultze 2016-05-22 14:28:35 +02:00
parent acd0bcded6
commit 812d9fd2c8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Client.php
View File

@ -142,7 +142,7 @@ class Client implements ClientInterface
return $uri instanceof UriInterface ? $uri : new Psr7\Uri($uri);
}
return Psr7\Uri::resolve(Psr7\uri_for($config['base_uri']), $uri);
return Psr7\Uri::resolve($config['base_uri'], $uri);
}
/**
@ -255,7 +255,7 @@ class Client implements ClientInterface
unset($options['save_to']);
}
// exceptions -> http_error
// exceptions -> http_errors
if (isset($options['exceptions'])) {
$options['http_errors'] = $options['exceptions'];
unset($options['exceptions']);
@ -297,9 +297,14 @@ class Client implements ClientInterface
}
if (isset($options['multipart'])) {
$elements = $options['multipart'];
$options['body'] = new Psr7\MultipartStream($options['multipart']);
unset($options['multipart']);
$options['body'] = new Psr7\MultipartStream($elements);
}
if (isset($options['json'])) {
$options['body'] = \GuzzleHttp\json_encode($options['json']);
unset($options['json']);
$options['_conditional']['Content-Type'] = 'application/json';
}
if (!empty($options['decode_content'])
@ -353,13 +358,6 @@ class Client implements ClientInterface
unset($options['query']);
}
if (isset($options['json'])) {
$jsonStr = \GuzzleHttp\json_encode($options['json']);
$modify['body'] = Psr7\stream_for($jsonStr);
$options['_conditional']['Content-Type'] = 'application/json';
unset($options['json']);
}
// Ensure that sink is not an invalid value.
if (isset($options['sink'])) {
// TODO: Add more sink validation?