bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes from scrutinizer-ci

Browse Source
This commit is contained in:
Ahmad Nassri
2014-12-18 00:05:49 -05:00
parent ed76b17884
commit 97f51e1269
3 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Unirest/Request.php
View File

@@ -241,7 +241,7 @@ class Request
private static function getArrayFromQuerystring($query) private static function getArrayFromQuerystring($query)
{ {
$query = preg_replace_callback('/(?:^|(?<=&))[^=[]+/', function($match) { $query = preg_replace_callback('/(?:^|(?<=&))[^=[]+/', function ($match) {
return bin2hex(urldecode($match[0])); return bin2hex(urldecode($match[0]));
}, $query); }, $query);

63
src/Unirest/Response.php
View File

@@ -18,7 +18,7 @@ class Response
public function __construct($code, $raw_body, $headers) public function __construct($code, $raw_body, $headers)
{ {
$this->code = $code; $this->code = $code;
$this->headers = http_parse_headers($headers); $this->headers = $this->parseHeaders($headers);
$this->raw_body = $raw_body; $this->raw_body = $raw_body;
$this->body = $raw_body; $this->body = $raw_body;
$json = json_decode($raw_body); $json = json_decode($raw_body);
@@ -27,41 +27,44 @@ class Response
$this->body = $json; $this->body = $json;
} }
} }
}
/** /**
* if PECL_HTTP is not available use a fall back function * if PECL_HTTP is not available use a fall back function
* *
* thanks to ricardovermeltfoort@gmail.com * thanks to ricardovermeltfoort@gmail.com
* http://php.net/manual/en/function.http-parse-headers.php#112986 * http://php.net/manual/en/function.http-parse-headers.php#112986
*/ */
if (!function_exists('http_parse_headers')) { private function parseHeaders($raw_headers) {
function http_parse_headers($raw_headers) { if (function_exists('http_parse_headers')) {
$headers = array(); return http_parse_headers($raw_headers);
$key = ''; } else {
foreach(explode("\n", $raw_headers) as $i => $h) { $headers = array();
$h = explode(':', $h, 2); $key = '';
if (isset($h[1])) { foreach (explode("\n", $raw_headers) as $i => $h) {
if (!isset($headers[$h[0]])) { $h = explode(':', $h, 2);
$headers[$h[0]] = trim($h[1]);
} elseif (is_array($headers[$h[0]])) { if (isset($h[1])) {
$headers[$h[0]] = array_merge($headers[$h[0]], array(trim($h[1]))); if (!isset($headers[$h[0]])) {
$headers[$h[0]] = trim($h[1]);
} elseif (is_array($headers[$h[0]])) {
$headers[$h[0]] = array_merge($headers[$h[0]], array(trim($h[1])));
} else {
$headers[$h[0]] = array_merge(array($headers[$h[0]]), array(trim($h[1])));
}
$key = $h[0];
} else { } else {
$headers[$h[0]] = array_merge(array($headers[$h[0]]), array(trim($h[1]))); if (substr($h[0], 0, 1) == "\t") {
} $headers[$key] .= "\r\n\t".trim($h[0]);
} elseif (!$key) {
$key = $h[0]; $headers[0] = trim($h[0]);
} else { }
if (substr($h[0], 0, 1) == "\t") {
$headers[$key] .= "\r\n\t".trim($h[0]);
} elseif (!$key){
$headers[0] = trim($h[0]);
} }
} }
}
return $headers; return $headers;
}
} }
} }

4
tests/Unirest/RequestTest.php
View File

@@ -303,7 +303,7 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
{ {
Request::timeout(1); Request::timeout(1);
$response = Request::get('http://httpbin.org/delay/3'); Request::get('http://httpbin.org/delay/3');
Request::timeout(null); // Cleaning timeout for the other tests Request::timeout(null); // Cleaning timeout for the other tests
} }
@@ -353,7 +353,7 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
public function testBasicAuthentication() public function testBasicAuthentication()
{ {
$response = Request::get('http://httpbin.org/get', null, null, 'user', 'password'); $response = Request::get('http://httpbin.org/get', null, array(), 'user', 'password');
$headers = $response->body->headers; $headers = $response->body->headers;
$this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $headers->Authorization); $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $headers->Authorization);
} }