sinacms / MultiHttp

src/Request.php

Spacing +13 added lines, -13 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',
@@ -62,8 +62,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
     );
     protected $endCallback;
     protected $withURIQuery;
@@ -254,9 +254,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;
@@ -264,7 +264,7 @@ 
 
     public function addOptions(array $options = array())
     {
-        $this->options = $options + $this->options;
+        $this->options = $options+$this->options;
         $this->uri = $this->options['url'];
         return $this;
     }
@@ -355,7 +355,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 ? '?' : '&';
@@ -371,11 +371,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);
         }
@@ -394,7 +394,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']);
             }
@@ -410,7 +410,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;
@@ -458,7 +458,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),
             ));
         }

src/MultiRequest.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
                 'method' => $method,
                 'url' => $uri,
                 'data' => $payload,
-            ) + $options;
+            )+$options;
         $this->addOptions(array($options));
         return $this;
     }
@@ -91,7 +91,7 @@ 
     public function execute()
     {
 //        if($this->isLazy) return array();
-        $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
@@ -100,7 +100,7 @@ 
                 usleep($sleepTime);
             }
             usleep($sleepTime);
-        } while ($active);
+        }while ($active);
         $return = array();
         foreach (self::$requestPool as $request) {
             $response = $request->makeResponse(true);