zhangv / wechat-pay

src/WechatPay.php

Spacing +100 added lines, -100 removed lines

@@ -30,10 +30,10 @@ 
  * @method static service\Coupon    Coupon(array $config)
  */
 class WechatPay {
-	const TRADETYPE_JSAPI = 'JSAPI',TRADETYPE_NATIVE = 'NATIVE',TRADETYPE_APP = 'APP',TRADETYPE_MWEB = 'MWEB';
+	const TRADETYPE_JSAPI = 'JSAPI', TRADETYPE_NATIVE = 'NATIVE', TRADETYPE_APP = 'APP', TRADETYPE_MWEB = 'MWEB';
 	const SIGNTYPE_MD5 = 'MD5', SIGNTYPE_HMACSHA256 = 'HMAC-SHA256';
-	const CHECKNAME_FORCECHECK = 'FORCE_CHECK',CHECKNAME_NOCHECK = 'NO_CHECK';
-	const ACCOUNTTYPE_BASIC = 'Basic',ACCOUNTTYPE_OPERATION = 'Operation',ACCOUNTTYPE_FEES = 'Fees';
+	const CHECKNAME_FORCECHECK = 'FORCE_CHECK', CHECKNAME_NOCHECK = 'NO_CHECK';
+	const ACCOUNTTYPE_BASIC = 'Basic', ACCOUNTTYPE_OPERATION = 'Operation', ACCOUNTTYPE_FEES = 'Fees';
 	const API_ENDPOINT = 'https://api.mch.weixin.qq.com/';
 	/** 支付 */
 	const URL_UNIFIEDORDER = 'pay/unifiedorder';
@@ -118,7 +118,7 @@ 
 	 * @return mixed
 	 */
 	private static function load($name, $config) {
-		$service = __NAMESPACE__ . "\\service\\{$name}";
+		$service = __NAMESPACE__."\\service\\{$name}";
 		return new $service($config);
 	}
 
@@ -132,34 +132,34 @@ 
 		return self::load($name, ...$config);
 	}
 
-	public function setOAuth($oauth){
+	public function setOAuth($oauth) {
 		$this->oauth = $oauth;
 	}
 
-	public function getOAuth(){
-		if(!$this->oauth){
-			$this->oauth = new OAuth($this->config['app_id'],$this->config['app_secret']);
+	public function getOAuth() {
+		if (!$this->oauth) {
+			$this->oauth = new OAuth($this->config['app_id'], $this->config['app_secret']);
 		}
 		return $this->oauth;
 	}
 
-	public function setConfig($config){
+	public function setConfig($config) {
 		$this->config = $config;
 	}
 
-	public function getConfig(){
+	public function getConfig() {
 		return $this->config;
 	}
 
-	public function setHttpClient($httpClient){
+	public function setHttpClient($httpClient) {
 		$this->httpClient = $httpClient;
 	}
 
-	public function setCacheProvider($cacheProvider){
+	public function setCacheProvider($cacheProvider) {
 		$this->cacheProvider = $cacheProvider;
 	}
 
-	public function getCacheProvider(){
+	public function getCacheProvider() {
 		return $this->cacheProvider;
 	}
 
@@ -172,25 +172,25 @@ 
 	public function unifiedOrder($params) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
-		$data["device_info"] = (isset($params['device_info'])&&trim($params['device_info'])!='')?$params['device_info']:null;
+		$data["device_info"] = (isset($params['device_info']) && trim($params['device_info']) != '') ? $params['device_info'] : null;
 		$data["body"] = $params['body'];
-		$data["detail"] = isset($params['detail'])?$params['detail']:null;//optional
-		$data["attach"] = isset($params['attach'])?$params['attach']:null;//optional
-		$data["out_trade_no"] = isset($params['out_trade_no'])?$params['out_trade_no']:null;
-		$data["fee_type"] = isset($params['fee_type'])?$params['fee_type']:'CNY';
+		$data["detail"] = isset($params['detail']) ? $params['detail'] : null; //optional
+		$data["attach"] = isset($params['attach']) ? $params['attach'] : null; //optional
+		$data["out_trade_no"] = isset($params['out_trade_no']) ? $params['out_trade_no'] : null;
+		$data["fee_type"] = isset($params['fee_type']) ? $params['fee_type'] : 'CNY';
 		$data["total_fee"]    = $params['total_fee'];
 		$data["spbill_create_ip"] = $params['spbill_create_ip'];
-		$data["time_start"] = isset($params['time_start'])?$params['time_start']:null;//optional
-		$data["time_expire"] = isset($params['time_expire'])?$params['time_expire']:null;//optional
-		$data["goods_tag"] = isset($params['goods_tag'])?$params['goods_tag']:null;
+		$data["time_start"] = isset($params['time_start']) ? $params['time_start'] : null; //optional
+		$data["time_expire"] = isset($params['time_expire']) ? $params['time_expire'] : null; //optional
+		$data["goods_tag"] = isset($params['goods_tag']) ? $params['goods_tag'] : null;
 		$data["notify_url"] = $this->config["notify_url"];
 		$data["trade_type"] = $params['trade_type'];
-		if($params['trade_type'] == WechatPay::TRADETYPE_NATIVE){
-			if(!isset($params['product_id'])) throw new Exception('product_id is required when trade_type is NATIVE');
+		if ($params['trade_type'] == WechatPay::TRADETYPE_NATIVE) {
+			if (!isset($params['product_id'])) throw new Exception('product_id is required when trade_type is NATIVE');
 			$data["product_id"] = $params['product_id'];
 		}
-		if($params['trade_type'] == WechatPay::TRADETYPE_JSAPI){
-			if(!isset($params['openid'])) throw new Exception('openid is required when trade_type is JSAPI');
+		if ($params['trade_type'] == WechatPay::TRADETYPE_JSAPI) {
+			if (!isset($params['openid'])) throw new Exception('openid is required when trade_type is JSAPI');
 			$data["openid"] = $params['openid'];
 		}
 		$result = $this->post(self::URL_UNIFIEDORDER, $data);
@@ -203,7 +203,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryOrderByTransactionId($transaction_id){
+	public function queryOrderByTransactionId($transaction_id) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["transaction_id"] = $transaction_id;
@@ -217,7 +217,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryOrderByOutTradeNo($out_trade_no){
+	public function queryOrderByOutTradeNo($out_trade_no) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_trade_no"] = $out_trade_no;
@@ -231,7 +231,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryRefundByTransactionId($transaction_id,$offset = 0){
+	public function queryRefundByTransactionId($transaction_id, $offset = 0) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["transaction_id"] = $transaction_id;
@@ -246,7 +246,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryRefundByOutTradeNo($out_trade_no,$offset = 0){
+	public function queryRefundByOutTradeNo($out_trade_no, $offset = 0) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_trade_no"] = $out_trade_no;
@@ -261,7 +261,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryRefundByRefundId($refund_id,$offset = 0){
+	public function queryRefundByRefundId($refund_id, $offset = 0) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["refund_id"] = $refund_id;
@@ -276,7 +276,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function queryRefundByOutRefundNo($out_refund_no,$offset = 0){
+	public function queryRefundByOutRefundNo($out_refund_no, $offset = 0) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_refund_no"] = $out_refund_no;
@@ -290,11 +290,11 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function closeOrder($out_trade_no){
+	public function closeOrder($out_trade_no) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_trade_no"] = $out_trade_no;
-		return $this->post(self::URL_CLOSEORDER, $data,false);
+		return $this->post(self::URL_CLOSEORDER, $data, false);
 	}
 
 	/**
@@ -307,14 +307,14 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function refundByOutTradeNo($out_trade_no,$out_refund_no,$total_fee,$refund_fee,$ext = array()){
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function refundByOutTradeNo($out_trade_no, $out_refund_no, $total_fee, $refund_fee, $ext = array()) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_trade_no"] = $out_trade_no;
 		$data["out_refund_no"] = $out_refund_no;
 		$data["total_fee"] = $total_fee;
 		$data["refund_fee"] = $refund_fee;
-		return $this->post(self::URL_REFUND, $data,true);
+		return $this->post(self::URL_REFUND, $data, true);
 	}
 
 	/**
@@ -327,14 +327,14 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function refundByTransactionId($transaction_id,$out_refund_no,$total_fee,$refund_fee,$ext = array()){
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function refundByTransactionId($transaction_id, $out_refund_no, $total_fee, $refund_fee, $ext = array()) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["appid"] = $this->config["app_id"];
 		$data["transaction_id"] = $transaction_id;
 		$data["out_refund_no"] = $out_refund_no;
 		$data["total_fee"] = $total_fee;
 		$data["refund_fee"] = $refund_fee;
-		return $this->post(self::URL_REFUND, $data,true);
+		return $this->post(self::URL_REFUND, $data, true);
 	}
 
 	/**
@@ -344,7 +344,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function downloadBill($bill_date,$bill_type = 'ALL'){
+	public function downloadBill($bill_date, $bill_type = 'ALL') {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["bill_date"] = $bill_date;
@@ -360,7 +360,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function downloadFundFlow($bill_date,$account_type = self::ACCOUNTTYPE_BASIC,$tar_type = 'GZIP'){
+	public function downloadFundFlow($bill_date, $account_type = self::ACCOUNTTYPE_BASIC, $tar_type = 'GZIP') {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["bill_date"] = $bill_date;
@@ -378,14 +378,14 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function batchQueryComment($begin_time,$end_time,$offset = 0,$limit = 200){
+	public function batchQueryComment($begin_time, $end_time, $offset = 0, $limit = 200) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["begin_time"] = $begin_time;
 		$data["end_time"] = $end_time;
 		$data["offset"] = $offset;
 		$data["limit"] = $limit;
-		$data["sign"] = $this->sign($data,WechatPay::SIGNTYPE_HMACSHA256);
+		$data["sign"] = $this->sign($data, WechatPay::SIGNTYPE_HMACSHA256);
 		return $this->post(self::URL_BATCHQUERYCOMMENT, $data, true); //cert is required
 	}
 
@@ -396,11 +396,11 @@ 
 	 * @return null
 	 * @throws Exception
 	 */
-	public function onPaidNotify($notify_data,callable $callback = null){
-		if(!is_array($notify_data)) $notify_data = $this->xml2array($notify_data);
-		if(!$this->validateSign($notify_data)) throw new Exception('Invalid paid notify data');
-		if($callback && is_callable($callback)){
-			return call_user_func_array( $callback , [$notify_data] );
+	public function onPaidNotify($notify_data, callable $callback = null) {
+		if (!is_array($notify_data)) $notify_data = $this->xml2array($notify_data);
+		if (!$this->validateSign($notify_data)) throw new Exception('Invalid paid notify data');
+		if ($callback && is_callable($callback)) {
+			return call_user_func_array($callback, [$notify_data]);
 		}
 		return null;
 	}
@@ -412,11 +412,11 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function onRefundedNotify($notify_data,callable $callback = null){
-		if(!is_array($notify_data)) $notify_data = $this->xml2array($notify_data);
-		if(!$this->validateSign($notify_data)) throw new Exception('Invalid refund notify data');
-		if($callback && is_callable($callback)){
-			return call_user_func_array( $callback ,[$notify_data] );
+	public function onRefundedNotify($notify_data, callable $callback = null) {
+		if (!is_array($notify_data)) $notify_data = $this->xml2array($notify_data);
+		if (!$this->validateSign($notify_data)) throw new Exception('Invalid refund notify data');
+		if ($callback && is_callable($callback)) {
+			return call_user_func_array($callback, [$notify_data]);
 		}
 		return null;
 	}
@@ -444,13 +444,13 @@ 
 	 * @param bool $print
 	 * @return string
 	 */
-	public function responseNotify($print = true,$data = [],$return_code="SUCCESS", $return_msg= 'OK') {
+	public function responseNotify($print = true, $data = [], $return_code = "SUCCESS", $return_msg = 'OK') {
 		$data["return_code"] = $return_code;
 		if ($return_msg) {
 			$data["return_msg"] = $return_msg;
 		}
 		$xml = $this->array2xml($data);
-		if($print === true) print $xml;
+		if ($print === true) print $xml;
 		else return $xml;
 	}
 
@@ -470,8 +470,8 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function report($interface_url,$execution_time,$return_code,$result_code,$user_ip,$out_trade_no = null,$time = null,$device_info = null,
-	                       $return_msg = null,$err_code = null,$err_code_des = null){
+	public function report($interface_url, $execution_time, $return_code, $result_code, $user_ip, $out_trade_no = null, $time = null, $device_info = null,
+	                       $return_msg = null, $err_code = null, $err_code_des = null) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["interface_url"] = $interface_url;
@@ -479,12 +479,12 @@ 
 		$data["return_code"] = $return_code;
 		$data["result_code"] = $result_code;
 		$data["user_ip"] = $user_ip;
-		if($out_trade_no) $data["out_trade_no"] = $out_trade_no;
-		if($time) $data["time"] = $time;
-		if($device_info) $data["device_info"] = $device_info;
-		if($return_msg) $data["return_msg"] = $return_msg;
-		if($err_code) $data["err_code"] = $err_code;
-		if($err_code_des) $data["err_code_des"] = $err_code_des;
+		if ($out_trade_no) $data["out_trade_no"] = $out_trade_no;
+		if ($time) $data["time"] = $time;
+		if ($device_info) $data["device_info"] = $device_info;
+		if ($return_msg) $data["return_msg"] = $return_msg;
+		if ($err_code) $data["err_code"] = $err_code;
+		if ($err_code_des) $data["err_code_des"] = $err_code_des;
 		return $this->post(self::URL_REPORT, $data, false);
 	}
 
@@ -494,11 +494,11 @@ 
 	 * @return string
 	 * @throws Exception
 	 */
-	public function shortUrl($longurl){
+	public function shortUrl($longurl) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["long_url"] = $longurl;
-		$result = $this->post(self::URL_SHORTURL,$data,false);
+		$result = $this->post(self::URL_SHORTURL, $data, false);
 		return $result['short_url'];
 	}
 
@@ -507,10 +507,10 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function getSignKey(){
+	public function getSignKey() {
 		$data = array();
 		$data["mch_id"] = $this->config["mch_id"];
-		$result = $this->post($this->getSignKeyUrl,$data,false);
+		$result = $this->post($this->getSignKeyUrl, $data, false);
 		return $result['sandbox_signkey'];
 	}
 
@@ -520,8 +520,8 @@ 
 	 * @param string $ticket
 	 * @return array
 	 */
-	public function getSignPackage($url, $ticket = null){
-		if(!$ticket) $ticket = $this->getTicket();
+	public function getSignPackage($url, $ticket = null) {
+		if (!$ticket) $ticket = $this->getTicket();
 		$timestamp = time();
 		$nonceStr = $this->getNonceStr();
 		$rawString = "jsapi_ticket=$ticket&noncestr=$nonceStr&timestamp=$timestamp&url=$url";
@@ -543,29 +543,29 @@ 
 	 * @param boolean $cache
 	 * @return string
 	 */
-	public function getTicket($cache = true){
+	public function getTicket($cache = true) {
 		$ticket = null;
 		$cacheKey = 'jsapi_ticket';
-		if($cache === true){
+		if ($cache === true) {
 			$data = $this->cacheProvider->get($cacheKey);
 			if ($data && $data->expires_at > time()) {
 				$ticket = $data->ticket;
 			}
 		}
-		if(!$ticket){
+		if (!$ticket) {
 			$data = $this->getOAuth()->getTicket();
-			if($cache === true){
-				$this->cacheProvider->set($cacheKey,$data,time() + $data->expires_in);
+			if ($cache === true) {
+				$this->cacheProvider->set($cacheKey, $data, time() + $data->expires_in);
 			}
 			$ticket = $data->ticket;
 		}
 		return $ticket;
 	}
 
-	protected function post($url, $data,$cert = true) {
-		if(!isset($data['mch_id']) && !isset($data['mchid'])) $data["mch_id"] = $this->config["mch_id"];
-		if(!isset($data['nonce_str'])) $data["nonce_str"] = $this->getNonceStr();
-		if(!isset($data['sign'])) $data['sign'] = $this->sign($data);
+	protected function post($url, $data, $cert = true) {
+		if (!isset($data['mch_id']) && !isset($data['mchid'])) $data["mch_id"] = $this->config["mch_id"];
+		if (!isset($data['nonce_str'])) $data["nonce_str"] = $this->getNonceStr();
+		if (!isset($data['sign'])) $data['sign'] = $this->sign($data);
 		$this->requestXML = $this->responseXML = null;
 		$this->requestArray = $this->responseArray = null;
 
@@ -577,23 +577,23 @@ 
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_TIMEOUT => 10
 		];
-		if($cert == true){
+		if ($cert == true) {
 			$opts[CURLOPT_SSLCERTTYPE] = 'PEM';
 			$opts[CURLOPT_SSLCERT] = $this->config['ssl_cert_path'];
 			$opts[CURLOPT_SSLKEYTYPE] = 'PEM';
 			$opts[CURLOPT_SSLKEY] = $this->config['ssl_key_path'];
 		}
 		$processResponse = true;
-		if(in_array($url,[self::URL_DOWNLOADBILL,self::URL_DOWNLOAD_FUND_FLOW,self::URL_BATCHQUERYCOMMENT])){
+		if (in_array($url, [self::URL_DOWNLOADBILL, self::URL_DOWNLOAD_FUND_FLOW, self::URL_BATCHQUERYCOMMENT])) {
 			$processResponse = false;
 		}
-		if($this->sandbox === true) $url = "sandboxnew/{$url}";
+		if ($this->sandbox === true) $url = "sandboxnew/{$url}";
 
-		$content = $this->httpClient->post(self::API_ENDPOINT . $url,$this->requestXML,[],$opts);
-		if(!$content) throw new Exception("Empty response with {$this->requestXML}");
+		$content = $this->httpClient->post(self::API_ENDPOINT.$url, $this->requestXML, [], $opts);
+		if (!$content) throw new Exception("Empty response with {$this->requestXML}");
 
 		$this->responseXML = $content;
-		if($processResponse)
+		if ($processResponse)
 			return $this->processResponseXML($this->responseXML);
 		else return $this->responseXML;
 	}
@@ -603,17 +603,17 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	private function processResponseXML($responseXML){
+	private function processResponseXML($responseXML) {
 		$result = $this->xml2array($responseXML);
 		$this->responseArray = $result;
-		if(empty($result['return_code'])){
+		if (empty($result['return_code'])) {
 			throw new Exception("No return code presents in {$this->responseXML}");
 		}
 		$this->returnCode = $result["return_code"];
-		$this->returnMsg = isset($result['return_msg'])?$result['return_msg']:'';
+		$this->returnMsg = isset($result['return_msg']) ? $result['return_msg'] : '';
 
 		if ($this->returnCode == "SUCCESS") {
-			if(isset($result['result_code']) && $result['result_code'] == "FAIL") {
+			if (isset($result['result_code']) && $result['result_code'] == "FAIL") {
 				$this->resultCode = $result['result_code'];
 				$this->errCode = $result['err_code'];
 				$this->errCodeDes = $result['err_code_des'];
@@ -621,33 +621,33 @@ 
 				//throw new Exception("[$this->errCode]$this->errCodeDes, with request XML: {$this->requestXML}");
 			}
 			return $result;
-		} else if($this->returnCode == 'FAIL'){
+		}else if ($this->returnCode == 'FAIL') {
 			throw new Exception($this->returnMsg);
 		}
 	}
 
-	public function sign($data,$sign_type = WechatPay::SIGNTYPE_MD5) {
+	public function sign($data, $sign_type = WechatPay::SIGNTYPE_MD5) {
 		ksort($data);
 		$string1 = "";
 		foreach ($data as $k => $v) {
-			if ($v && trim($v)!='') {
+			if ($v && trim($v) != '') {
 				$string1 .= "$k=$v&";
 			}
 		}
-		$stringSignTemp = $string1 . "key=" . $this->config["api_key"];
-		if($sign_type == WechatPay::SIGNTYPE_MD5){
+		$stringSignTemp = $string1."key=".$this->config["api_key"];
+		if ($sign_type == WechatPay::SIGNTYPE_MD5) {
 			$sign = strtoupper(md5($stringSignTemp));
-		}elseif($sign_type == WechatPay::SIGNTYPE_HMACSHA256){
-			$sign = strtoupper(hash_hmac('sha256',$stringSignTemp,$this->config["api_key"]));
+		}elseif ($sign_type == WechatPay::SIGNTYPE_HMACSHA256) {
+			$sign = strtoupper(hash_hmac('sha256', $stringSignTemp, $this->config["api_key"]));
 		}else throw new Exception("Not supported sign type - $sign_type");
 		return $sign;
 	}
 
 	private function array2xml($array) {
-		$xml = "<xml>" . PHP_EOL;
+		$xml = "<xml>".PHP_EOL;
 		foreach ($array as $k => $v) {
-			if($v && trim($v)!='')
-				$xml .= "<$k><![CDATA[$v]]></$k>" . PHP_EOL;
+			if ($v && trim($v) != '')
+				$xml .= "<$k><![CDATA[$v]]></$k>".PHP_EOL;
 		}
 		$xml .= "</xml>";
 		return $xml;
@@ -656,14 +656,14 @@ 
 	private function xml2array($xml) {
 		$array = [];
 		$tmp = (array) simplexml_load_string($xml);
-		foreach ( $tmp as $k => $v) {
+		foreach ($tmp as $k => $v) {
 			$array[$k] = (string) $v;
 		}
 		return $array;
 	}
 
 	protected function getNonceStr() {
-		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
+		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
 	}
 
 }
\ No newline at end of file

src/util/HttpClient.php

Spacing +17 added lines, -17 removed lines

@@ -7,9 +7,9 @@ 
  */
 namespace zhangv\wechat\pay\util;
 
-class HttpClient{
+class HttpClient {
 
-	const GET = 'get',POST = 'post', DELETE = 'delete',PUT = 'put';
+	const GET = 'get', POST = 'post', DELETE = 'delete', PUT = 'put';
 	private $instance = null;
 	private $errNo = null;
 	private $info = null;
@@ -17,17 +17,17 @@ 
 	private $retry = 1;
 	private $tried = 0;
 
-	public function __construct($timeout = 1,$retry = 1) {
+	public function __construct($timeout = 1, $retry = 1) {
 		$this->timeout = $timeout;
 		$this->retry = $retry;
 		$this->initInstance();
 	}
 
-	public function initInstance(){
-		if(!$this->instance) {
+	public function initInstance() {
+		if (!$this->instance) {
 			$this->instance = curl_init();
-			if($this->timeout < 1) {
-				curl_setopt($this->instance, CURLOPT_NOSIGNAL,1);
+			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));
@@ -37,26 +37,26 @@ 
 		}
 	}
 
-	public function get($url,$params = array(),$headers = array(),$opts = array()) {
+	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 ($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);
-		curl_setopt_array($this->instance,$opts);
+		curl_setopt_array($this->instance, $opts);
 		$result = $this->execute();
 		curl_close($this->instance);
 		$this->instance = null;
 		return $result;
 	}
 
-	public function post($url, $params = array(),$headers = array(),$opts = array()) {
+	public function post($url, $params = array(), $headers = array(), $opts = array()) {
 		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);
 		curl_setopt($this->instance, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt_array($this->instance,$opts);
+		curl_setopt_array($this->instance, $opts);
 		$result = $this->execute();
 		curl_close($this->instance);
 		$this->instance = null;
@@ -64,23 +64,23 @@ 
 	}
 
 	private function execute() {
-		do{
+		do {
 			$result = curl_exec($this->instance);
 			$this->errNo = curl_errno($this->instance);
-		}while(!$result && $this->errNo === CURLE_OPERATION_TIMEDOUT && $this->tried++ < $this->retry);
+		} while (!$result && $this->errNo === CURLE_OPERATION_TIMEDOUT && $this->tried++ < $this->retry);
 		$this->info = curl_getinfo($this->instance);
 		return $result;
 	}
 
-	public function getInfo(){
+	public function getInfo() {
 		return $this->info;
 	}
 
-	public function getErrorNo(){
+	public function getErrorNo() {
 		return $this->errNo;
 	}
 
-	public function getTried(){
+	public function getTried() {
 		return $this->tried;
 	}
 }
\ No newline at end of file

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

Spacing +16 added lines, -16 removed lines

@@ -8,7 +8,7 @@ 
 namespace zhangv\wechat\pay\util;
 
 class OAuth {
-	const TICKETTYPE_JSAPI = 'jsapi',TICKETTYPE_WXCARD = 'wx_card';
+	const TICKETTYPE_JSAPI = 'jsapi', TICKETTYPE_WXCARD = 'wx_card';
 	public $responseJSON = null;
 	public $errCode = null;
 	public $errMsg = null;
@@ -18,46 +18,46 @@ 
 	private $httpClient = null;
 	private $accessToken = null;
 
-	public function __construct($appId,$appSecret) {
+	public function __construct($appId, $appSecret) {
 		$this->appId = $appId;
 		$this->appSecret = $appSecret;
 		$this->httpClient = new HttpClient();
 	}
 
-	public function setHttpClient($httpClient){
+	public function setHttpClient($httpClient) {
 		$this->httpClient = $httpClient;
 	}
 
-	public function authorizeURI($redirectURI,$scope = 'snsapi_userinfo',$state = ''){
+	public function authorizeURI($redirectURI, $scope = 'snsapi_userinfo', $state = '') {
 		$redirectURI = urlencode($redirectURI);
 		return "https://open.weixin.qq.com/connect/oauth2/authorize?appid={$this->appId}&redirect_uri={$redirectURI}&response_type=code&scope=$scope&state=$state#wechat_redirect";
 	}
 
-	public function authorize($code){
+	public function authorize($code) {
 		$url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={$this->appId}&secret={$this->appSecret}&code=$code&grant_type=authorization_code";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getUserInfo($openId){
+	public function getUserInfo($openId) {
 		$url = "https://api.weixin.qq.com/sns/userinfo?access_token={$this->accessToken}&openid=$openId&lang=zh_CN";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function refreshToken($refreshToken){
+	public function refreshToken($refreshToken) {
 		$url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid={$this->appId}&grant_type=refresh_token&refresh_token=$refreshToken";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function verifyToken($accessToken,$openId){
+	public function verifyToken($accessToken, $openId) {
 		$url = "https://api.weixin.qq.com/sns/auth?access_token=$accessToken&openid=$openId";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getAccessToken(){
+	public function getAccessToken() {
 		$url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={$this->appId}&secret={$this->appSecret}";
 		$this->responseJSON = $this->httpClient->get($url);
 		$json = json_decode($this->responseJSON);
@@ -65,27 +65,27 @@ 
 		return $this->accessToken;
 	}
 
-	public function getTicket($type = OAuth::TICKETTYPE_JSAPI, $accessToken = null){
-		if(!$accessToken) $accessToken = $this->getAccessToken();
+	public function getTicket($type = OAuth::TICKETTYPE_JSAPI, $accessToken = null) {
+		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);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getSession($code){
+	public function getSession($code) {
 		$url = "https://api.weixin.qq.com/sns/jscode2session?appid={$this->appId}&secret={$this->appSecret}&js_code=$code&grant_type=authorization_code";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getSignPackage($url = null, $ticket = null){
-		if(!$url){
+	public function getSignPackage($url = null, $ticket = null) {
+		if (!$url) {
 			$url = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ||
 				(!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";
@@ -103,6 +103,6 @@ 
 	}
 
 	private function getNonceStr() {
-		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
+		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
 	}
 }

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