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/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)
     {

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;

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';

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

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