sinacms / MultiHttp

src/Request.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +51 added lines, -51 removed lines

@@ -35,14 +35,14 @@ 
 		'timeout_ms'      => 'CURLOPT_TIMEOUT_MS', // milliseconds,  libcurl version > 7.36.0 ,
 	);
 	public $curlHandle;
-    protected $options = array(
-        'CURLOPT_MAXREDIRS' => 10,
-        'header' => true,
-        'method' => self::GET,
-        'transfer' => true,
-        'follow_location' => true,
-        'timeout' => 0);
-    protected $endCallback;
+	protected $options = array(
+		'CURLOPT_MAXREDIRS' => 10,
+		'header' => true,
+		'method' => self::GET,
+		'transfer' => true,
+		'follow_location' => true,
+		'timeout' => 0);
+	protected $endCallback;
 	protected $withURIQuery;
 	protected static $logger;
 	protected $uri;
@@ -113,8 +113,8 @@ 
 
 	public function addOptions(array $options = array()) {
 		$this->options = $options+$this->options;
-        $this->uri = $this->options['url'];
-        return $this;
+		$this->uri = $this->options['url'];
+		return $this;
 	}
 
 	/*  no body  */
@@ -151,7 +151,7 @@ 
 	 * @return Response
 	 */
 	public function send() {
-        $this->applyOptions();
+		$this->applyOptions();
 		$response = $this->makeResponse();
 		if ($this->endCallback) {
 			$func = $this->endCallback;
@@ -168,21 +168,21 @@ 
 	}
 
 	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']);
-        }
+		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();
@@ -219,7 +219,7 @@ 
 
 		$cURLOptions = self::filterAndRaw($this->options);
 
-        curl_setopt_array($this->curlHandle,  $cURLOptions);
+		curl_setopt_array($this->curlHandle,  $cURLOptions);
 
 		return $this;
 	}
@@ -228,11 +228,11 @@ 
 		$opts = array();
 		foreach ($options as $key => $val) {
 			$alias = self::optionAlias($key);
-            $options[$alias] = $val;
-            if ($alias) {$opts[constant($alias)] = $val;
-            }
-            unset($options[$key]);
-        }
+			$options[$alias] = $val;
+			if ($alias) {$opts[constant($alias)] = $val;
+			}
+			unset($options[$key]);
+		}
 		return $opts;
 	}
 
@@ -254,26 +254,26 @@ 
 		$info     = curl_getinfo($this->curlHandle);
 		$errno    = curl_errno($this->curlHandle);
 		$error    = curl_error($this->curlHandle);
-        $response = Response::create($this, $body, $info, $errno, $error);
-        self::log($response);
+		$response = Response::create($this, $body, $info, $errno, $error);
+		self::log($response);
 		return $response;
 	}
 
-    private static function log(Response $response)
-    {
-        if (is_null(self::$logger)) {
-            return;
-        }
-        if($response->hasErrors()){
-            self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
-                'response' => print_r($response,1),
-            ));
-        }
-
-    }
-
-    public static function setLogger($logger)
-    {
-        self::$logger = $logger;
-    }
+	private static function log(Response $response)
+	{
+		if (is_null(self::$logger)) {
+			return;
+		}
+		if($response->hasErrors()){
+			self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
+				'response' => print_r($response,1),
+			));
+		}
+
+	}
+
+	public static function setLogger($logger)
+	{
+		self::$logger = $logger;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,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',
@@ -83,7 +83,7 @@ 
 		$alias = self::optionAlias($field);
 //		if (null === ($rawField = constant($alias))) {throw new InvalidArgumentException('field is invalid');
 //		}
-		return isset($this->options[$alias])?$this->options[$alias]:false;
+		return isset($this->options[$alias]) ? $this->options[$alias] : false;
 	}
 
 
@@ -173,10 +173,10 @@ 
         }
 
         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?'?':'&';
+            $this->options['url'] .= strpos($this->options['url'], '?') === FALSE ? '?' : '&';
             $this->options['url'] .= $this->withURIQuery;
         }
         if (isset($this->options['callback'])) {
@@ -219,7 +219,7 @@ 
 
 		$cURLOptions = self::filterAndRaw($this->options);
 
-        curl_setopt_array($this->curlHandle,  $cURLOptions);
+        curl_setopt_array($this->curlHandle, $cURLOptions);
 
 		return $this;
 	}
@@ -250,7 +250,7 @@ 
 		return $alias;
 	}
 	public function makeResponse($isMultiCurl = false) {
-		$body     = $isMultiCurl?curl_multi_getcontent($this->curlHandle):curl_exec($this->curlHandle);
+		$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);
@@ -264,9 +264,9 @@ 
         if (is_null(self::$logger)) {
             return;
         }
-        if($response->hasErrors()){
-            self::$logger->error($response->request->getURI() . "\t" . $response->error, array(
-                'response' => print_r($response,1),
+        if ($response->hasErrors()) {
+            self::$logger->error($response->request->getURI()."\t".$response->error, array(
+                'response' => print_r($response, 1),
             ));
         }
 

src/Exception/InvalidOperationException.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 
 
 class InvalidOperationException extends \LogicException{
-    protected $code = 2;
+	protected $code = 2;
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 namespace MultiHttp\Exception;
 
 
-class InvalidOperationException extends \LogicException{
+class InvalidOperationException extends \LogicException {
     protected $code = 2;
 }
\ No newline at end of file

src/Exception/UnexpectedResponseException.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 
 
 class UnexpectedResponseException extends \UnexpectedValueException {
-    protected $code = 3;
+	protected $code = 3;
 }
\ No newline at end of file

src/Exception/InvalidArgumentException.php

Indentation +1 added lines, -1 removed lines

@@ -13,5 +13,5 @@
 
 
 class InvalidArgumentException extends \LogicException{
-    protected $code = 1;
+	protected $code = 1;
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -12,6 +12,6 @@
 namespace MultiHttp\Exception;
 
 
-class InvalidArgumentException extends \LogicException{
+class InvalidArgumentException extends \LogicException {
     protected $code = 1;
 }
\ No newline at end of file

src/Response.php

Braces +5 added lines, -4 removed lines

@@ -54,10 +54,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);
             }

Indentation +71 added lines, -71 removed lines

@@ -15,80 +15,80 @@
 
 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(){
-        if($this->body && $this->request->getIni('header')){//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(){
+		if($this->body && $this->request->getIni('header')){//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->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,20 +44,20 @@ 
         $self->check();
         return $self;
     }
-    public function check(){
+    public function check() {
 
     }
-    public function parse(){
-        if($this->body && $this->request->getIni('header')){//has header
+    public function parse() {
+        if ($this->body && $this->request->getIni('header')) {//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, ':'))
+            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);
             }
@@ -69,7 +69,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/MultiRequest.php

Spacing +3 added lines, -3 removed lines

@@ -69,8 +69,8 @@ 
 	 * @return array(Response)
 	 */
 	public function execute() {
-		$sleepTime = 1000;//microsecond, prevent  CPU 100%
-        do{
+		$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
@@ -78,7 +78,7 @@ 
                 usleep($sleepTime);
             }
             usleep($sleepTime);
-        }while($active);
+        }while ($active);
         $return = array();
 		foreach (self::$requestPool as $request) {
 			$response = $request->makeResponse(true);

Indentation +12 added lines, -12 removed lines

@@ -70,25 +70,25 @@
 	 */
 	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
+		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();
+			if (curl_multi_select(self::$multiHandler) == -1) {
+				usleep($sleepTime);
+			}
+			usleep($sleepTime);
+		}while($active);
+		$return = array();
 		foreach (self::$requestPool as $request) {
 			$response = $request->makeResponse(true);
-            $func = $response->request->endCallback();
+			$func = $response->request->endCallback();
 			if (isset($func)) {
 				$func($response);
 			}
 			$return[] = $response;
-            curl_multi_remove_handle(self::$multiHandler, $request->curlHandle);
-            curl_close($request->curlHandle);
+			curl_multi_remove_handle(self::$multiHandler, $request->curlHandle);
+			curl_close($request->curlHandle);
 		}
 		curl_multi_close(self::$multiHandler);
 		self::$requestPool = null;