Improve code indenting & others
This commit is contained in:
Andrey Knupp Vital
@@ -1,77 +1,77 @@
|
|||||||
<?php namespace Unirest;
|
<?php
|
||||||
class HttpResponse
|
|
||||||
{
|
|
||||||
private $code;
|
|
||||||
private $raw_body;
|
|
||||||
private $body;
|
|
||||||
private $headers;
|
|
||||||
|
|
||||||
/**
|
namespace Unirest;
|
||||||
* HttpResponse constructor
|
|
||||||
* @param int $code Response code of the cURL request
|
|
||||||
* @param string $raw_body The raw body of the cURL response
|
|
||||||
* @param string $headers Raw header string from cURL response
|
|
||||||
*/
|
|
||||||
function __construct($code, $raw_body, $headers)
|
|
||||||
{
|
|
||||||
$this->code = $code;
|
|
||||||
$this->headers = $this->get_headers_from_curl_response($headers);
|
|
||||||
$this->raw_body = $raw_body;
|
|
||||||
$this->body = $raw_body;
|
|
||||||
$json = json_decode($raw_body);
|
|
||||||
if (json_last_error() == JSON_ERROR_NONE) {
|
|
||||||
$this->body = $json;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
class HttpResponse
|
||||||
* Return a property of the response if it exists
|
{
|
||||||
* Possibilities include:
|
|
||||||
* - code
|
|
||||||
* - raw_body
|
|
||||||
* - body (if the response is json-decodable)
|
|
||||||
* - headers
|
|
||||||
* @param [type] $property [description]
|
|
||||||
* @return [type] [description]
|
|
||||||
*/
|
|
||||||
public function __get($property)
|
|
||||||
{
|
|
||||||
if (property_exists($this, $property)) {
|
|
||||||
return $this->$property;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
private $code;
|
||||||
* Set the properties of this object
|
private $raw_body;
|
||||||
* @param string $property The property name
|
private $body;
|
||||||
* @param mixed $value The property value
|
private $headers;
|
||||||
*/
|
|
||||||
public function __set($property, $value)
|
|
||||||
{
|
|
||||||
if (property_exists($this, $property)) {
|
|
||||||
$this->$property = $value;
|
|
||||||
}
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve the cURL response headers from the
|
|
||||||
* header string and convert it into an array
|
|
||||||
* @param string $headers header string from cURL response
|
|
||||||
* @return array headers in array form
|
|
||||||
*/
|
|
||||||
private function get_headers_from_curl_response($headers)
|
|
||||||
{
|
|
||||||
$headers = explode("\r\n", $headers);
|
|
||||||
array_shift($headers);
|
|
||||||
|
|
||||||
foreach ($headers as $line) {
|
/**
|
||||||
if (strstr($line, ': ')) {
|
* @param int $code response code of the cURL request
|
||||||
list ($key, $value) = explode(': ', $line);
|
* @param string $raw_body the raw body of the cURL response
|
||||||
$result[$key] = $value;
|
* @param string $headers raw header string from cURL response
|
||||||
}
|
*/
|
||||||
}
|
public function __construct($code, $raw_body, $headers)
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
$this->headers = $this->get_headers_from_curl_response($headers);
|
||||||
|
$this->raw_body = $raw_body;
|
||||||
|
$this->body = $raw_body;
|
||||||
|
$json = json_decode($raw_body);
|
||||||
|
|
||||||
|
if (json_last_error() == JSON_ERROR_NONE) {
|
||||||
|
$this->body = $json;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $result;
|
/**
|
||||||
}
|
* Return a property of the response if it exists.
|
||||||
}
|
* Possibilities include: code, raw_body, headers, body (if the response is json-decodable)
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function __get($property)
|
||||||
|
{
|
||||||
|
if (property_exists($this, $property)) {
|
||||||
|
return $this->$property;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the properties of this object
|
||||||
|
* @param string $property the property name
|
||||||
|
* @param mixed $value the property value
|
||||||
|
*/
|
||||||
|
public function __set($property, $value)
|
||||||
|
{
|
||||||
|
if (property_exists($this, $property)) {
|
||||||
|
$this->$property = $value;
|
||||||
|
}
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the cURL response headers from the
|
||||||
|
* header string and convert it into an array
|
||||||
|
* @param string $headers header string from cURL response
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function get_headers_from_curl_response($headers)
|
||||||
|
{
|
||||||
|
$headers = explode("\r\n", $headers);
|
||||||
|
array_shift($headers);
|
||||||
|
|
||||||
|
foreach ($headers as $line) {
|
||||||
|
if (strstr($line, ': ')) {
|
||||||
|
list ($key, $value) = explode(': ', $line);
|
||||||
|
$result[$key] = $value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,189 +1,186 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Unirest\HttpMethod;
|
use Unirest\HttpMethod;
|
||||||
use Unirest\HttpResponse;
|
use Unirest\HttpResponse;
|
||||||
|
|
||||||
class Unirest
|
class Unirest
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* Send a GET request to a URL
|
|
||||||
* @param string $url URL to send the GET request to
|
|
||||||
* @param array $headers Additional headers to send
|
|
||||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
|
||||||
*/
|
|
||||||
public static function get($url, $headers = array())
|
|
||||||
{
|
|
||||||
return Unirest::request(HttpMethod::GET, $url, NULL, $headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send POST request to a URL
|
|
||||||
* @param string $url URL to send the POST request to
|
|
||||||
* @param array $headers Additional headers to send
|
|
||||||
* @param mixed $body POST body data
|
|
||||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
|
||||||
*/
|
|
||||||
public static function post($url, $headers = array(), $body = NULL)
|
|
||||||
{
|
|
||||||
return Unirest::request(HttpMethod::POST, $url, $body, $headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send DELETE request to a URL
|
|
||||||
* @param string $url URL to send the DELETE request to
|
|
||||||
* @param array $headers Additional headers to send
|
|
||||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
|
||||||
*/
|
|
||||||
public static function delete($url, $headers = array())
|
|
||||||
{
|
|
||||||
return Unirest::request(HttpMethod::DELETE, $url, NULL, $headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send PUT request to a URL
|
* Send a GET request to a URL
|
||||||
* @param string $url URL to send the PUT request to
|
* @param string $url URL to send the GET request to
|
||||||
* @param array $headers Additional headers to send
|
* @param array $headers additional headers to send
|
||||||
* @param mixed $body PUT body data
|
* @return string|stdObj response string or stdObj if response is json-decodable
|
||||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
*/
|
||||||
*/
|
public static function get($url, $headers = array())
|
||||||
public static function put($url, $headers = array(), $body = NULL)
|
{
|
||||||
{
|
return Unirest::request(HttpMethod::GET, $url, NULL, $headers);
|
||||||
return Unirest::request(HttpMethod::PUT, $url, $body, $headers);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send PATCH request to a URL
|
|
||||||
* @param string $url URL to send the PATCH request to
|
|
||||||
* @param array $headers Additional headers to send
|
|
||||||
* @param mixed $body PATCH body data
|
|
||||||
* @return string|stdObj Response string or stdObj if response is json-decodable
|
|
||||||
*/
|
|
||||||
public static function patch($url, $headers = array(), $body = NULL)
|
|
||||||
{
|
|
||||||
return Unirest::request(HttpMethod::PATCH, $url, $body, $headers);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a cURL request
|
* Send POST request to a URL
|
||||||
* @param string $httpMethod HTTP Method to use (based off \Unirest\HttpMethod constants)
|
* @param string $url URL to send the POST request to
|
||||||
* @param string $url URL to send the request to
|
* @param array $headers additional headers to send
|
||||||
* @param mixed $body Request body
|
* @param mixed $body POST body data
|
||||||
* @param array $headers Additional headers to send
|
* @return string|stdObj response string or stdObj if response is json-decodable
|
||||||
* @throws Exception If a cURL error occurs
|
*/
|
||||||
* @return \Unireset\HttpResponse \Unirest\HttpResponse object
|
public static function post($url, $headers = array(), $body = NULL)
|
||||||
*/
|
{
|
||||||
private static function request($httpMethod, $url, $body = NULL, $headers = array())
|
return Unirest::request(HttpMethod::POST, $url, $body, $headers);
|
||||||
{
|
}
|
||||||
$lowercaseHeaders = array();
|
|
||||||
foreach ($headers as $key => $val) {
|
|
||||||
$key = trim(strtolower($key));
|
|
||||||
if ($key == "user-agent" || $key == "expect") continue;
|
|
||||||
$lowercaseHeaders[] = $key . ": " . $val;
|
|
||||||
}
|
|
||||||
$lowercaseHeaders[] = "user-agent: unirest-php/1.0";
|
|
||||||
$lowercaseHeaders[] = "expect:";
|
|
||||||
|
|
||||||
$ch = curl_init();
|
|
||||||
if ($httpMethod != HttpMethod::GET) {
|
|
||||||
curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
|
|
||||||
curl_setopt ($ch, CURLOPT_POSTFIELDS, $body);
|
|
||||||
}
|
|
||||||
|
|
||||||
curl_setopt ($ch, CURLOPT_URL , Unirest::encodeUrl($url));
|
|
||||||
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
|
|
||||||
curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, true);
|
|
||||||
curl_setopt ($ch, CURLOPT_MAXREDIRS, 10);
|
|
||||||
curl_setopt ($ch, CURLOPT_HTTPHEADER, $lowercaseHeaders);
|
|
||||||
curl_setopt ($ch, CURLOPT_HEADER, true);
|
|
||||||
curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false);
|
|
||||||
|
|
||||||
$response = curl_exec($ch);
|
|
||||||
$error = curl_error($ch);
|
|
||||||
if ($error) {
|
|
||||||
throw new \Exception($error);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Split the full response in its headers and body
|
|
||||||
$curl_info = curl_getinfo($ch);
|
|
||||||
$header_size = $curl_info["header_size"];
|
|
||||||
$header = substr($response, 0, $header_size);
|
|
||||||
$body = substr($response, $header_size);
|
|
||||||
$httpCode = $curl_info["http_code"];
|
|
||||||
|
|
||||||
return new HttpResponse($httpCode, $body, $header);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure that a URL is encoded and safe to use with cURL
|
|
||||||
* @param string $url URL to encode
|
|
||||||
* @return string Encoded URL
|
|
||||||
*/
|
|
||||||
private static function encodeUrl($url)
|
|
||||||
{
|
|
||||||
// Parse URL into pieces
|
|
||||||
$url_parsed = parse_url($url);
|
|
||||||
|
|
||||||
// Build the basics bypassing notices
|
/**
|
||||||
$scheme = $url_parsed['scheme'] . '://';
|
* Send DELETE request to a URL
|
||||||
$host = $url_parsed['host'];
|
* @param string $url URL to send the DELETE request to
|
||||||
$port = (isset($url_parsed['port']) ? $url_parsed['port'] : null );
|
* @param array $headers additional headers to send
|
||||||
$path = (isset($url_parsed['path']) ? $url_parsed['path'] : null );
|
* @return string|stdObj response string or stdObj if response is json-decodable
|
||||||
$query = (isset($url_parsed['query']) ? $url_parsed['query'] : null );
|
*/
|
||||||
|
public static function delete($url, $headers = array())
|
||||||
|
{
|
||||||
|
return Unirest::request(HttpMethod::DELETE, $url, NULL, $headers);
|
||||||
|
}
|
||||||
|
|
||||||
// Do we need to encode anything?
|
/**
|
||||||
if ($query != null) {
|
* Send PUT request to a URL
|
||||||
// Break up the query into an array
|
* @param string $url URL to send the PUT request to
|
||||||
parse_str($url_parsed['query'], $query_parsed);
|
* @param array $headers additional headers to send
|
||||||
// Encode and build query based on RFC 1738
|
* @param mixed $body PUT body data
|
||||||
$query = '?'.http_build_query($query_parsed);
|
* @return string|stdObj response string or stdObj if response is json-decodable
|
||||||
}
|
*/
|
||||||
|
public static function put($url, $headers = array(), $body = NULL)
|
||||||
// Handle port seperator
|
{
|
||||||
if ($port && $port[0] != ":")
|
return Unirest::request(HttpMethod::PUT, $url, $body, $headers);
|
||||||
$port = ":" . $port;
|
}
|
||||||
|
|
||||||
// Return the completed URL
|
/**
|
||||||
$result = $scheme . $host . $port . $path . $query;
|
* Send PATCH request to a URL
|
||||||
return $result;
|
* @param string $url URL to send the PATCH request to
|
||||||
}
|
* @param array $headers additional headers to send
|
||||||
|
* @param mixed $body PATCH body data
|
||||||
}
|
* @return string|stdObj response string or stdObj if response is json-decodable
|
||||||
|
*/
|
||||||
|
public static function patch($url, $headers = array(), $body = NULL)
|
||||||
|
{
|
||||||
|
return Unirest::request(HttpMethod::PATCH, $url, $body, $headers);
|
||||||
|
}
|
||||||
|
|
||||||
if (!function_exists('http_chunked_decode')) {
|
/**
|
||||||
/**
|
* Send a cURL request
|
||||||
* dechunk an http 'transfer-encoding: chunked' message
|
* @param string $httpMethod HTTP method to use (based off \Unirest\HttpMethod constants)
|
||||||
*
|
* @param string $url URL to send the request to
|
||||||
* @param string $chunk the encoded message
|
* @param mixed $body request body
|
||||||
* @return string the decoded message. If $chunk wasn't encoded properly it will be returned unmodified.
|
* @param array $headers additional headers to send
|
||||||
*/
|
* @throws Exception if a cURL error occurs
|
||||||
function http_chunked_decode($chunk) {
|
* @return HttpResponse
|
||||||
$pos = 0;
|
*/
|
||||||
$len = strlen($chunk);
|
private static function request($httpMethod, $url, $body = NULL, $headers = array())
|
||||||
$dechunk = null;
|
{
|
||||||
|
$lowercaseHeaders = array();
|
||||||
|
foreach ($headers as $key => $val) {
|
||||||
|
$key = trim(strtolower($key));
|
||||||
|
if ($key == "user-agent" || $key == "expect")
|
||||||
|
continue;
|
||||||
|
$lowercaseHeaders[] = $key . ": " . $val;
|
||||||
|
}
|
||||||
|
$lowercaseHeaders[] = "user-agent: unirest-php/1.0";
|
||||||
|
$lowercaseHeaders[] = "expect:";
|
||||||
|
|
||||||
while(($pos < $len)
|
$ch = curl_init();
|
||||||
&& ($chunkLenHex = substr($chunk,$pos, ($newlineAt = strpos($chunk,"\n",$pos+1))-$pos))
|
if ($httpMethod != HttpMethod::GET) {
|
||||||
) {
|
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
|
||||||
if (!is_hex($chunkLenHex)) {
|
curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
|
||||||
trigger_error('Value is not properly chunk encoded', E_USER_WARNING);
|
}
|
||||||
return $chunk;
|
|
||||||
}
|
curl_setopt($ch, CURLOPT_URL, Unirest::encodeUrl($url));
|
||||||
|
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||||
|
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
|
||||||
|
curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
|
||||||
|
curl_setopt($ch, CURLOPT_HTTPHEADER, $lowercaseHeaders);
|
||||||
|
curl_setopt($ch, CURLOPT_HEADER, true);
|
||||||
|
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
||||||
|
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$error = curl_error($ch);
|
||||||
|
if ($error) {
|
||||||
|
throw new \Exception($error);
|
||||||
|
}
|
||||||
|
|
||||||
|
$curl_info = curl_getinfo($ch);
|
||||||
|
$header_size = $curl_info["header_size"];
|
||||||
|
$header = substr($response, 0, $header_size);
|
||||||
|
$body = substr($response, $header_size);
|
||||||
|
$httpCode = $curl_info["http_code"];
|
||||||
|
|
||||||
|
return new HttpResponse($httpCode, $body, $header);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure that a URL is encoded and safe to use with cURL
|
||||||
|
* @param string $url URL to encode
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private static function encodeUrl($url)
|
||||||
|
{
|
||||||
|
$url_parsed = parse_url($url);
|
||||||
|
|
||||||
|
$scheme = $url_parsed['scheme'] . '://';
|
||||||
|
$host = $url_parsed['host'];
|
||||||
|
$port = (isset($url_parsed['port']) ? $url_parsed['port'] : null);
|
||||||
|
$path = (isset($url_parsed['path']) ? $url_parsed['path'] : null);
|
||||||
|
$query = (isset($url_parsed['query']) ? $url_parsed['query'] : null);
|
||||||
|
|
||||||
|
if ($query != null) {
|
||||||
|
parse_str($url_parsed['query'], $query_parsed);
|
||||||
|
$query = '?' . http_build_query($query_parsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($port && $port[0] != ":")
|
||||||
|
$port = ":" . $port;
|
||||||
|
|
||||||
|
$result = $scheme . $host . $port . $path . $query;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
$pos = $newlineAt + 1;
|
|
||||||
$chunkLen = hexdec(rtrim($chunkLenHex,"\r\n"));
|
|
||||||
$dechunk .= substr($chunk, $pos, $chunkLen);
|
|
||||||
$pos = strpos($chunk, "\n", $pos + $chunkLen) + 1;
|
|
||||||
}
|
|
||||||
return $dechunk;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if (!function_exists('http_chunked_decode')) {
|
||||||
* determine if a string can represent a number in hexadecimal
|
/**
|
||||||
* @link http://uk1.php.net/ctype_xdigit
|
* Dechunk an http 'transfer-encoding: chunked' message
|
||||||
* @param string $hex
|
* @param string $chunk the encoded message
|
||||||
* @return boolean true if the string is a hex, otherwise false
|
* @return string the decoded message
|
||||||
*/
|
*/
|
||||||
function is_hex($hex) {
|
function http_chunked_decode($chunk)
|
||||||
return ctype_xdigit($hex);
|
{
|
||||||
}
|
$pos = 0;
|
||||||
|
$len = strlen($chunk);
|
||||||
|
$dechunk = null;
|
||||||
|
|
||||||
|
while (($pos < $len)
|
||||||
|
&& ($chunkLenHex = substr($chunk, $pos, ($newlineAt = strpos($chunk, "\n", $pos + 1)) - $pos))) {
|
||||||
|
|
||||||
|
if (!is_hex($chunkLenHex)) {
|
||||||
|
trigger_error('Value is not properly chunk encoded', E_USER_WARNING);
|
||||||
|
return $chunk;
|
||||||
|
}
|
||||||
|
|
||||||
|
$pos = $newlineAt + 1;
|
||||||
|
$chunkLen = hexdec(rtrim($chunkLenHex, "\r\n"));
|
||||||
|
$dechunk .= substr($chunk, $pos, $chunkLen);
|
||||||
|
$pos = strpos($chunk, "\n", $pos + $chunkLen) + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $dechunk;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* determine if a string can represent a number in hexadecimal
|
||||||
|
* @link http://uk1.php.net/ctype_xdigit
|
||||||
|
* @param string $hex
|
||||||
|
* @return boolean true if the string is a hex, otherwise false
|
||||||
|
*/
|
||||||
|
function is_hex($hex)
|
||||||
|
{
|
||||||
|
return ctype_xdigit($hex);
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user