sinacms / MultiHttp

src/Request.php

Doc Comments +2 added lines, -2 removed lines

@@ -187,7 +187,7 @@ 
         return $this;
     }
     /**
-     * @param $field alias or field name
+     * @param string $field alias or field name
      * @return bool|mixed
      */
     public function getIni($field)
@@ -198,7 +198,7 @@ 
 
     /**
      * @param $key
-     * @return mixed
+     * @return string
      */
     protected static function optionAlias($key)
     {

Indentation +398 added lines, -398 removed lines

@@ -15,402 +15,402 @@
 
 class Request extends Http
 {
-    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 ,
-    );
-    protected static $logger;
-    public $curlHandle;
-    public
-        $uri,
-        $timeout,
-        $maxRedirects,
-        $followRedirects;
-    public $cert;
-    public $key;
-    public $passphrase;
-    public $encoding;
-    public $payload;
-    protected $options = array(
-        'CURLOPT_MAXREDIRS' => 10,
-        'header' => true,
-        'method' => self::GET,
-        'transfer' => true,
-        'follow_location' => true,
-        'timeout' => 0);
-    protected $endCallback;
-    protected $withURIQuery;
-    protected $hasInitialized = false;
-
-    protected function __construct()
-    {
-
-    }
-
-    public static function create()
-    {
-        return new self;
-    }
-
-    public static function setLogger($logger)
-    {
-        self::$logger = $logger;
-    }
-
-    /**
-     * Specify   timeout
-     * @param float|int $timeout seconds to timeout the HTTP call
-     * @return Request
-     */
-    public function timeout($timeout)
-    {
-        $this->timeout = $timeout;
-        return $this;
-    }
-
-    public function noFollow()
-    {
-        return $this->follow(0);
-    }
-
-    /**
-     * If the response is a 301 or 302 redirect, automatically
-     * send off another request to that location
-     * @param int $follow follow or not to follow or maximal number of redirects
-     * @return Request
-     */
-    public function follow(int $follow = self::MAX_REDIRECTS_DEFAULT)
-    {
-        $this->maxRedirects = abs($follow);
-        $this->followRedirects = $follow > 0;
-        return $this;
-    }
-
-    public function endCallback()
-    {
-        return $this->endCallback;
-    }
-
-    public function hasEndCallback()
-    {
-        return isset($this->endCallback);
-    }
-
-    public function uri($uri)
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    public function hasCert()
-    {
-        return isset($this->cert) && isset($this->key);
-    }
-
-    /**
-     * Use Client Side Cert Authentication
-     * @param string $key file path to client key
-     * @param string $cert file path to client cert
-     * @param string $passphrase for client key
-     * @param string $encoding default PEM
-     * @return Request
-     */
-    public function cert($cert, $key, $passphrase = null, $encoding = 'PEM')
-    {
-        $this->cert = $cert;
-        $this->key = $key;
-        $this->passphrase = $passphrase;
-        $this->encoding = $encoding;
-        return $this;
-    }
-
-    public function body($payload, $mimeType = null)
-    {
-        $this->mime($mimeType);
-        $this->payload = $payload;
-        // Iserntentially don't call _serializePayload yet.  Wait until
-        // we actually send off the request to convert payload to string.
-        // At that time, the `serialized_payload` is set accordingly.
-        return $this;
-    }
-    public function mime($mime)
-    {
-        if (empty($mime)) return $this;
-        $this->content_type = $this->expected_type = Mime::getFullMime($mime);
-        if ($this->isUpload()) {
-            $this->neverSerializePayload();
-        }
-        return $this;
-    }
-    public function addHeader($header_name, $value)
-    {
-        $this->headers[$header_name] = $value;
-        return $this;
-    }
-
-    public function addHeaders(array $headers)
-    {
-        foreach ($headers as $header => $value) {
-            $this->addHeader($header, $value);
-        }
-        return $this;
-    }
-    public function expectsType($mime)
-    {
-        return $this->expects($mime);
-    }
-    public function sendType($mime)
-    {
-        return $this->contentType = $mime;
-    }
-    public function expects($mime)
-    {
-        if (empty($mime)) return $this;
-        $this->expected_type = Mime::getFullMime($mime);
-        return $this;
-    }
-    /**
-     * @param $field alias or field name
-     * @return bool|mixed
-     */
-    public function getIni($field)
-    {
-        $alias = self::optionAlias($field);
-        return isset($this->options[$alias]) ? $this->options[$alias] : false;
-    }
-
-    /**
-     * @param $key
-     * @return mixed
-     */
-    protected static function optionAlias($key)
-    {
-        $alias = false;
-        if (isset(self::$curlAlias[$key])) {
-            $alias = self::$curlAlias[$key];
-        } elseif ((substr($key, 0, strlen('CURLOPT_')) == 'CURLOPT_') && defined($key)) {
-            $alias = $key;
-        }
-        return $alias;
-    }
-
-    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;
-    }
-
-    public function post($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::POST, $uri, $payload, $options);
-    }
-
-    /*  no body  */
-
-    protected function ini($method, $url,  $data , array $options = array())
-    {
-        $options = array('url' => $url, 'method' => $method, 'data' => $data) + $options;
-        $this->addOptions($options);
-
-        return $this;
-    }
-
-    public function addOptions(array $options = array())
-    {
-        $this->options = $options + $this->options;
-        $this->uri = $this->options['url'];
-        return $this;
-    }
-
-    function put($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::PUT, $uri, $payload, $options);
-    }
-
-    function patch($uri, $payload = null, array $options = array())
-    {
-        return $this->ini(Http::PATCH, $uri, $payload, $options);
-    }
-
-    public function get($uri, array $options = array())
-    {
-        return $this->ini(Http::GET, $uri, array(), $options);
-    }
-
-    function options($uri, array $options = array())
-    {
-        return $this->ini(Http::OPTIONS, $uri, array(), $options);
-    }
-
-    function head($uri, array $options = array())
-    {
-        return $this->ini(Http::HEAD, $uri, array('CURLOPT_NOBODY' => true), $options);
-    }
-
-    function delete($uri, array $options = array())
-    {
-        return $this->ini(Http::DELETE, $uri, array(), $options);
-    }
-
-    function trace($uri, array $options = array())
-    {
-        return $this->ini(Http::TRACE, $uri, array(), $options);
-    }
-
-    /**
-     * @return Response
-     */
-    public function send()
-    {
-        if (!$this->hasInitialized)
-            $this->applyOptions();
-        $response = $this->makeResponse();
-        if ($this->endCallback) {
-            $func = $this->endCallback;
-            $func($response);
-        }
-        return $response;
-    }
-
-    public function applyOptions()
-    {
-        $curl = curl_init();
-        $this->curlHandle = $curl;
-        $this->prepare();
-        $this->hasInitialized = true;
-        return $this;
-    }
-
-    protected function prepare()
-    {
-        if (empty($this->options['url'])) {
-            throw new InvalidArgumentException('url can not empty');
-        }
-
-        if (isset($this->options['data'])) {
-            $this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility
-        }
-        if (isset($this->withURIQuery)) {
-            $this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&';
-            $this->options['url'] .= $this->withURIQuery;
-        }
-        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']);
-            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 onEnd(callable $callback)
-    {
-        if (!is_callable($callback)) {
-            throw new InvalidArgumentException('callback not is callable :' . print_r($callback, 1));
-        }
-
-        $this->endCallback = $callback;
-        return $this;
-    }
-
-    protected static function filterAndRaw(array &$options)
-    {
-        $opts = array();
-        foreach ($options as $key => $val) {
-            $alias = self::optionAlias($key);
-            $options[$alias] = $val;
-            if ($alias) {
-                $opts[constant($alias)] = $val;
-            }
-            unset($options[$key]);
-        }
-        return $opts;
-    }
-
-    public function makeResponse($isMultiCurl = false)
-    {
-        $body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle);
-        $info = curl_getinfo($this->curlHandle);
-        $errno = curl_errno($this->curlHandle);
-        $error = curl_error($this->curlHandle);
-        $response = Response::create($this, $body, $info, $errno, $error);
-        if (!is_null(self::$logger)) {
-            self::log($response);
-        }
-
-        return $response;
-    }
-
-    private static function log(Response $response)
-    {
-        if ($response->hasErrors()) {
-            self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
-                'response' => print_r($response, 1),
-            ));
-        }
-
-    }
+	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 ,
+	);
+	protected static $logger;
+	public $curlHandle;
+	public
+		$uri,
+		$timeout,
+		$maxRedirects,
+		$followRedirects;
+	public $cert;
+	public $key;
+	public $passphrase;
+	public $encoding;
+	public $payload;
+	protected $options = array(
+		'CURLOPT_MAXREDIRS' => 10,
+		'header' => true,
+		'method' => self::GET,
+		'transfer' => true,
+		'follow_location' => true,
+		'timeout' => 0);
+	protected $endCallback;
+	protected $withURIQuery;
+	protected $hasInitialized = false;
+
+	protected function __construct()
+	{
+
+	}
+
+	public static function create()
+	{
+		return new self;
+	}
+
+	public static function setLogger($logger)
+	{
+		self::$logger = $logger;
+	}
+
+	/**
+	 * Specify   timeout
+	 * @param float|int $timeout seconds to timeout the HTTP call
+	 * @return Request
+	 */
+	public function timeout($timeout)
+	{
+		$this->timeout = $timeout;
+		return $this;
+	}
+
+	public function noFollow()
+	{
+		return $this->follow(0);
+	}
+
+	/**
+	 * If the response is a 301 or 302 redirect, automatically
+	 * send off another request to that location
+	 * @param int $follow follow or not to follow or maximal number of redirects
+	 * @return Request
+	 */
+	public function follow(int $follow = self::MAX_REDIRECTS_DEFAULT)
+	{
+		$this->maxRedirects = abs($follow);
+		$this->followRedirects = $follow > 0;
+		return $this;
+	}
+
+	public function endCallback()
+	{
+		return $this->endCallback;
+	}
+
+	public function hasEndCallback()
+	{
+		return isset($this->endCallback);
+	}
+
+	public function uri($uri)
+	{
+		$this->uri = $uri;
+		return $this;
+	}
+
+	public function hasCert()
+	{
+		return isset($this->cert) && isset($this->key);
+	}
+
+	/**
+	 * Use Client Side Cert Authentication
+	 * @param string $key file path to client key
+	 * @param string $cert file path to client cert
+	 * @param string $passphrase for client key
+	 * @param string $encoding default PEM
+	 * @return Request
+	 */
+	public function cert($cert, $key, $passphrase = null, $encoding = 'PEM')
+	{
+		$this->cert = $cert;
+		$this->key = $key;
+		$this->passphrase = $passphrase;
+		$this->encoding = $encoding;
+		return $this;
+	}
+
+	public function body($payload, $mimeType = null)
+	{
+		$this->mime($mimeType);
+		$this->payload = $payload;
+		// Iserntentially don't call _serializePayload yet.  Wait until
+		// we actually send off the request to convert payload to string.
+		// At that time, the `serialized_payload` is set accordingly.
+		return $this;
+	}
+	public function mime($mime)
+	{
+		if (empty($mime)) return $this;
+		$this->content_type = $this->expected_type = Mime::getFullMime($mime);
+		if ($this->isUpload()) {
+			$this->neverSerializePayload();
+		}
+		return $this;
+	}
+	public function addHeader($header_name, $value)
+	{
+		$this->headers[$header_name] = $value;
+		return $this;
+	}
+
+	public function addHeaders(array $headers)
+	{
+		foreach ($headers as $header => $value) {
+			$this->addHeader($header, $value);
+		}
+		return $this;
+	}
+	public function expectsType($mime)
+	{
+		return $this->expects($mime);
+	}
+	public function sendType($mime)
+	{
+		return $this->contentType = $mime;
+	}
+	public function expects($mime)
+	{
+		if (empty($mime)) return $this;
+		$this->expected_type = Mime::getFullMime($mime);
+		return $this;
+	}
+	/**
+	 * @param $field alias or field name
+	 * @return bool|mixed
+	 */
+	public function getIni($field)
+	{
+		$alias = self::optionAlias($field);
+		return isset($this->options[$alias]) ? $this->options[$alias] : false;
+	}
+
+	/**
+	 * @param $key
+	 * @return mixed
+	 */
+	protected static function optionAlias($key)
+	{
+		$alias = false;
+		if (isset(self::$curlAlias[$key])) {
+			$alias = self::$curlAlias[$key];
+		} elseif ((substr($key, 0, strlen('CURLOPT_')) == 'CURLOPT_') && defined($key)) {
+			$alias = $key;
+		}
+		return $alias;
+	}
+
+	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;
+	}
+
+	public function post($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::POST, $uri, $payload, $options);
+	}
+
+	/*  no body  */
+
+	protected function ini($method, $url,  $data , array $options = array())
+	{
+		$options = array('url' => $url, 'method' => $method, 'data' => $data) + $options;
+		$this->addOptions($options);
+
+		return $this;
+	}
+
+	public function addOptions(array $options = array())
+	{
+		$this->options = $options + $this->options;
+		$this->uri = $this->options['url'];
+		return $this;
+	}
+
+	function put($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::PUT, $uri, $payload, $options);
+	}
+
+	function patch($uri, $payload = null, array $options = array())
+	{
+		return $this->ini(Http::PATCH, $uri, $payload, $options);
+	}
+
+	public function get($uri, array $options = array())
+	{
+		return $this->ini(Http::GET, $uri, array(), $options);
+	}
+
+	function options($uri, array $options = array())
+	{
+		return $this->ini(Http::OPTIONS, $uri, array(), $options);
+	}
+
+	function head($uri, array $options = array())
+	{
+		return $this->ini(Http::HEAD, $uri, array('CURLOPT_NOBODY' => true), $options);
+	}
+
+	function delete($uri, array $options = array())
+	{
+		return $this->ini(Http::DELETE, $uri, array(), $options);
+	}
+
+	function trace($uri, array $options = array())
+	{
+		return $this->ini(Http::TRACE, $uri, array(), $options);
+	}
+
+	/**
+	 * @return Response
+	 */
+	public function send()
+	{
+		if (!$this->hasInitialized)
+			$this->applyOptions();
+		$response = $this->makeResponse();
+		if ($this->endCallback) {
+			$func = $this->endCallback;
+			$func($response);
+		}
+		return $response;
+	}
+
+	public function applyOptions()
+	{
+		$curl = curl_init();
+		$this->curlHandle = $curl;
+		$this->prepare();
+		$this->hasInitialized = true;
+		return $this;
+	}
+
+	protected function prepare()
+	{
+		if (empty($this->options['url'])) {
+			throw new InvalidArgumentException('url can not empty');
+		}
+
+		if (isset($this->options['data'])) {
+			$this->options['data'] = is_array($this->options['data']) ? http_build_query($this->options['data']) : $this->options['data'];//for better compatibility
+		}
+		if (isset($this->withURIQuery)) {
+			$this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&';
+			$this->options['url'] .= $this->withURIQuery;
+		}
+		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']);
+			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 onEnd(callable $callback)
+	{
+		if (!is_callable($callback)) {
+			throw new InvalidArgumentException('callback not is callable :' . print_r($callback, 1));
+		}
+
+		$this->endCallback = $callback;
+		return $this;
+	}
+
+	protected static function filterAndRaw(array &$options)
+	{
+		$opts = array();
+		foreach ($options as $key => $val) {
+			$alias = self::optionAlias($key);
+			$options[$alias] = $val;
+			if ($alias) {
+				$opts[constant($alias)] = $val;
+			}
+			unset($options[$key]);
+		}
+		return $opts;
+	}
+
+	public function makeResponse($isMultiCurl = false)
+	{
+		$body = $isMultiCurl ? curl_multi_getcontent($this->curlHandle) : curl_exec($this->curlHandle);
+		$info = curl_getinfo($this->curlHandle);
+		$errno = curl_errno($this->curlHandle);
+		$error = curl_error($this->curlHandle);
+		$response = Response::create($this, $body, $info, $errno, $error);
+		if (!is_null(self::$logger)) {
+			self::log($response);
+		}
+
+		return $response;
+	}
+
+	private static function log(Response $response)
+	{
+		if ($response->hasErrors()) {
+			self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
+				'response' => print_r($response, 1),
+			));
+		}
+
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,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',
@@ -232,9 +232,9 @@ 
 
     /*  no body  */
 
-    protected function ini($method, $url,  $data , array $options = array())
+    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;
@@ -242,7 +242,7 @@ 
 
     public function addOptions(array $options = array())
     {
-        $this->options = $options + $this->options;
+        $this->options = $options+$this->options;
         $this->uri = $this->options['url'];
         return $this;
     }
@@ -313,7 +313,7 @@ 
         }
 
         if (isset($this->options['data'])) {
-            $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
         }
         if (isset($this->withURIQuery)) {
             $this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&';
@@ -329,11 +329,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);
         }
@@ -352,7 +352,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']);
             }
@@ -369,7 +369,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;
@@ -407,7 +407,7 @@ 
     private static function log(Response $response)
     {
         if ($response->hasErrors()) {
-            self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
+            self::$logger->error($response->request->getURI()."\t".$response->error, array(
                 'response' => print_r($response, 1),
             ));
         }

Braces +9 added lines, -4 removed lines

@@ -152,7 +152,9 @@ 
     }
     public function mime($mime)
     {
-        if (empty($mime)) return $this;
+        if (empty($mime)) {
+        	return $this;
+        }
         $this->content_type = $this->expected_type = Mime::getFullMime($mime);
         if ($this->isUpload()) {
             $this->neverSerializePayload();
@@ -182,7 +184,9 @@ 
     }
     public function expects($mime)
     {
-        if (empty($mime)) return $this;
+        if (empty($mime)) {
+        	return $this;
+        }
         $this->expected_type = Mime::getFullMime($mime);
         return $this;
     }
@@ -287,8 +291,9 @@ 
      */
     public function send()
     {
-        if (!$this->hasInitialized)
-            $this->applyOptions();
+        if (!$this->hasInitialized) {
+                    $this->applyOptions();
+        }
         $response = $this->makeResponse();
         if ($this->endCallback) {
             $func = $this->endCallback;

src/Response.php

Indentation +72 added lines, -72 removed lines

@@ -15,81 +15,81 @@
 
 class Response
 {
-    public
-        $code,
-        $errorCode,
-        $error,
-        $header,
-        $body,
-        /**
-         * @var Request
-         */
-        $request,
-        $contentType,
-        $charset,
-        $duration,
-        $info;
-    protected function __construct()
-    {
-    }
+	public
+		$code,
+		$errorCode,
+		$error,
+		$header,
+		$body,
+		/**
+		 * @var Request
+		 */
+		$request,
+		$contentType,
+		$charset,
+		$duration,
+		$info;
+	protected function __construct()
+	{
+	}
 
-    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;
-        $self->parse();
-        $self->check();
-        return $self;
-    }
-    public function check(){
+	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;
+		$self->parse();
+		$self->check();
+		return $self;
+	}
+	public function check(){
 
-    }
-    public function parse(){
-        //has header
-        if($this->request->getIni('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
+		if($this->request->getIni('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->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->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]);
+		}
+	}
 
-    /**
-     * 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;
-    }
+	/**
+	 * 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 +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
     {
     }
 
-    public static function create(Request $request, $body, $info, $errorCode, $error){
+    public static function create(Request $request, $body, $info, $errorCode, $error) {
         $self = new self;
         $self->request = $request;
         $self->body = $body;
@@ -44,21 +44,21 @@ 
         $self->check();
         return $self;
     }
-    public function check(){
+    public function check() {
 
     }
-    public function parse(){
+    public function parse() {
         //has header
-        if($this->request->getIni('header')){
+        if ($this->request->getIni('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, ':'))
+            foreach ($headers as $h) {
+                if (false !== strpos($h, ':'))
                     list($k, $v) = explode(':', $h, 2);
                 else
-                    list($k, $v) = array($h,'');
+                    list($k, $v) = array($h, '');
 
                 $this->header[trim($k)] = trim($v);
             }
@@ -70,7 +70,7 @@ 
         $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]);
+            list(, $this->charset) = explode('=', $content_type[1]);
         }
     }
 

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/RequestTrait.php

Indentation +15 added lines, -15 removed lines

@@ -12,26 +12,26 @@
 namespace MultiHttp;
 
 trait RequestTrait {
-    protected $expectContentType = null;
-    public function expectsJson(){
-        $this->expectContentType = Mime::JSON;
-    }
-    public function expectsXml(){
-        $this->expectContentType = Mime::XML;
-    }
+	protected $expectContentType = null;
+	public function expectsJson(){
+		$this->expectContentType = Mime::JSON;
+	}
+	public function expectsXml(){
+		$this->expectContentType = Mime::XML;
+	}
 
-    protected function json(){
+	protected function json(){
 
-    }
-    protected function unJson(){
+	}
+	protected function unJson(){
 
-    }
+	}
 
-    protected function xml(){
+	protected function xml(){
 
-    }
-    protected function unXml(){
+	}
+	protected function unXml(){
 
-    }
+	}
 }
 

Spacing +6 added lines, -6 removed lines

@@ -13,24 +13,24 @@
 
 trait RequestTrait {
     protected $expectContentType = null;
-    public function expectsJson(){
+    public function expectsJson() {
         $this->expectContentType = Mime::JSON;
     }
-    public function expectsXml(){
+    public function expectsXml() {
         $this->expectContentType = Mime::XML;
     }
 
-    protected function json(){
+    protected function json() {
 
     }
-    protected function unJson(){
+    protected function unJson() {
 
     }
 
-    protected function xml(){
+    protected function xml() {
 
     }
-    protected function unXml(){
+    protected function unXml() {
 
     }
 }