sinacms / MultiHttp

src/Request.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 
 use MultiHttp\Exception\InvalidArgumentException;
 use MultiHttp\Exception\InvalidOperationException;
-use MultiHttp\Handler\Form;
 use MultiHttp\Handler\IHandler;
 
 /**

Spacing +33 added lines, -33 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,10 +77,10 @@ 
          */
         $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_SAFE_UPLOAD' => false,// compatible with PHP 5.6.0
+            '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
             'CURLOPT_USERAGENT' => 'Mozilla/5.0 (compatible;)',
             'header' => true,
             'method' => self::GET,
@@ -89,9 +89,9 @@ 
             '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
-            'send_mime' => 'form',//in seconds
+            'retry_times' => 1, //redo task when failed
+            'retry_duration' => 0, //in seconds
+            'send_mime' => 'form', //in seconds
         );
 
 
@@ -155,15 +155,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";
     }
 
@@ -197,7 +197,7 @@ 
      */
     public function addHeader($headerName, $value)
     {
-        $this->options['headers'][] = $headerName . ': ' . $value;
+        $this->options['headers'][] = $headerName.': '.$value;
         return $this;
     }
 
@@ -246,7 +246,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'] = str_replace("//{$host}", '//' . $this->options['ip'], $this->options['url']);
+            $this->options['url'] = str_replace("//{$host}", '//'.$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;
@@ -566,7 +566,7 @@ 
             $this->options[CURLOPT_POST] = true;
             $clz = '\\MultiHttp\\Handler\\'.ucfirst($this->sendMime);
             $inst = new $clz;
-            if (!($inst instanceof Handler\IHandler)) throw new InvalidOperationException($clz . ' is not implement of  IHandler');
+            if (!($inst instanceof Handler\IHandler)) throw new InvalidOperationException($clz.' is not implement of  IHandler');
             $this->body = $inst->encode($this->options['data']);
         }
     }
@@ -578,7 +578,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;

src/Response.php

Spacing +2 added lines, -2 removed lines

@@ -97,10 +97,10 @@
     public function unserializeBody()
     {
         if (isset($this->request->expectsMime)) {
-            if (Mime::getFullMime($this->request->expectsMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'. $this->contentType. ', expected mime:'. Mime::getFullMime($this->request->expectsMime));
+            if (Mime::getFullMime($this->request->expectsMime) !== $this->contentType) throw new UnexpectedResponseException('expected mime can not be matched, real mime:'.$this->contentType.', expected mime:'.Mime::getFullMime($this->request->expectsMime));
             $clz = "\MultiHttp\\Handler\\".ucfirst($this->request->expectsMime);
             $inst = new $clz;
-            if (!($inst instanceof Handler\IHandler)) throw new InvalidOperationException($clz . ' is not implement of  IHandler');
+            if (!($inst instanceof Handler\IHandler)) throw new InvalidOperationException($clz.' is not implement of  IHandler');
             $this->body = $inst->decode($this->body);
         }
     }

src/Handler/Json.php

Spacing +3 added lines, -3 removed lines

@@ -34,15 +34,15 @@
     public function decode($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';

src/Handler/Form.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function decode($body)
     {
-        if(is_string($body)){
+        if (is_string($body)) {
             parse_str($body, $body);
         }
         return $body;