sinacms / MultiHttp

src/RequestTrait.php

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() {
 
     }
 }

src/JsonTrait.php

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

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);
         }
     }

src/MultiRequest.php

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 sendAll()
     {
-        $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/Helper.php

Spacing +4 added lines, -4 removed lines

@@ -14,11 +14,11 @@
 
 class Helper
 {
-    public static function retry($maxTimes = 2, callable $task, $sleep = 0){
+    public static function retry($maxTimes = 2, callable $task, $sleep = 0) {
         $tryTimes = 0;
-        while(++$tryTimes <= $maxTimes){
-            if($task()) break;
-            else usleep(abs($sleep) * 1000000);
+        while (++$tryTimes <= $maxTimes) {
+            if ($task()) break;
+            else usleep(abs($sleep)*1000000);
         }
         return $tryTimes;
     }

Braces +5 added lines, -2 removed lines

@@ -17,8 +17,11 @@
     public static function retry($maxTimes = 2, callable $task, $sleep = 0){
         $tryTimes = 0;
         while(++$tryTimes <= $maxTimes){
-            if($task()) break;
-            else usleep(abs($sleep) * 1000000);
+            if($task()) {
+            	break;
+            } else {
+            	usleep(abs($sleep) * 1000000);
+            }
         }
         return $tryTimes;
     }

src/Http.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * @param $method
      * @return bool
      */
-    public static function hasBody($method){
+    public static function hasBody($method) {
         return in_array($method, array(self::POST, self::PUT, self::PATCH, self::OPTIONS));
     }
 }
\ No newline at end of file

src/Request.php

Spacing +32 added lines, -32 removed lines

@@ -28,7 +28,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',
@@ -46,8 +46,8 @@ 
         'timeout_ms' => 'CURLOPT_TIMEOUT_MS', // milliseconds,  libcurl version > 7.36.0 ,
         'expects_mime' => null, //expected mime
         'send_mime' => 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;
@@ -77,9 +77,9 @@ 
          */
         $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
 //            'CURLOPT_SAFE_UPLOAD' => false,// compatible with PHP 5.6.0
             'header' => true,
             'method' => self::GET,
@@ -88,8 +88,8 @@ 
             'follow_location' => true,
             'timeout' => 0,
             //        'ip' => null, //host, in string, .e.g: 172.16.1.1:888
-            'retry_times' => 1,//redo task when failed
-            'retry_duration' => 0,//in seconds
+            'retry_times' => 1, //redo task when failed
+            'retry_duration' => 0, //in seconds
         );
 
 
@@ -153,15 +153,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";
     }
 
@@ -193,7 +193,7 @@ 
      */
     public function addHeader($headerName, $value)
     {
-        $this->options['headers'][] = $headerName . ': ' . $value;
+        $this->options['headers'][] = $headerName.': '.$value;
         return $this;
     }
 
@@ -257,7 +257,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;
     }
@@ -328,7 +328,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;
@@ -340,7 +340,7 @@ 
      */
     public function addOptions(array $options = array())
     {
-        $this->options = $options + $this->options;
+        $this->options = $options+$this->options;
         $this->uri = $this->options['url'];
         return $this;
     }
@@ -442,7 +442,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;
         }
@@ -487,11 +487,11 @@ 
             $this->retryDuration = abs($this->options['retry_duration']);
         }
 
-        if(isset($this->options['expects_mime'])){
+        if (isset($this->options['expects_mime'])) {
             $this->expectsMime($this->options['expects_mime']);
         }
 
-        if(isset($this->options['send_mime'])){
+        if (isset($this->options['send_mime'])) {
             $this->sendMime($this->options['send_mime']);
         }
 
@@ -506,11 +506,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);
@@ -524,11 +524,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($host);
         }
         //process version
@@ -546,14 +546,14 @@ 
         //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']);
             }
         }
 
         $cURLOptions = self::filterAndRaw($this->options);
-        if(isset($this->body))$cURLOptions[CURLOPT_POSTFIELDS] = $this->body;//use serialized body not raw data
+        if (isset($this->body))$cURLOptions[CURLOPT_POSTFIELDS] = $this->body; //use serialized body not raw data
         curl_setopt_array($this->curlHandle, $cURLOptions);
 
         return $this;
@@ -564,10 +564,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->body = $this->$method($this->options['data']);
             } else {
-                $this->body =  $this->options['data'];
+                $this->body = $this->options['data'];
             }
 
         }
@@ -580,7 +580,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 +30 added lines, -11 removed lines

@@ -230,7 +230,9 @@ 
     }
     public function expects($mime)
     {
-        if (empty($mime)) return $this;
+        if (empty($mime)) {
+        	return $this;
+        }
         $this->expected_type = Mime::getFullMime($mime);
         return $this;
     }
@@ -257,7 +259,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;
     }
@@ -437,12 +441,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;
         }
@@ -506,12 +513,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);
 
@@ -553,7 +567,10 @@ 
         }
 
         $cURLOptions = self::filterAndRaw($this->options);
-        if(isset($this->body))$cURLOptions[CURLOPT_POSTFIELDS] = $this->body;//use serialized body not raw data
+        if(isset($this->body)) {
+        	$cURLOptions[CURLOPT_POSTFIELDS] = $this->body;
+        }
+        //use serialized body not raw data
         curl_setopt_array($this->curlHandle, $cURLOptions);
 
         return $this;
@@ -564,7 +581,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->body = $this->$method($this->options['data']);
             } else {
                 $this->body =  $this->options['data'];