sinacms / MultiHttp

src/Request.php

Doc Comments +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return callable
      */
     public function endCallback()
     {
@@ -211,7 +211,7 @@ 
 
     /**
      * @param $key
-     * @return mixed
+     * @return string
      */
     protected static function fullOption($key)
     {

Indentation +504 added lines, -504 removed lines

@@ -20,515 +20,515 @@
  */
 class Request extends Http
 {
-    /**
-     * you can implement more traits
-     */
-    use JsonTrait;
-    /**
-     *
-     */
-    const MAX_REDIRECTS_DEFAULT = 10;
-    protected static $curlAlias = array(
-        'url' => 'CURLOPT_URL',
-        'uri' => 'CURLOPT_URL',
-        'debug' => 'CURLOPT_VERBOSE',//for debug verbose
-        'method' => 'CURLOPT_CUSTOMREQUEST',
-        'data' => 'CURLOPT_POSTFIELDS', // array or string , file begin with '@'
-        'ua' => 'CURLOPT_USERAGENT',
-        'timeout' => 'CURLOPT_TIMEOUT', // (secs) 0 means indefinitely
-        'connect_timeout' => 'CURLOPT_CONNECTTIMEOUT',
-        'referer' => 'CURLOPT_REFERER',
-        'binary' => 'CURLOPT_BINARYTRANSFER',
-        'port' => 'CURLOPT_PORT',
-        'header' => 'CURLOPT_HEADER', // TRUE:include header
-        'headers' => 'CURLOPT_HTTPHEADER', // array
-        'download' => 'CURLOPT_FILE', // writing file stream (using fopen()), default is STDOUT
-        'upload' => 'CURLOPT_INFILE', // reading file stream
-        'transfer' => 'CURLOPT_RETURNTRANSFER', // TRUE:return string; FALSE:output directly (curl_exec)
-        'follow_location' => 'CURLOPT_FOLLOWLOCATION',
-        'timeout_ms' => 'CURLOPT_TIMEOUT_MS', // milliseconds,  libcurl version > 7.36.0 ,
-        /**
-         * private properties
-         */
-        'expectsMime' => null, //expected mime
-        'sendMime' => null, //send mime
-        'ip' => null,//specify ip to send request
-        'callback' => null,//callback on end
-
-    );
-    protected static $loggerHandler;
-    public
-        $curlHandle,
-        $uri,
-        $sendMime,
-        $expectedMime;
-    protected $options = array(
-        'CURLOPT_MAXREDIRS' => 10,
-        'CURLOPT_SSL_VERIFYPEER' => false,//for https
-        'CURLOPT_SSL_VERIFYHOST' => 0,//for https
-        'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4,//ipv4 first
-        'header' => true,
-        'method' => self::GET,
-        'transfer' => true,
-        'headers' => array(),
-        'follow_location' => true,
-        'timeout' => 0);
-    protected $endCallback;
-    protected $withURIQuery;
-    protected $hasInitialized = false;
-
-    /**
-     * Request constructor.
-     */
-    protected function __construct()
-    {
-    }
-
-    /**
-     * @return Request
-     */
-    public static function create()
-    {
-        return new self;
-    }
-
-    /**
-     * @param callable $handler
-     */
-    public static function setLogHandler(callable $handler)
-    {
-        self::$loggerHandler = $handler;
-    }
-
-    /**
-     * @param $parsedComponents
-     * @return string
-     */
-    private static function combineUrl($parsedComponents)
-    {
-        $scheme = isset($parsedComponents['scheme']) ? $parsedComponents['scheme'] . '://' : '';
-        $host = isset($parsedComponents['host']) ? $parsedComponents['host'] : '';
-        $port = isset($parsedComponents['port']) ? ':' . $parsedComponents['port'] : '';
-        $user = isset($parsedComponents['user']) ? $parsedComponents['user'] : '';
-        $pass = isset($parsedComponents['pass']) ? ':' . $parsedComponents['pass'] : '';
-        $pass = ($user || $pass) ? "$pass@" : '';
-        $path = isset($parsedComponents['path']) ? $parsedComponents['path'] : '';
-        $query = isset($parsedComponents['query']) ? '?' . $parsedComponents['query'] : '';
-        $fragment = isset($parsedComponents['fragment']) ? '#' . $parsedComponents['fragment'] : '';
-        return "$scheme$user$pass$host$port$path$query$fragment";
-    }
-
-    /**
-     * @param string $mime
-     * @return $this
-     */
-    public function expectsMime($mime = 'json')
-    {
-        $this->expectedMime = $mime;
-        return $this;
-    }
-
-    /**
-     * @param string $mime
-     * @return Request
-     */
-    public function sendMime($mime = 'json')
-    {
-        $this->sendMime = $mime;
-        $this->addHeader('Content-type', Mime::getFullMime($mime));
-        return $this;
-    }
-
-    /**
-     * @param $headerName
-     * @param $value , can be rawurlencode
-     * @return $this
-     */
-    public function addHeader($headerName, $value)
-    {
-        $this->options['headers'][] = $headerName . ': ' . $value;
-        return $this;
-    }
-
-    /**
-     * @param $uri
-     * @return $this
-     */
-    public function uri($uri)
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    /**
-     * @param $timeout seconds, can be float
-     * @return $this
-     */
-    public function timeout($timeout)
-    {
-        $this->options['timeout'] = $timeout;
-        return $this;
-    }
-
-    /**
-     * @param array $headers
-     * @return $this
-     */
-    public function addHeaders(array $headers)
-    {
-        foreach ($headers as $header => $value) {
-            $this->addHeader($header, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function endCallback()
-    {
-        return $this->endCallback;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasEndCallback()
-    {
-        return isset($this->endCallback);
-    }
-
-    /**
-     * @param $field alias or field name
-     * @return bool|mixed
-     */
-    public function getIni($field = null)
-    {
-        if(!$field) return $this->options;
-        $full = self::fullOption($field);
-        return isset($this->options[$full]) ? $this->options[$full] : false;
-    }
-
-    /**
-     * @param $key
-     * @return mixed
-     */
-    protected static function fullOption($key)
-    {
-        $full = false;
-        if (isset(self::$curlAlias[$key])) {
-            $full = self::$curlAlias[$key];
-        } elseif ((substr($key, 0, strlen('CURLOPT_')) == 'CURLOPT_') && defined($key)) {
-            $full = $key;
-        }
-        return $full;
-    }
-
-    /**
-     * @param $data
-     * @return $this
-     */
-    public function addQuery($data)
-    {
-        if (!empty($data)) {
-            if (is_array($data)) {
-                $this->withURIQuery = http_build_query($data);
-            } else if (is_string($data)) {
-                $this->withURIQuery = $data;
-            } else {
-                throw new InvalidArgumentException('data must be array or string');
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return Request
-     */
-    public function post($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::POST, $uri, $payload, $options);
-    }
-
-    /**
-     * @param $method
-     * @param $url
-     * @param $data
-     * @param array $options
-     * @return $this
-     */
-    protected function ini($method, $url, $data, array $options = array())
-    {
-        $options = array('url' => $url, 'method' => $method, 'data' => $data) + $options;
-        $this->addOptions($options);
-
-        return $this;
-    }
-
-    /**
-     * @param array $options
-     * @return $this
-     */
-    public function addOptions(array $options = array())
-    {
-        $this->options = $options + $this->options;
-        $this->uri = $this->options['url'];
-        return $this;
-    }
-
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return Request
-     */
-    function put($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::PUT, $uri, $payload, $options);
-    }
-
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return Request
-     */
-    function patch($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::PATCH, $uri, $payload, $options);
-    }
-
-    /**
-     * @param $uri
-     * @param array $options
-     * @return Request
-     */
-    public function get($uri, array $options = array())
-    {
-        return $this->ini(Http::GET, $uri, array(), $options);
-    }
-
-    /**
-     * @param $uri
-     * @param array $options
-     * @return Request
-     */
-    function options($uri, array $options = array())
-    {
-        return $this->ini(Http::OPTIONS, $uri, array(), $options);
-    }
-
-    /**
-     * @param $uri
-     * @param array $options
-     * @return Request
-     */
-    function head($uri, array $options = array())
-    {
-        return $this->ini(Http::HEAD, $uri, array('CURLOPT_NOBODY' => true), $options);
-    }
-
-    /**
-     * @param $uri
-     * @param array $options
-     * @return Request
-     */
-    function delete($uri, array $options = array())
-    {
-        return $this->ini(Http::DELETE, $uri, array(), $options);
-    }
-
-    /**
-     * @param $uri
-     * @param array $options
-     * @return Request
-     */
-    function trace($uri, array $options = array())
-    {
-        return $this->ini(Http::TRACE, $uri, array(), $options);
-    }
-
-    /**
-     * @param bool $isMultiCurl
-     * @return Response
-     */
-    public function send($isMultiCurl = false)
-    {
-        try {
-            if (!$this->hasInitialized)
-                $this->applyOptions();
-            $response = $this->makeResponse($isMultiCurl);
-            $response->parse();
-        } catch (\Exception $e) {
-            if(!isset($response)) $response = Response::create($this, null, null, null, null);
-            $response->error = $e->getMessage();
-            $response->errorCode = 999;
-        }
-
-        if (self::$loggerHandler) {
-            call_user_func(self::$loggerHandler, $response);
-        }
-        if ($this->endCallback) {
-            call_user_func($this->endCallback, $response);
-        }
-
-        return $response;
-    }
-
-    /**
-     * @return $this
-     */
-    public function applyOptions()
-    {
-        $curl = curl_init();
-        $this->curlHandle = $curl;
-        $this->prepare();
-        $this->hasInitialized = true;
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    protected function prepare()
-    {
-        $this->options['url'] = trim($this->options['url']);
-        if (empty($this->options['url'])) {
-            throw new InvalidArgumentException('url can not empty');
-        }
-
-        if(isset($this->options['expectsMime'])){
-            $this->expectsMime($this->options['expectsMime']);
+	/**
+	 * you can implement more traits
+	 */
+	use JsonTrait;
+	/**
+	 *
+	 */
+	const MAX_REDIRECTS_DEFAULT = 10;
+	protected static $curlAlias = array(
+		'url' => 'CURLOPT_URL',
+		'uri' => 'CURLOPT_URL',
+		'debug' => 'CURLOPT_VERBOSE',//for debug verbose
+		'method' => 'CURLOPT_CUSTOMREQUEST',
+		'data' => 'CURLOPT_POSTFIELDS', // array or string , file begin with '@'
+		'ua' => 'CURLOPT_USERAGENT',
+		'timeout' => 'CURLOPT_TIMEOUT', // (secs) 0 means indefinitely
+		'connect_timeout' => 'CURLOPT_CONNECTTIMEOUT',
+		'referer' => 'CURLOPT_REFERER',
+		'binary' => 'CURLOPT_BINARYTRANSFER',
+		'port' => 'CURLOPT_PORT',
+		'header' => 'CURLOPT_HEADER', // TRUE:include header
+		'headers' => 'CURLOPT_HTTPHEADER', // array
+		'download' => 'CURLOPT_FILE', // writing file stream (using fopen()), default is STDOUT
+		'upload' => 'CURLOPT_INFILE', // reading file stream
+		'transfer' => 'CURLOPT_RETURNTRANSFER', // TRUE:return string; FALSE:output directly (curl_exec)
+		'follow_location' => 'CURLOPT_FOLLOWLOCATION',
+		'timeout_ms' => 'CURLOPT_TIMEOUT_MS', // milliseconds,  libcurl version > 7.36.0 ,
+		/**
+		 * private properties
+		 */
+		'expectsMime' => null, //expected mime
+		'sendMime' => null, //send mime
+		'ip' => null,//specify ip to send request
+		'callback' => null,//callback on end
+
+	);
+	protected static $loggerHandler;
+	public
+		$curlHandle,
+		$uri,
+		$sendMime,
+		$expectedMime;
+	protected $options = array(
+		'CURLOPT_MAXREDIRS' => 10,
+		'CURLOPT_SSL_VERIFYPEER' => false,//for https
+		'CURLOPT_SSL_VERIFYHOST' => 0,//for https
+		'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4,//ipv4 first
+		'header' => true,
+		'method' => self::GET,
+		'transfer' => true,
+		'headers' => array(),
+		'follow_location' => true,
+		'timeout' => 0);
+	protected $endCallback;
+	protected $withURIQuery;
+	protected $hasInitialized = false;
+
+	/**
+	 * Request constructor.
+	 */
+	protected function __construct()
+	{
+	}
+
+	/**
+	 * @return Request
+	 */
+	public static function create()
+	{
+		return new self;
+	}
+
+	/**
+	 * @param callable $handler
+	 */
+	public static function setLogHandler(callable $handler)
+	{
+		self::$loggerHandler = $handler;
+	}
+
+	/**
+	 * @param $parsedComponents
+	 * @return string
+	 */
+	private static function combineUrl($parsedComponents)
+	{
+		$scheme = isset($parsedComponents['scheme']) ? $parsedComponents['scheme'] . '://' : '';
+		$host = isset($parsedComponents['host']) ? $parsedComponents['host'] : '';
+		$port = isset($parsedComponents['port']) ? ':' . $parsedComponents['port'] : '';
+		$user = isset($parsedComponents['user']) ? $parsedComponents['user'] : '';
+		$pass = isset($parsedComponents['pass']) ? ':' . $parsedComponents['pass'] : '';
+		$pass = ($user || $pass) ? "$pass@" : '';
+		$path = isset($parsedComponents['path']) ? $parsedComponents['path'] : '';
+		$query = isset($parsedComponents['query']) ? '?' . $parsedComponents['query'] : '';
+		$fragment = isset($parsedComponents['fragment']) ? '#' . $parsedComponents['fragment'] : '';
+		return "$scheme$user$pass$host$port$path$query$fragment";
+	}
+
+	/**
+	 * @param string $mime
+	 * @return $this
+	 */
+	public function expectsMime($mime = 'json')
+	{
+		$this->expectedMime = $mime;
+		return $this;
+	}
+
+	/**
+	 * @param string $mime
+	 * @return Request
+	 */
+	public function sendMime($mime = 'json')
+	{
+		$this->sendMime = $mime;
+		$this->addHeader('Content-type', Mime::getFullMime($mime));
+		return $this;
+	}
+
+	/**
+	 * @param $headerName
+	 * @param $value , can be rawurlencode
+	 * @return $this
+	 */
+	public function addHeader($headerName, $value)
+	{
+		$this->options['headers'][] = $headerName . ': ' . $value;
+		return $this;
+	}
+
+	/**
+	 * @param $uri
+	 * @return $this
+	 */
+	public function uri($uri)
+	{
+		$this->uri = $uri;
+		return $this;
+	}
+
+	/**
+	 * @param $timeout seconds, can be float
+	 * @return $this
+	 */
+	public function timeout($timeout)
+	{
+		$this->options['timeout'] = $timeout;
+		return $this;
+	}
+
+	/**
+	 * @param array $headers
+	 * @return $this
+	 */
+	public function addHeaders(array $headers)
+	{
+		foreach ($headers as $header => $value) {
+			$this->addHeader($header, $value);
+		}
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function endCallback()
+	{
+		return $this->endCallback;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasEndCallback()
+	{
+		return isset($this->endCallback);
+	}
+
+	/**
+	 * @param $field alias or field name
+	 * @return bool|mixed
+	 */
+	public function getIni($field = null)
+	{
+		if(!$field) return $this->options;
+		$full = self::fullOption($field);
+		return isset($this->options[$full]) ? $this->options[$full] : false;
+	}
+
+	/**
+	 * @param $key
+	 * @return mixed
+	 */
+	protected static function fullOption($key)
+	{
+		$full = false;
+		if (isset(self::$curlAlias[$key])) {
+			$full = self::$curlAlias[$key];
+		} elseif ((substr($key, 0, strlen('CURLOPT_')) == 'CURLOPT_') && defined($key)) {
+			$full = $key;
+		}
+		return $full;
+	}
+
+	/**
+	 * @param $data
+	 * @return $this
+	 */
+	public function addQuery($data)
+	{
+		if (!empty($data)) {
+			if (is_array($data)) {
+				$this->withURIQuery = http_build_query($data);
+			} else if (is_string($data)) {
+				$this->withURIQuery = $data;
+			} else {
+				throw new InvalidArgumentException('data must be array or string');
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return Request
+	 */
+	public function post($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::POST, $uri, $payload, $options);
+	}
+
+	/**
+	 * @param $method
+	 * @param $url
+	 * @param $data
+	 * @param array $options
+	 * @return $this
+	 */
+	protected function ini($method, $url, $data, array $options = array())
+	{
+		$options = array('url' => $url, 'method' => $method, 'data' => $data) + $options;
+		$this->addOptions($options);
+
+		return $this;
+	}
+
+	/**
+	 * @param array $options
+	 * @return $this
+	 */
+	public function addOptions(array $options = array())
+	{
+		$this->options = $options + $this->options;
+		$this->uri = $this->options['url'];
+		return $this;
+	}
+
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return Request
+	 */
+	function put($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::PUT, $uri, $payload, $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return Request
+	 */
+	function patch($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::PATCH, $uri, $payload, $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return Request
+	 */
+	public function get($uri, array $options = array())
+	{
+		return $this->ini(Http::GET, $uri, array(), $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return Request
+	 */
+	function options($uri, array $options = array())
+	{
+		return $this->ini(Http::OPTIONS, $uri, array(), $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return Request
+	 */
+	function head($uri, array $options = array())
+	{
+		return $this->ini(Http::HEAD, $uri, array('CURLOPT_NOBODY' => true), $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return Request
+	 */
+	function delete($uri, array $options = array())
+	{
+		return $this->ini(Http::DELETE, $uri, array(), $options);
+	}
+
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return Request
+	 */
+	function trace($uri, array $options = array())
+	{
+		return $this->ini(Http::TRACE, $uri, array(), $options);
+	}
+
+	/**
+	 * @param bool $isMultiCurl
+	 * @return Response
+	 */
+	public function send($isMultiCurl = false)
+	{
+		try {
+			if (!$this->hasInitialized)
+				$this->applyOptions();
+			$response = $this->makeResponse($isMultiCurl);
+			$response->parse();
+		} catch (\Exception $e) {
+			if(!isset($response)) $response = Response::create($this, null, null, null, null);
+			$response->error = $e->getMessage();
+			$response->errorCode = 999;
+		}
+
+		if (self::$loggerHandler) {
+			call_user_func(self::$loggerHandler, $response);
+		}
+		if ($this->endCallback) {
+			call_user_func($this->endCallback, $response);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function applyOptions()
+	{
+		$curl = curl_init();
+		$this->curlHandle = $curl;
+		$this->prepare();
+		$this->hasInitialized = true;
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	protected function prepare()
+	{
+		$this->options['url'] = trim($this->options['url']);
+		if (empty($this->options['url'])) {
+			throw new InvalidArgumentException('url can not empty');
+		}
+
+		if(isset($this->options['expectsMime'])){
+			$this->expectsMime($this->options['expectsMime']);
 //            unset($this->options['expectsMime']);
-        }
+		}
 
-        if(isset($this->options['sendMime'])){
-            $this->sendMime($this->options['sendMime']);
+		if(isset($this->options['sendMime'])){
+			$this->sendMime($this->options['sendMime']);
 //            unset($this->options['sendMime']);
-        }
-
-        $this->serializeBody();
-
-        //try fix url
-        if (strpos($this->options['url'], '://') === FALSE) $this->options['url'] = 'http://' . $this->options['url'];
-        $components = parse_url($this->options['url']);
-        if(FALSE === $components) throw new InvalidArgumentException('formatting url occurs error: '. $this->options['url']);
-        if($this->withURIQuery){
-            if(isset($components['query'])) $components['query'] .= '&'. trim($this->withURIQuery);
-            else $components['query'] = trim($this->withURIQuery);
-        }
-        $this->options['url'] = self::combineUrl($components);
-
-        if (isset($this->options['callback'])) {
-            $this->onEnd($this->options['callback']);
+		}
+
+		$this->serializeBody();
+
+		//try fix url
+		if (strpos($this->options['url'], '://') === FALSE) $this->options['url'] = 'http://' . $this->options['url'];
+		$components = parse_url($this->options['url']);
+		if(FALSE === $components) throw new InvalidArgumentException('formatting url occurs error: '. $this->options['url']);
+		if($this->withURIQuery){
+			if(isset($components['query'])) $components['query'] .= '&'. trim($this->withURIQuery);
+			else $components['query'] = trim($this->withURIQuery);
+		}
+		$this->options['url'] = self::combineUrl($components);
+
+		if (isset($this->options['callback'])) {
+			$this->onEnd($this->options['callback']);
 //            unset($this->options['callback']);
-        }
-        //swap ip and host
-        if (!empty($this->options['ip'])) {
-            $matches = array();
-            preg_match('/\/\/([^\/]+)/', $this->options['url'], $matches);
-            $host = $matches[1];
-            if (empty($this->options['headers']) || !is_array($this->options['headers'])) {
-                $this->options['headers'] = array('Host: ' . $host);
-            } else {
-                $this->options['headers'][] = 'Host: ' . $host;
-            }
-            $this->options['url'] = preg_replace('/\/\/([^\/]+)/', '//' . $this->options['ip'], $this->options['url']);
+		}
+		//swap ip and host
+		if (!empty($this->options['ip'])) {
+			$matches = array();
+			preg_match('/\/\/([^\/]+)/', $this->options['url'], $matches);
+			$host = $matches[1];
+			if (empty($this->options['headers']) || !is_array($this->options['headers'])) {
+				$this->options['headers'] = array('Host: ' . $host);
+			} else {
+				$this->options['headers'][] = 'Host: ' . $host;
+			}
+			$this->options['url'] = preg_replace('/\/\/([^\/]+)/', '//' . $this->options['ip'], $this->options['url']);
 //            unset($this->options['ip']);
-            unset($host);
-        }
-        //process version
-        if (!empty($this->options['http_version'])) {
-            $version = $this->options['http_version'];
-            if ($version == '1.0') {
-                $this->options['CURLOPT_HTTP_VERSION'] = CURLOPT_HTTP_VERSION_1_0;
-            } elseif ($version == '1.1') {
-                $this->options['CURLOPT_HTTP_VERSION'] = CURLOPT_HTTP_VERSION_1_1;
-            }
-
-            unset($version);
-        }
-
-        //convert secs to milliseconds
-        if (defined('CURLOPT_TIMEOUT_MS')) {
-            if (!isset($this->options['timeout_ms'])) {
-                $this->options['timeout_ms'] = intval($this->options['timeout'] * 1000);
-            } else {
-                $this->options['timeout_ms'] = intval($this->options['timeout_ms']);
-            }
-        }
-
-
-        $cURLOptions = self::filterAndRaw($this->options);
-        curl_setopt_array($this->curlHandle, $cURLOptions);
-
-        return $this;
-    }
-
-    public function serializeBody()
-    {
-        if (isset($this->options['data'])) {
-            if (isset($this->sendMime)) {
-                $method = $this->sendMime;
-                if (!method_exists($this, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
-                $this->options['data'] = $this->$method($this->options['data']);
-            } else {
-                $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility
-            }
-        }
-    }
-
-    /**
-     * @param callable $callback
-     * @return $this
-     */
-    public function onEnd(callable $callback)
-    {
-        if (!is_callable($callback)) {
-            throw new InvalidArgumentException('callback not is callable :' . print_r($callback, 1));
-        }
-
-        $this->endCallback = $callback;
-        return $this;
-    }
-
-    /**
-     * @param array $options
-     * @return array
-     */
-    protected static function filterAndRaw(array &$options)
-    {
-        $opts = $fullsOpts = array();
-        foreach ($options as $key => $val) {
-            $fullOption = self::fullOption($key);
-
-            if ($fullOption) {
-                $fullsOpts[$fullOption] = $val;
-                $opts[constant($fullOption)] = $val;
-            }
-            unset($options[$key]);
-        }
-        $options = $fullsOpts;
-        return $opts;
-    }
-
-    /**
-     * @param bool $isMultiCurl
-     * @return Response
-     * @throws \Exception
-     */
-    public function makeResponse($isMultiCurl = false)
-    {
-        $body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle);
-        $info = curl_getinfo($this->curlHandle);
-        $errorCode = curl_errno($this->curlHandle);
-        $error = curl_error($this->curlHandle);
-        $response = Response::create($this, $body, $info, $errorCode, $error);
-        return $response;
-    }
+			unset($host);
+		}
+		//process version
+		if (!empty($this->options['http_version'])) {
+			$version = $this->options['http_version'];
+			if ($version == '1.0') {
+				$this->options['CURLOPT_HTTP_VERSION'] = CURLOPT_HTTP_VERSION_1_0;
+			} elseif ($version == '1.1') {
+				$this->options['CURLOPT_HTTP_VERSION'] = CURLOPT_HTTP_VERSION_1_1;
+			}
+
+			unset($version);
+		}
+
+		//convert secs to milliseconds
+		if (defined('CURLOPT_TIMEOUT_MS')) {
+			if (!isset($this->options['timeout_ms'])) {
+				$this->options['timeout_ms'] = intval($this->options['timeout'] * 1000);
+			} else {
+				$this->options['timeout_ms'] = intval($this->options['timeout_ms']);
+			}
+		}
+
+
+		$cURLOptions = self::filterAndRaw($this->options);
+		curl_setopt_array($this->curlHandle, $cURLOptions);
+
+		return $this;
+	}
+
+	public function serializeBody()
+	{
+		if (isset($this->options['data'])) {
+			if (isset($this->sendMime)) {
+				$method = $this->sendMime;
+				if (!method_exists($this, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+				$this->options['data'] = $this->$method($this->options['data']);
+			} else {
+				$this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility
+			}
+		}
+	}
+
+	/**
+	 * @param callable $callback
+	 * @return $this
+	 */
+	public function onEnd(callable $callback)
+	{
+		if (!is_callable($callback)) {
+			throw new InvalidArgumentException('callback not is callable :' . print_r($callback, 1));
+		}
+
+		$this->endCallback = $callback;
+		return $this;
+	}
+
+	/**
+	 * @param array $options
+	 * @return array
+	 */
+	protected static function filterAndRaw(array &$options)
+	{
+		$opts = $fullsOpts = array();
+		foreach ($options as $key => $val) {
+			$fullOption = self::fullOption($key);
+
+			if ($fullOption) {
+				$fullsOpts[$fullOption] = $val;
+				$opts[constant($fullOption)] = $val;
+			}
+			unset($options[$key]);
+		}
+		$options = $fullsOpts;
+		return $opts;
+	}
+
+	/**
+	 * @param bool $isMultiCurl
+	 * @return Response
+	 * @throws \Exception
+	 */
+	public function makeResponse($isMultiCurl = false)
+	{
+		$body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle);
+		$info = curl_getinfo($this->curlHandle);
+		$errorCode = curl_errno($this->curlHandle);
+		$error = curl_error($this->curlHandle);
+		$response = Response::create($this, $body, $info, $errorCode, $error);
+		return $response;
+	}
 
 
 }

Spacing +29 added lines, -29 removed lines

@@ -31,7 +31,7 @@ 
     protected static $curlAlias = array(
         'url' => 'CURLOPT_URL',
         'uri' => 'CURLOPT_URL',
-        'debug' => 'CURLOPT_VERBOSE',//for debug verbose
+        'debug' => 'CURLOPT_VERBOSE', //for debug verbose
         'method' => 'CURLOPT_CUSTOMREQUEST',
         'data' => 'CURLOPT_POSTFIELDS', // array or string , file begin with '@'
         'ua' => 'CURLOPT_USERAGENT',
@@ -52,8 +52,8 @@ 
          */
         'expectsMime' => null, //expected mime
         'sendMime' => null, //send mime
-        'ip' => null,//specify ip to send request
-        'callback' => null,//callback on end
+        'ip' => null, //specify ip to send request
+        'callback' => null, //callback on end
 
     );
     protected static $loggerHandler;
@@ -64,9 +64,9 @@ 
         $expectedMime;
     protected $options = array(
         'CURLOPT_MAXREDIRS' => 10,
-        'CURLOPT_SSL_VERIFYPEER' => false,//for https
-        'CURLOPT_SSL_VERIFYHOST' => 0,//for https
-        'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4,//ipv4 first
+        'CURLOPT_SSL_VERIFYPEER' => false, //for https
+        'CURLOPT_SSL_VERIFYHOST' => 0, //for https
+        'CURLOPT_IPRESOLVE' => CURL_IPRESOLVE_V4, //ipv4 first
         'header' => true,
         'method' => self::GET,
         'transfer' => true,
@@ -106,15 +106,15 @@ 
      */
     private static function combineUrl($parsedComponents)
     {
-        $scheme = isset($parsedComponents['scheme']) ? $parsedComponents['scheme'] . '://' : '';
+        $scheme = isset($parsedComponents['scheme']) ? $parsedComponents['scheme'].'://' : '';
         $host = isset($parsedComponents['host']) ? $parsedComponents['host'] : '';
-        $port = isset($parsedComponents['port']) ? ':' . $parsedComponents['port'] : '';
+        $port = isset($parsedComponents['port']) ? ':'.$parsedComponents['port'] : '';
         $user = isset($parsedComponents['user']) ? $parsedComponents['user'] : '';
-        $pass = isset($parsedComponents['pass']) ? ':' . $parsedComponents['pass'] : '';
+        $pass = isset($parsedComponents['pass']) ? ':'.$parsedComponents['pass'] : '';
         $pass = ($user || $pass) ? "$pass@" : '';
         $path = isset($parsedComponents['path']) ? $parsedComponents['path'] : '';
-        $query = isset($parsedComponents['query']) ? '?' . $parsedComponents['query'] : '';
-        $fragment = isset($parsedComponents['fragment']) ? '#' . $parsedComponents['fragment'] : '';
+        $query = isset($parsedComponents['query']) ? '?'.$parsedComponents['query'] : '';
+        $fragment = isset($parsedComponents['fragment']) ? '#'.$parsedComponents['fragment'] : '';
         return "$scheme$user$pass$host$port$path$query$fragment";
     }
 
@@ -146,7 +146,7 @@ 
      */
     public function addHeader($headerName, $value)
     {
-        $this->options['headers'][] = $headerName . ': ' . $value;
+        $this->options['headers'][] = $headerName.': '.$value;
         return $this;
     }
 
@@ -204,7 +204,7 @@ 
      */
     public function getIni($field = null)
     {
-        if(!$field) return $this->options;
+        if (!$field) return $this->options;
         $full = self::fullOption($field);
         return isset($this->options[$full]) ? $this->options[$full] : false;
     }
@@ -262,7 +262,7 @@ 
      */
     protected function ini($method, $url, $data, array $options = array())
     {
-        $options = array('url' => $url, 'method' => $method, 'data' => $data) + $options;
+        $options = array('url' => $url, 'method' => $method, 'data' => $data)+$options;
         $this->addOptions($options);
 
         return $this;
@@ -274,7 +274,7 @@ 
      */
     public function addOptions(array $options = array())
     {
-        $this->options = $options + $this->options;
+        $this->options = $options+$this->options;
         $this->uri = $this->options['url'];
         return $this;
     }
@@ -363,7 +363,7 @@ 
             $response = $this->makeResponse($isMultiCurl);
             $response->parse();
         } catch (\Exception $e) {
-            if(!isset($response)) $response = Response::create($this, null, null, null, null);
+            if (!isset($response)) $response = Response::create($this, null, null, null, null);
             $response->error = $e->getMessage();
             $response->errorCode = 999;
         }
@@ -400,12 +400,12 @@ 
             throw new InvalidArgumentException('url can not empty');
         }
 
-        if(isset($this->options['expectsMime'])){
+        if (isset($this->options['expectsMime'])) {
             $this->expectsMime($this->options['expectsMime']);
 //            unset($this->options['expectsMime']);
         }
 
-        if(isset($this->options['sendMime'])){
+        if (isset($this->options['sendMime'])) {
             $this->sendMime($this->options['sendMime']);
 //            unset($this->options['sendMime']);
         }
@@ -413,11 +413,11 @@ 
         $this->serializeBody();
 
         //try fix url
-        if (strpos($this->options['url'], '://') === FALSE) $this->options['url'] = 'http://' . $this->options['url'];
+        if (strpos($this->options['url'], '://') === FALSE) $this->options['url'] = 'http://'.$this->options['url'];
         $components = parse_url($this->options['url']);
-        if(FALSE === $components) throw new InvalidArgumentException('formatting url occurs error: '. $this->options['url']);
-        if($this->withURIQuery){
-            if(isset($components['query'])) $components['query'] .= '&'. trim($this->withURIQuery);
+        if (FALSE === $components) throw new InvalidArgumentException('formatting url occurs error: '.$this->options['url']);
+        if ($this->withURIQuery) {
+            if (isset($components['query'])) $components['query'] .= '&'.trim($this->withURIQuery);
             else $components['query'] = trim($this->withURIQuery);
         }
         $this->options['url'] = self::combineUrl($components);
@@ -432,11 +432,11 @@ 
             preg_match('/\/\/([^\/]+)/', $this->options['url'], $matches);
             $host = $matches[1];
             if (empty($this->options['headers']) || !is_array($this->options['headers'])) {
-                $this->options['headers'] = array('Host: ' . $host);
+                $this->options['headers'] = array('Host: '.$host);
             } else {
-                $this->options['headers'][] = 'Host: ' . $host;
+                $this->options['headers'][] = 'Host: '.$host;
             }
-            $this->options['url'] = preg_replace('/\/\/([^\/]+)/', '//' . $this->options['ip'], $this->options['url']);
+            $this->options['url'] = preg_replace('/\/\/([^\/]+)/', '//'.$this->options['ip'], $this->options['url']);
 //            unset($this->options['ip']);
             unset($host);
         }
@@ -455,7 +455,7 @@ 
         //convert secs to milliseconds
         if (defined('CURLOPT_TIMEOUT_MS')) {
             if (!isset($this->options['timeout_ms'])) {
-                $this->options['timeout_ms'] = intval($this->options['timeout'] * 1000);
+                $this->options['timeout_ms'] = intval($this->options['timeout']*1000);
             } else {
                 $this->options['timeout_ms'] = intval($this->options['timeout_ms']);
             }
@@ -473,10 +473,10 @@ 
         if (isset($this->options['data'])) {
             if (isset($this->sendMime)) {
                 $method = $this->sendMime;
-                if (!method_exists($this, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+                if (!method_exists($this, $method)) throw new InvalidOperationException($method.' is not exists in '.__CLASS__);
                 $this->options['data'] = $this->$method($this->options['data']);
             } else {
-                $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility
+                $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data']; //for better compatibility
             }
         }
     }
@@ -488,7 +488,7 @@ 
     public function onEnd(callable $callback)
     {
         if (!is_callable($callback)) {
-            throw new InvalidArgumentException('callback not is callable :' . print_r($callback, 1));
+            throw new InvalidArgumentException('callback not is callable :'.print_r($callback, 1));
         }
 
         $this->endCallback = $callback;

Braces +23 added lines, -9 removed lines

@@ -204,7 +204,9 @@ 
      */
     public function getIni($field = null)
     {
-        if(!$field) return $this->options;
+        if(!$field) {
+        	return $this->options;
+        }
         $full = self::fullOption($field);
         return isset($this->options[$full]) ? $this->options[$full] : false;
     }
@@ -358,12 +360,15 @@ 
     public function send($isMultiCurl = false)
     {
         try {
-            if (!$this->hasInitialized)
-                $this->applyOptions();
+            if (!$this->hasInitialized) {
+                            $this->applyOptions();
+            }
             $response = $this->makeResponse($isMultiCurl);
             $response->parse();
         } catch (\Exception $e) {
-            if(!isset($response)) $response = Response::create($this, null, null, null, null);
+            if(!isset($response)) {
+            	$response = Response::create($this, null, null, null, null);
+            }
             $response->error = $e->getMessage();
             $response->errorCode = 999;
         }
@@ -413,12 +418,19 @@ 
         $this->serializeBody();
 
         //try fix url
-        if (strpos($this->options['url'], '://') === FALSE) $this->options['url'] = 'http://' . $this->options['url'];
+        if (strpos($this->options['url'], '://') === FALSE) {
+        	$this->options['url'] = 'http://' . $this->options['url'];
+        }
         $components = parse_url($this->options['url']);
-        if(FALSE === $components) throw new InvalidArgumentException('formatting url occurs error: '. $this->options['url']);
+        if(FALSE === $components) {
+        	throw new InvalidArgumentException('formatting url occurs error: '. $this->options['url']);
+        }
         if($this->withURIQuery){
-            if(isset($components['query'])) $components['query'] .= '&'. trim($this->withURIQuery);
-            else $components['query'] = trim($this->withURIQuery);
+            if(isset($components['query'])) {
+            	$components['query'] .= '&'. trim($this->withURIQuery);
+            } else {
+            	$components['query'] = trim($this->withURIQuery);
+            }
         }
         $this->options['url'] = self::combineUrl($components);
 
@@ -473,7 +485,9 @@ 
         if (isset($this->options['data'])) {
             if (isset($this->sendMime)) {
                 $method = $this->sendMime;
-                if (!method_exists($this, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+                if (!method_exists($this, $method)) {
+                	throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+                }
                 $this->options['data'] = $this->$method($this->options['data']);
             } else {
                 $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility

src/MultiRequest.php

Indentation +109 added lines, -109 removed lines

@@ -15,120 +15,120 @@
  */
 class MultiRequest
 {
-    /**
-     * @var [Response]
-     */
-    protected static $requestPool;
-    protected static $multiHandler;
-    protected $defaultOptions = array();
-    private static $instance;
-    protected static $loggerHandler;
-    /**
-     * MultiRequest constructor.
-     */
-    protected function __construct()
-    {
-    }
+	/**
+	 * @var [Response]
+	 */
+	protected static $requestPool;
+	protected static $multiHandler;
+	protected $defaultOptions = array();
+	private static $instance;
+	protected static $loggerHandler;
+	/**
+	 * MultiRequest constructor.
+	 */
+	protected function __construct()
+	{
+	}
 
-    /**
-     * @return MultiRequest
-     */
-    public static function create()
-    {
-        if (!(self::$instance instanceof self)) {
-            self::$instance = new self;
-        }
-        self::prepare();
-        return self::$instance;
-    }
+	/**
+	 * @return MultiRequest
+	 */
+	public static function create()
+	{
+		if (!(self::$instance instanceof self)) {
+			self::$instance = new self;
+		}
+		self::prepare();
+		return self::$instance;
+	}
 
-    /**
-     * @param array $options
-     * @return $this
-     */
-    public function setDefaults(array $options = array()){
-        $this->defaultOptions = $options;
-        return $this;
-    }
-    protected static function prepare()
-    {
-        self::$multiHandler = curl_multi_init();
-    }
+	/**
+	 * @param array $options
+	 * @return $this
+	 */
+	public function setDefaults(array $options = array()){
+		$this->defaultOptions = $options;
+		return $this;
+	}
+	protected static function prepare()
+	{
+		self::$multiHandler = curl_multi_init();
+	}
 
-    /**
-     * @param $method
-     * @param $uri
-     * @param $payload
-     * @param array $options
-     * @return $this
-     */
-    public function add($method, $uri, $payload, array $options = array())
-    {
-        $options = array(
-                'method' => $method,
-                'url' => $uri,
-                'data' => $payload,
-            ) + $options;
-        $this->addOptions(array($options));
-        return $this;
-    }
+	/**
+	 * @param $method
+	 * @param $uri
+	 * @param $payload
+	 * @param array $options
+	 * @return $this
+	 */
+	public function add($method, $uri, $payload, array $options = array())
+	{
+		$options = array(
+				'method' => $method,
+				'url' => $uri,
+				'data' => $payload,
+			) + $options;
+		$this->addOptions(array($options));
+		return $this;
+	}
 
-    /**
-     * @param array $URLOptions
-     * example: array(array('url'=>'http://localhost:9999/','timeout'=>1, 'method'=>'POST', 'data'=>'aa=bb&c=d'))
-     * @return $this
-     */
-    public function addOptions(array $URLOptions)
-    {
-        foreach ($URLOptions as $options) {
-            $options = $options + $this->defaultOptions;
-            $request = Request::create()->addOptions($options)->applyOptions();
-            if (isset($options['callback'])) {
-                $request->onEnd($options['callback']);
-            }
-            $this->import($request);
-        }
-        return $this;
-    }
+	/**
+	 * @param array $URLOptions
+	 * example: array(array('url'=>'http://localhost:9999/','timeout'=>1, 'method'=>'POST', 'data'=>'aa=bb&c=d'))
+	 * @return $this
+	 */
+	public function addOptions(array $URLOptions)
+	{
+		foreach ($URLOptions as $options) {
+			$options = $options + $this->defaultOptions;
+			$request = Request::create()->addOptions($options)->applyOptions();
+			if (isset($options['callback'])) {
+				$request->onEnd($options['callback']);
+			}
+			$this->import($request);
+		}
+		return $this;
+	}
 
-    /**
-     * @param Request $request
-     * @return $this
-     */
-    public function import(Request $request)
-    {
-        if (!is_resource($request->curlHandle)) {
-            throw new InvalidArgumentException('Request curl handle is not initialized');
-        }
-        curl_multi_add_handle(self::$multiHandler, $request->curlHandle);
-        self::$requestPool[] = $request;
-        return $this;
-    }
+	/**
+	 * @param Request $request
+	 * @return $this
+	 */
+	public function import(Request $request)
+	{
+		if (!is_resource($request->curlHandle)) {
+			throw new InvalidArgumentException('Request curl handle is not initialized');
+		}
+		curl_multi_add_handle(self::$multiHandler, $request->curlHandle);
+		self::$requestPool[] = $request;
+		return $this;
+	}
 
-    /**
-     * @return array(Response)
-     */
-    public function execute()
-    {
-        $sleepTime = 1000;//microsecond, prevent  CPU 100%
-        do {
-            curl_multi_exec(self::$multiHandler, $active);
-            // bug in PHP 5.3.18+ where curl_multi_select can return -1
-            // https://bugs.php.net/bug.php?id=63411
-            if (curl_multi_select(self::$multiHandler) == -1) {
-                usleep($sleepTime);
-            }
-            usleep($sleepTime);
-        } while ($active);
-        $return = array();
-        foreach (self::$requestPool as $request) {
-            $return[] = $request->send(true);
-            curl_multi_remove_handle(self::$multiHandler, $request->curlHandle);
-            curl_close($request->curlHandle);
-        }
-        curl_multi_close(self::$multiHandler);
-        self::$requestPool = null;
-        return $return;
-    }
+	/**
+	 * @return array(Response)
+	 */
+	public function execute()
+	{
+		$sleepTime = 1000;//microsecond, prevent  CPU 100%
+		do {
+			curl_multi_exec(self::$multiHandler, $active);
+			// bug in PHP 5.3.18+ where curl_multi_select can return -1
+			// https://bugs.php.net/bug.php?id=63411
+			if (curl_multi_select(self::$multiHandler) == -1) {
+				usleep($sleepTime);
+			}
+			usleep($sleepTime);
+		} while ($active);
+		$return = array();
+		foreach (self::$requestPool as $request) {
+			$return[] = $request->send(true);
+			curl_multi_remove_handle(self::$multiHandler, $request->curlHandle);
+			curl_close($request->curlHandle);
+		}
+		curl_multi_close(self::$multiHandler);
+		self::$requestPool = null;
+		return $return;
+	}
 
 }

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
      * @param array $options
      * @return $this
      */
-    public function setDefaults(array $options = array()){
+    public function setDefaults(array $options = array()) {
         $this->defaultOptions = $options;
         return $this;
     }
@@ -68,7 +68,7 @@ 
                 'method' => $method,
                 'url' => $uri,
                 'data' => $payload,
-            ) + $options;
+            )+$options;
         $this->addOptions(array($options));
         return $this;
     }
@@ -81,7 +81,7 @@ 
     public function addOptions(array $URLOptions)
     {
         foreach ($URLOptions as $options) {
-            $options = $options + $this->defaultOptions;
+            $options = $options+$this->defaultOptions;
             $request = Request::create()->addOptions($options)->applyOptions();
             if (isset($options['callback'])) {
                 $request->onEnd($options['callback']);
@@ -110,7 +110,7 @@ 
      */
     public function execute()
     {
-        $sleepTime = 1000;//microsecond, prevent  CPU 100%
+        $sleepTime = 1000; //microsecond, prevent  CPU 100%
         do {
             curl_multi_exec(self::$multiHandler, $active);
             // bug in PHP 5.3.18+ where curl_multi_select can return -1
@@ -119,7 +119,7 @@ 
                 usleep($sleepTime);
             }
             usleep($sleepTime);
-        } while ($active);
+        }while ($active);
         $return = array();
         foreach (self::$requestPool as $request) {
             $return[] = $request->send(true);

src/Mime.php

Indentation +46 added lines, -46 removed lines

@@ -9,53 +9,53 @@
  */
 class Mime
 {
-    const JSON = 'application/json';
-    const XML = 'application/xml';
-    const XHTML = 'application/html+xml';
-    const FORM = 'application/x-www-form-urlencoded';
-    const UPLOAD = 'multipart/form-data';
-    const PLAIN = 'text/plain';
-    const JS = 'text/javascript';
-    const HTML = 'text/html';
-    const YAML = 'application/x-yaml';
-    const CSV = 'text/csv';
+	const JSON = 'application/json';
+	const XML = 'application/xml';
+	const XHTML = 'application/html+xml';
+	const FORM = 'application/x-www-form-urlencoded';
+	const UPLOAD = 'multipart/form-data';
+	const PLAIN = 'text/plain';
+	const JS = 'text/javascript';
+	const HTML = 'text/html';
+	const YAML = 'application/x-yaml';
+	const CSV = 'text/csv';
 
-    /**
-     * Map short name for a mime type
-     * to a full proper mime type
-     */
-    public static $mimes = array(
-        'json' => self::JSON,
-        'xml' => self::XML,
-        'form' => self::FORM,
-        'plain' => self::PLAIN,
-        'text' => self::PLAIN,
-        'upload' => self::UPLOAD,
-        'html' => self::HTML,
-        'xhtml' => self::XHTML,
-        'js' => self::JS,
-        'javascript' => self::JS,
-        'yaml' => self::YAML,
-        'csv' => self::CSV,
-    );
+	/**
+	 * Map short name for a mime type
+	 * to a full proper mime type
+	 */
+	public static $mimes = array(
+		'json' => self::JSON,
+		'xml' => self::XML,
+		'form' => self::FORM,
+		'plain' => self::PLAIN,
+		'text' => self::PLAIN,
+		'upload' => self::UPLOAD,
+		'html' => self::HTML,
+		'xhtml' => self::XHTML,
+		'js' => self::JS,
+		'javascript' => self::JS,
+		'yaml' => self::YAML,
+		'csv' => self::CSV,
+	);
 
-    /**
-     * Get the full Mime Type name from a "short name".
-     * Returns the short if no mapping was found.
-     * @param string $short_name common name for mime type (e.g. json)
-     * @return string full mime type (e.g. application/json)
-     */
-    public static function getFullMime($short_name)
-    {
-        return array_key_exists($short_name, self::$mimes) ? self::$mimes[$short_name] : $short_name;
-    }
+	/**
+	 * Get the full Mime Type name from a "short name".
+	 * Returns the short if no mapping was found.
+	 * @param string $short_name common name for mime type (e.g. json)
+	 * @return string full mime type (e.g. application/json)
+	 */
+	public static function getFullMime($short_name)
+	{
+		return array_key_exists($short_name, self::$mimes) ? self::$mimes[$short_name] : $short_name;
+	}
 
-    /**
-     * @param string $short_name
-     * @return bool
-     */
-    public static function supportsMimeType($short_name)
-    {
-        return array_key_exists($short_name, self::$mimes);
-    }
+	/**
+	 * @param string $short_name
+	 * @return bool
+	 */
+	public static function supportsMimeType($short_name)
+	{
+		return array_key_exists($short_name, self::$mimes);
+	}
 }

src/Http.php

Indentation +69 added lines, -69 removed lines

@@ -17,82 +17,82 @@
  */
 abstract class Http
 {
-    const HEAD = 'HEAD';
-    const GET = 'GET';
-    const POST = 'POST';
-    const PUT = 'PUT';
-    const DELETE = 'DELETE';
-    const PATCH = 'PATCH';
-    const OPTIONS = 'OPTIONS';
-    const TRACE = 'TRACE';
-    public static $methods = array(
-        'HEAD' => self::HEAD,
-        'GET' => self::GET,
-        'POST' => self::POST,
-        'PUT' => self::PUT,
-        'DELETE' => self::DELETE,
-        'PATCH' => self::PATCH,
-        'OPTIONS' => self::OPTIONS,
-        'TRACE' => self::TRACE,
-    );
+	const HEAD = 'HEAD';
+	const GET = 'GET';
+	const POST = 'POST';
+	const PUT = 'PUT';
+	const DELETE = 'DELETE';
+	const PATCH = 'PATCH';
+	const OPTIONS = 'OPTIONS';
+	const TRACE = 'TRACE';
+	public static $methods = array(
+		'HEAD' => self::HEAD,
+		'GET' => self::GET,
+		'POST' => self::POST,
+		'PUT' => self::PUT,
+		'DELETE' => self::DELETE,
+		'PATCH' => self::PATCH,
+		'OPTIONS' => self::OPTIONS,
+		'TRACE' => self::TRACE,
+	);
 
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return mixed
-     */
-    abstract function post($uri, $payload = null, array $options = array());
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function post($uri, $payload = null, array $options = array());
 
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return mixed
-     */
-    abstract function patch($uri, $payload = null, array $options = array());
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function patch($uri, $payload = null, array $options = array());
 
-    /**
-     * @param $uri
-     * @param null $payload
-     * @param array $options
-     * @return mixed
-     */
-    abstract function put($uri, $payload = null, array $options = array());
+	/**
+	 * @param $uri
+	 * @param null $payload
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function put($uri, $payload = null, array $options = array());
 
-    /**
-     * @param $uri
-     * @param array $options
-     * @return mixed
-     */
-    abstract function get($uri, array $options = array());
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function get($uri, array $options = array());
 
-    /**
-     * @param $uri
-     * @param array $options
-     * @return mixed
-     */
-    abstract function head($uri, array $options = array());
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function head($uri, array $options = array());
 
-    /**
-     * @param $uri
-     * @param array $options
-     * @return mixed
-     */
-    abstract function delete($uri, array $options = array());
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function delete($uri, array $options = array());
 
-    /**
-     * @param $uri
-     * @param array $options
-     * @return mixed
-     */
-    abstract function options($uri, array $options = array());
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function options($uri, array $options = array());
 
-    /**
-     * @param $uri
-     * @param array $options
-     * @return mixed
-     */
-    abstract function trace($uri, array $options = array());
+	/**
+	 * @param $uri
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract function trace($uri, array $options = array());
 
 }
\ No newline at end of file

src/JsonTrait.php

Indentation +61 added lines, -61 removed lines

@@ -19,70 +19,70 @@
  */
 trait JsonTrait
 {
-    /**
-     * @return Request
-     */
-    public function expectsJson()
-    {
-        return $this->expectsMime('json');
-    }
+	/**
+	 * @return Request
+	 */
+	public function expectsJson()
+	{
+		return $this->expectsMime('json');
+	}
 
-    /**
-     * @return Request
-     */
-    public function sendJson()
-    {
-        return $this->sendMime('json');
-    }
+	/**
+	 * @return Request
+	 */
+	public function sendJson()
+	{
+		return $this->sendMime('json');
+	}
 
-    /**
-     * @param $body
-     * @return string
-     */
-    public function json($body)
-    {
-        return json_encode($body, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * @param $body
+	 * @return string
+	 */
+	public function json($body)
+	{
+		return json_encode($body, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+	}
 
-    /**
-     * @param $body
-     * @return mixed
-     */
-    public function unJson($body)
-    {
-        $parsed = json_decode($body, true);
-        if(json_last_error() !== JSON_ERROR_NONE)throw new UnexpectedResponseException('parsing json occurs error: '.  self::jsonLastErrorMsg() . ', raw body: ' .$body  );
-        return $parsed;
-    }
+	/**
+	 * @param $body
+	 * @return mixed
+	 */
+	public function unJson($body)
+	{
+		$parsed = json_decode($body, true);
+		if(json_last_error() !== JSON_ERROR_NONE)throw new UnexpectedResponseException('parsing json occurs error: '.  self::jsonLastErrorMsg() . ', raw body: ' .$body  );
+		return $parsed;
+	}
 
-    /**
-     * @return string
-     */
-    private static function jsonLastErrorMsg(){
-        if(function_exists('json_last_error_msg')) return json_last_error_msg();
-        switch (json_last_error()) {
-            case JSON_ERROR_NONE:
-                return ' - No errors';
-                break;
-            case JSON_ERROR_DEPTH:
-                return ' - Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                return ' - Underflow or the modes mismatch';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                return ' - Unexpected control character found';
-                break;
-            case JSON_ERROR_SYNTAX:
-                return ' - Syntax error, malformed JSON';
-                break;
-            case JSON_ERROR_UTF8:
-                return ' - Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            default:
-                return ' - Unknown error';
-                break;
-        }
-    }
+	/**
+	 * @return string
+	 */
+	private static function jsonLastErrorMsg(){
+		if(function_exists('json_last_error_msg')) return json_last_error_msg();
+		switch (json_last_error()) {
+			case JSON_ERROR_NONE:
+				return ' - No errors';
+				break;
+			case JSON_ERROR_DEPTH:
+				return ' - Maximum stack depth exceeded';
+				break;
+			case JSON_ERROR_STATE_MISMATCH:
+				return ' - Underflow or the modes mismatch';
+				break;
+			case JSON_ERROR_CTRL_CHAR:
+				return ' - Unexpected control character found';
+				break;
+			case JSON_ERROR_SYNTAX:
+				return ' - Syntax error, malformed JSON';
+				break;
+			case JSON_ERROR_UTF8:
+				return ' - Malformed UTF-8 characters, possibly incorrectly encoded';
+				break;
+			default:
+				return ' - Unknown error';
+				break;
+		}
+	}
 }
 

Spacing +3 added lines, -3 removed lines

@@ -51,15 +51,15 @@
     public function unJson($body)
     {
         $parsed = json_decode($body, true);
-        if(json_last_error() !== JSON_ERROR_NONE)throw new UnexpectedResponseException('parsing json occurs error: '.  self::jsonLastErrorMsg() . ', raw body: ' .$body  );
+        if (json_last_error() !== JSON_ERROR_NONE)throw new UnexpectedResponseException('parsing json occurs error: '.self::jsonLastErrorMsg().', raw body: '.$body);
         return $parsed;
     }
 
     /**
      * @return string
      */
-    private static function jsonLastErrorMsg(){
-        if(function_exists('json_last_error_msg')) return json_last_error_msg();
+    private static function jsonLastErrorMsg() {
+        if (function_exists('json_last_error_msg')) return json_last_error_msg();
         switch (json_last_error()) {
             case JSON_ERROR_NONE:
                 return ' - No errors';

Braces +6 added lines, -2 removed lines

@@ -51,7 +51,9 @@ 
     public function unJson($body)
     {
         $parsed = json_decode($body, true);
-        if(json_last_error() !== JSON_ERROR_NONE)throw new UnexpectedResponseException('parsing json occurs error: '.  self::jsonLastErrorMsg() . ', raw body: ' .$body  );
+        if(json_last_error() !== JSON_ERROR_NONE) {
+        	throw new UnexpectedResponseException('parsing json occurs error: '.  self::jsonLastErrorMsg() . ', raw body: ' .$body  );
+        }
         return $parsed;
     }
 
@@ -59,7 +61,9 @@ 
      * @return string
      */
     private static function jsonLastErrorMsg(){
-        if(function_exists('json_last_error_msg')) return json_last_error_msg();
+        if(function_exists('json_last_error_msg')) {
+        	return json_last_error_msg();
+        }
         switch (json_last_error()) {
             case JSON_ERROR_NONE:
                 return ' - No errors';

src/Response.php

Indentation +89 added lines, -89 removed lines

@@ -21,103 +21,103 @@
  */
 class Response
 {
-    public
-        $code,
-        $errorCode,
-        $error,
-        $header,
-        $body,
-        /**
-         * @var Request
-         */
-        $request,
-        $contentType,
-        $charset,
-        $duration,
-        $info;
+	public
+		$code,
+		$errorCode,
+		$error,
+		$header,
+		$body,
+		/**
+		 * @var Request
+		 */
+		$request,
+		$contentType,
+		$charset,
+		$duration,
+		$info;
 
-    /**
-     * Response constructor.
-     */
-    protected function __construct()
-    {
-    }
+	/**
+	 * Response constructor.
+	 */
+	protected function __construct()
+	{
+	}
 
-    /**
-     * @param Request $request
-     * @param $body
-     * @param $info
-     * @param $errorCode
-     * @param $error
-     * @return Response
-     */
-    public static function create(Request $request, $body, $info, $errorCode, $error)
-    {
-        $self = new self;
-        $self->request = $request;
-        $self->body = $body;
-        $self->info = $info;
-        $self->errorCode = $errorCode;
-        $self->error = $error;
-        return $self;
-    }
+	/**
+	 * @param Request $request
+	 * @param $body
+	 * @param $info
+	 * @param $errorCode
+	 * @param $error
+	 * @return Response
+	 */
+	public static function create(Request $request, $body, $info, $errorCode, $error)
+	{
+		$self = new self;
+		$self->request = $request;
+		$self->body = $body;
+		$self->info = $info;
+		$self->errorCode = $errorCode;
+		$self->error = $error;
+		return $self;
+	}
 
 
 
-    public function parse()
-    {
-        //has header
-        $headers = rtrim(substr($this->body, 0, $this->info['header_size']));
-        $this->body = substr($this->body, $this->info['header_size']);
-        $headers = explode(PHP_EOL, $headers);
-        array_shift($headers); // HTTP HEADER
-        foreach ($headers as $h) {
-            if (false !== strpos($h, ':'))
-                list($k, $v) = explode(':', $h, 2);
-            else
-                list($k, $v) = array($h, '');
+	public function parse()
+	{
+		//has header
+		$headers = rtrim(substr($this->body, 0, $this->info['header_size']));
+		$this->body = substr($this->body, $this->info['header_size']);
+		$headers = explode(PHP_EOL, $headers);
+		array_shift($headers); // HTTP HEADER
+		foreach ($headers as $h) {
+			if (false !== strpos($h, ':'))
+				list($k, $v) = explode(':', $h, 2);
+			else
+				list($k, $v) = array($h, '');
 
-            $this->header[trim($k)] = trim($v);
-        }
+			$this->header[trim($k)] = trim($v);
+		}
 
-        $this->code = $this->info['http_code'];
-        $this->duration = $this->info['total_time'];
-        $this->contentType = $this->info['content_type'];
-        $content_type = isset($this->info['content_type']) ? $this->info['content_type'] : '';
-        $content_type = explode(';', $content_type);
-        $this->contentType = $content_type[0];
-        if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) {
-            list(, $this->charset) = explode('=', $content_type[1]);
-        }
+		$this->code = $this->info['http_code'];
+		$this->duration = $this->info['total_time'];
+		$this->contentType = $this->info['content_type'];
+		$content_type = isset($this->info['content_type']) ? $this->info['content_type'] : '';
+		$content_type = explode(';', $content_type);
+		$this->contentType = $content_type[0];
+		if (count($content_type) == 2 && strpos($content_type[1], '=') !== false) {
+			list(, $this->charset) = explode('=', $content_type[1]);
+		}
 
-        $this->unserializeBody();
+		$this->unserializeBody();
 
-    }
-    public function unserializeBody()
-    {
-        if (isset($this->request->expectedMime)) {
-            if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectedMime));
-            $method = 'un'.ucfirst($this->request->expectedMime);
-            if (!method_exists($this->request, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
-            $this->body = $this->request->{$method}($this->body);
-        }
-    }
-    /**
-     * Status Code Definitions
-     *
-     * Informational 1xx
-     * Successful    2xx
-     * Redirection   3xx
-     * Client Error  4xx
-     * Server Error  5xx
-     *
-     * http://pretty-rfc.herokuapp.com/RFC2616#status.codes
-     *
-     * @return bool Did we receive a 4xx or 5xx?
-     */
-    public function hasErrors()
-    {
-        return $this->code == 0 || $this->code >= 400;
-    }
+	}
+	public function unserializeBody()
+	{
+		if (isset($this->request->expectedMime)) {
+			if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectedMime));
+			$method = 'un'.ucfirst($this->request->expectedMime);
+			if (!method_exists($this->request, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+			$this->body = $this->request->{$method}($this->body);
+		}
+	}
+	/**
+	 * Status Code Definitions
+	 *
+	 * Informational 1xx
+	 * Successful    2xx
+	 * Redirection   3xx
+	 * Client Error  4xx
+	 * Server Error  5xx
+	 *
+	 * http://pretty-rfc.herokuapp.com/RFC2616#status.codes
+	 *
+	 * @return bool Did we receive a 4xx or 5xx?
+	 */
+	public function hasErrors()
+	{
+		return $this->code == 0 || $this->code >= 400;
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -96,9 +96,9 @@
     public function unserializeBody()
     {
         if (isset($this->request->expectedMime)) {
-            if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectedMime));
+            if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'.$this->contentType.', expected mime:'.Mime::getFullMime($this->request->expectedMime));
             $method = 'un'.ucfirst($this->request->expectedMime);
-            if (!method_exists($this->request, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+            if (!method_exists($this->request, $method)) throw new InvalidOperationException($method.' is not exists in '.__CLASS__);
             $this->body = $this->request->{$method}($this->body);
         }
     }

Braces +11 added lines, -6 removed lines

@@ -72,10 +72,11 @@ 
         $headers = explode(PHP_EOL, $headers);
         array_shift($headers); // HTTP HEADER
         foreach ($headers as $h) {
-            if (false !== strpos($h, ':'))
-                list($k, $v) = explode(':', $h, 2);
-            else
-                list($k, $v) = array($h, '');
+            if (false !== strpos($h, ':')) {
+                            list($k, $v) = explode(':', $h, 2);
+            } else {
+                            list($k, $v) = array($h, '');
+            }
 
             $this->header[trim($k)] = trim($v);
         }
@@ -96,9 +97,13 @@ 
     public function unserializeBody()
     {
         if (isset($this->request->expectedMime)) {
-            if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectedMime));
+            if (Mime::getFullMime($this->request->expectedMime) !== $this->contentType) {
+            	throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectedMime));
+            }
             $method = 'un'.ucfirst($this->request->expectedMime);
-            if (!method_exists($this->request, $method)) throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+            if (!method_exists($this->request, $method)) {
+            	throw new InvalidOperationException($method . ' is not exists in ' . __CLASS__);
+            }
             $this->body = $this->request->{$method}($this->body);
         }
     }