zhangv / wechat-pay

src/util/HttpClient.php

Braces +12 added lines, -5 removed lines

@@ -29,8 +29,9 @@ 
 			if($this->timeout < 1) {
 				curl_setopt($this->instance, CURLOPT_NOSIGNAL,1);
 				curl_setopt($this->instance, CURLOPT_TIMEOUT_MS, $this->timeout * 1000);
-			}else
-				curl_setopt($this->instance, CURLOPT_TIMEOUT, intval($this->timeout));
+			} else {
+							curl_setopt($this->instance, CURLOPT_TIMEOUT, intval($this->timeout));
+			}
 			curl_setopt($this->instance, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($this->instance, CURLOPT_FOLLOWLOCATION, true);
 			curl_setopt($this->instance, CURLOPT_SSL_VERIFYPEER, false);
@@ -38,8 +39,12 @@ 
 	}
 
 	public function get($url,$params = array(),$headers = array(),$opts = array()) {
-		if (!$this->instance)	$this->initInstance($this->timeout);
-		if($params && count($params) > 0) $url .= '?' . http_build_query($params);
+		if (!$this->instance) {
+			$this->initInstance($this->timeout);
+		}
+		if($params && count($params) > 0) {
+			$url .= '?' . http_build_query($params);
+		}
 		curl_setopt($this->instance, CURLOPT_URL, $url);
 		curl_setopt($this->instance, CURLOPT_HTTPGET, true);
 		curl_setopt($this->instance, CURLOPT_HTTPHEADER, $headers);
@@ -51,7 +56,9 @@ 
 	}
 
 	public function post($url, $params = array(),$headers = array(),$opts = array()) {
-		if (!$this->instance)	$this->initInstance($this->timeout);
+		if (!$this->instance) {
+			$this->initInstance($this->timeout);
+		}
 		curl_setopt($this->instance, CURLOPT_URL, $url);
 		curl_setopt($this->instance, CURLOPT_POST, true);
 		curl_setopt($this->instance, CURLOPT_POSTFIELDS, $params);

src/util/OAuth.php

Braces +6 added lines, -2 removed lines

@@ -66,7 +66,9 @@ 
 	}
 
 	public function getTicket($type = OAuth::TICKETTYPE_JSAPI, $accessToken = null){
-		if(!$accessToken) $accessToken = $this->getAccessToken();
+		if(!$accessToken) {
+			$accessToken = $this->getAccessToken();
+		}
 		// $url = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=$accessToken";
 		$url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type={$type}&access_token=$accessToken";
 		$this->responseJSON = $this->httpClient->get($url);
@@ -85,7 +87,9 @@ 
 				(!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? "https://" : "http://";
 			$url .= "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
 		}
-		if(!$ticket) $ticket = $this->getTicket();
+		if(!$ticket) {
+			$ticket = $this->getTicket();
+		}
 		$timestamp = time();
 		$nonceStr = $this->getNonceStr();
 		$rawString = "jsapi_ticket=$ticket&noncestr=$nonceStr&timestamp=$timestamp&url=$url";