fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-30 08:39:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update composer dependencies

Browse source
This commit is contained in:
Kijin Sung 2017-06-29 23:39:23 +09:00
parent 49cc39e507
commit cbd324c35b
428 changed files with 17862 additions and 5885 deletions
Download patch file Download diff file Expand all files Collapse all files

25
vendor/rmccue/requests/library/Requests/Session.php vendored Executable file → Normal file
View file

@ -81,8 +81,9 @@ class Requests_Session {
* @return mixed|null Property value, null if none found
*/
public function __get($key) {
if (isset($this->options[$key]))
if (isset($this->options[$key])) {
return $this->options[$key];
}
return null;
}
@ -112,7 +113,9 @@ class Requests_Session {
* @param string $key Property key
*/
public function __unset($key) {
$this->options[$key] = null;
if (isset($this->options[$key])) {
unset($this->options[$key]);
}
}
/**#@+
@ -172,7 +175,7 @@ class Requests_Session {
* Note: Unlike {@see post} and {@see put}, `$headers` is required, as the
* specification recommends that should send an ETag
*
* @link http://tools.ietf.org/html/rfc5789
* @link https://tools.ietf.org/html/rfc5789
*/
public function patch($url, $headers, $data = array(), $options = array()) {
return $this->request($url, $headers, $data, Requests::PATCH, $options);
@ -191,7 +194,7 @@ class Requests_Session {
*
* @param string $url URL to request
* @param array $headers Extra headers to send with the request
* @param array $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
* @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
* @param string $type HTTP request type (use Requests constants)
* @param array $options Options for the request (see {@see Requests::request})
* @return Requests_Response
@ -236,9 +239,18 @@ class Requests_Session {
$request['url'] = Requests_IRI::absolutize($this->url, $request['url']);
$request['url'] = $request['url']->uri;
}
if (empty($request['headers'])) {
$request['headers'] = array();
}
$request['headers'] = array_merge($this->headers, $request['headers']);
if (is_array($request['data']) && is_array($this->data)) {
if (empty($request['data'])) {
if (is_array($this->data)) {
$request['data'] = $this->data;
}
}
elseif (is_array($request['data']) && is_array($this->data)) {
$request['data'] = array_merge($this->data, $request['data']);
}
@ -248,6 +260,7 @@ class Requests_Session {
// Disallow forcing the type, as that's a per request setting
unset($request['options']['type']);
}
return $request;
}
}
}