sinacms / MultiHttp

src/Request.php

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