zhangv / wechat-pay

src/WechatPay.php

Indentation +1 added lines, -1 removed lines

@@ -655,7 +655,7 @@
 	 * @return array
 	 */
 	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){
+						   $return_msg = null,$err_code = null,$err_code_des = null){
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["interface_url"] = $interface_url;

Braces +72 added lines, -28 removed lines

@@ -187,11 +187,15 @@ 
 		$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(!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(!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);
@@ -411,8 +415,12 @@ 
 	 * @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(!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] );
 		}
@@ -426,8 +434,12 @@ 
 	 * @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(!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] );
 		}
@@ -461,8 +473,11 @@ 
 			$data["return_msg"] = $return_msg;
 		}
 		$xml = $this->array2xml($data);
-		if($print === true) print $xml;
-		else return $xml;
+		if($print === true) {
+			print $xml;
+		} else {
+			return $xml;
+		}
 	}
 
 	/**
@@ -490,12 +505,24 @@ 
 		$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);
 	}
 
@@ -532,7 +559,9 @@ 
 	 * @return array
 	 */
 	public function getSignPackage($url, $ticket = null){
-		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";
@@ -574,9 +603,15 @@ 
 	}
 
 	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);
+		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;
 
@@ -598,15 +633,21 @@ 
 		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}");
+		if(!$content) {
+			throw new Exception("Empty response with {$this->requestXML}");
+		}
 
 		$this->responseXML = $content;
-		if($processResponse)
-			return $this->processResponseXML($this->responseXML);
-		else return $this->responseXML;
+		if($processResponse) {
+					return $this->processResponseXML($this->responseXML);
+		} else {
+			return $this->responseXML;
+		}
 	}
 
 	/**
@@ -629,7 +670,7 @@ 
 				$this->errCode = $result['err_code'];
 				$this->errCodeDes = $result['err_code_des'];
 				throw new Exception("[$this->errCode]$this->errCodeDes");
-			}else{
+			} else{
 				return $result;
 			}
 		} else if($this->returnCode == 'FAIL'){
@@ -648,17 +689,20 @@ 
 		$stringSignTemp = $string1 . "key=" . $this->config["api_key"];
 		if($sign_type == WechatPay::SIGNTYPE_MD5){
 			$sign = strtoupper(md5($stringSignTemp));
-		}elseif($sign_type == WechatPay::SIGNTYPE_HMACSHA256){
+		} 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");
+		} else {
+			throw new Exception("Not supported sign type - $sign_type");
+		}
 		return $sign;
 	}
 
 	private function array2xml($array) {
 		$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;

Spacing +101 added lines, -101 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 setWechatOAuth($wechatOAuth){
+	public function setWechatOAuth($wechatOAuth) {
 		$this->wechatOAuth = $wechatOAuth;
 	}
 
-	public function getWechatOAuth(){
-		if(!$this->wechatOAuth){
-			$this->wechatOAuth = new WechatOAuth($this->config['app_id'],$this->config['app_secret']);
+	public function getWechatOAuth() {
+		if (!$this->wechatOAuth) {
+			$this->wechatOAuth = new WechatOAuth($this->config['app_id'], $this->config['app_secret']);
 		}
 		return $this->wechatOAuth;
 	}
 
-	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;
 	}
 
@@ -173,25 +173,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);
@@ -204,7 +204,7 @@ 
 	 * @param $transaction_id string 微信订单号
 	 * @return array
 	 */
-	public function queryOrderByTransactionId($transaction_id){
+	public function queryOrderByTransactionId($transaction_id) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["transaction_id"] = $transaction_id;
@@ -218,7 +218,7 @@ 
 	 * @param $out_trade_no string 商户订单号
 	 * @return array
 	 */
-	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;
@@ -233,7 +233,7 @@ 
 	 * @param $offset int 偏移
 	 * @return array
 	 */
-	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;
@@ -249,7 +249,7 @@ 
 	 * @param $offset int 偏移
 	 * @return array
 	 */
-	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;
@@ -265,7 +265,7 @@ 
 	 * @param $offset int 偏移
 	 * @return array
 	 */
-	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;
@@ -281,7 +281,7 @@ 
 	 * @param $offset int 偏移
 	 * @return array
 	 */
-	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;
@@ -296,11 +296,11 @@ 
 	 * @param $out_trade_no string 商户订单号
 	 * @return array
 	 */
-	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;
-		$result = $this->post(self::URL_CLOSEORDER, $data,false);
+		$result = $this->post(self::URL_CLOSEORDER, $data, false);
 		return $result;
 	}
 
@@ -315,14 +315,14 @@ 
 	 * @param $ext array 扩展数组
 	 * @return array
 	 */
-	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;
-		$result = $this->post(self::URL_REFUND, $data,true);
+		$result = $this->post(self::URL_REFUND, $data, true);
 		return $result;
 	}
 
@@ -335,14 +335,14 @@ 
 	 * @param $ext array 扩展数组
 	 * @return array
 	 */
-	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;
-		$result = $this->post(self::URL_REFUND, $data,true);
+		$result = $this->post(self::URL_REFUND, $data, true);
 		return $result;
 	}
 
@@ -353,7 +353,7 @@ 
 	 * @param $bill_type string 类型 ALL|SUCCESS
 	 * @return array
 	 */
-	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;
@@ -370,7 +370,7 @@ 
 	 * @param $tar_type string 压缩账单
 	 * @return array
 	 */
-	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;
@@ -389,14 +389,14 @@ 
 	 * @param int $limit 条数
 	 * @return array
 	 */
-	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);
 		$result = $this->post(self::URL_BATCHQUERYCOMMENT, $data, true); //cert is required
 		return $result;
 	}
@@ -408,11 +408,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]);
 		}
 	}
 
@@ -423,11 +423,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]);
 		}
 	}
 
@@ -453,13 +453,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;
 	}
 
@@ -479,8 +479,8 @@ 
 	 * @param string $err_code_des
 	 * @return array
 	 */
-	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;
@@ -488,12 +488,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);
 	}
 
@@ -503,11 +503,11 @@ 
 	 * @param $longurl
 	 * @return string
 	 */
-	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'];
 	}
 
@@ -516,10 +516,10 @@ 
 	 * @link https://pay.weixin.qq.com/wiki/doc/api/native.php?chapter=23_1
 	 * @return array
 	 */
-	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'];
 	}
 
@@ -529,8 +529,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";
@@ -552,29 +552,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->getWechatOAuth()->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;
 
@@ -586,23 +586,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;
 	}
@@ -612,51 +612,51 @@ 
 	 * @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'];
 				throw new Exception("[$this->errCode]$this->errCodeDes");
-			}else{
+			}else {
 				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;
@@ -665,14 +665,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/cache/JsonFileCacheProvider.php

Braces +5 added lines, -2 removed lines

@@ -10,8 +10,11 @@
 	private $cacheDir = null;
 
 	public function __construct($cacheDir = null){
-		if(!$cacheDir) $this->cacheDir = __DIR__;
-		else $this->cacheDir = $cacheDir;
+		if(!$cacheDir) {
+			$this->cacheDir = __DIR__;
+		} else {
+			$this->cacheDir = $cacheDir;
+		}
 	}
 
 	public function set($key,$jsonobj,$expireAt = null){

Spacing +9 added lines, -9 removed lines

@@ -6,30 +6,30 @@ 
  * @author zhangv
  */
 namespace zhangv\wechat\pay\cache;
-class JsonFileCacheProvider implements CacheProvider{
+class JsonFileCacheProvider implements CacheProvider {
 	private $cacheDir = null;
 
-	public function __construct($cacheDir = null){
-		if(!$cacheDir) $this->cacheDir = __DIR__;
+	public function __construct($cacheDir = null) {
+		if (!$cacheDir) $this->cacheDir = __DIR__;
 		else $this->cacheDir = $cacheDir;
 	}
 
-	public function set($key,$jsonobj,$expireAt = null){
+	public function set($key, $jsonobj, $expireAt = null) {
 		$data = $jsonobj;
 		$data->expires_at = $expireAt;
 		$file = "{$this->cacheDir}/{$key}.json";
-		if($fp = @fopen($file, "w")){
+		if ($fp = @fopen($file, "w")) {
 			fwrite($fp, json_encode($data));
 			fclose($fp);
 		}
 	}
 
-	public function get($key){
+	public function get($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		$cache = null;
-		if(file_exists($file)){
+		if (file_exists($file)) {
 			$cache = json_decode(file_get_contents($file));
-			if($cache->expires_at < time()){
+			if ($cache->expires_at < time()) {
 				$cache = null;
 				$this->clear($key);
 			}
@@ -37,7 +37,7 @@ 
 		return $cache;
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		if (file_exists($file)) {
 			unlink($file);

src/cache/CacheProvider.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  */
 namespace zhangv\wechat\pay\cache;
 
-interface CacheProvider{
-	function set($key,$value,$expireAt);
+interface CacheProvider {
+	function set($key, $value, $expireAt);
 	function get($key);
 	function clear($key);
 }
\ No newline at end of file

src/cache/RedisCacheProvider.php

Spacing +5 added lines, -5 removed lines

@@ -6,25 +6,25 @@
  * @author zhangv
  */
 namespace zhangv\wechat\pay\cache;
-class RedisCacheProvider implements CacheProvider{
+class RedisCacheProvider implements CacheProvider {
 	/** @var Redis */
 	private $redis = null;
 
-	public function __construct($redis = null){
+	public function __construct($redis = null) {
 		$this->redis = $redis;
 	}
 
-	public function set($key,$jsonobj,$expireAt){
+	public function set($key, $jsonobj, $expireAt) {
 		$data = $jsonobj;
 		$data->expires_at = $expireAt;
 		$this->redis->set($key, json_encode($data));
 	}
 
-	public function get($key){
+	public function get($key) {
 		return $this->redis->get($key);
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$this->redis->delete($key);
 	}
 }
\ No newline at end of file

src/service/Mweb.php

Spacing +4 added lines, -4 removed lines

@@ -35,15 +35,15 @@
 	 * @return string
 	 * @throws Exception
 	 */
-	public function getMwebUrl($body,$out_trade_no,$total_fee,$ext = null){
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function getMwebUrl($body, $out_trade_no, $total_fee, $ext = null) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["body"]         = $body;
 		$data["out_trade_no"] = $out_trade_no;
 		$data["total_fee"]    = $total_fee;
-		$data["spbill_create_ip"] = isset($_SERVER["REMOTE_ADDR"])?$_SERVER["REMOTE_ADDR"]:'';
+		$data["spbill_create_ip"] = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : '';
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = self::TRADETYPE_MWEB;
-		if(!isset($this->config['h5_scene_info'])) throw new Exception('h5_scene_info should be configured');
+		if (!isset($this->config['h5_scene_info'])) throw new Exception('h5_scene_info should be configured');
 		$data["scene_info"]   = json_encode($this->config['h5_scene_info']);
 		$result = $this->unifiedOrder($data);
 		return $result["mweb_url"];

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
 		$data["spbill_create_ip"] = isset($_SERVER["REMOTE_ADDR"])?$_SERVER["REMOTE_ADDR"]:'';
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = self::TRADETYPE_MWEB;
-		if(!isset($this->config['h5_scene_info'])) throw new Exception('h5_scene_info should be configured');
+		if(!isset($this->config['h5_scene_info'])) {
+			throw new Exception('h5_scene_info should be configured');
+		}
 		$data["scene_info"]   = json_encode($this->config['h5_scene_info']);
 		$result = $this->unifiedOrder($data);
 		return $result["mweb_url"];

src/service/Micro.php

Spacing +9 added lines, -9 removed lines

@@ -37,15 +37,15 @@ 
 	 * @param array $ext
 	 * @return array
 	 */
-	public function microPay($body,$out_trade_no,$total_fee,$spbill_create_ip,$auth_code,$ext = array()){
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
+	public function microPay($body, $out_trade_no, $total_fee, $spbill_create_ip, $auth_code, $ext = array()) {
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
 		$data["appid"] = $this->config["app_id"];
 		$data["body"]         = $body;
 		$data["out_trade_no"] = $out_trade_no;
 		$data["total_fee"]    = $total_fee;
 		$data["spbill_create_ip"] = $spbill_create_ip;
 		$data["auth_code"] = $auth_code;
-		$result = $this->post(self::URL_MICROPAY,$data,true);
+		$result = $this->post(self::URL_MICROPAY, $data, true);
 		return $result;
 	}
 
@@ -55,11 +55,11 @@ 
 	 * @param $auth_code
 	 * @return mixed
 	 */
-	public function authCodeToOpenId($auth_code){
+	public function authCodeToOpenId($auth_code) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["auth_code"] = $auth_code;
-		$result = $this->post(self::URL_AUTHCODETOOPENID,$data,false);
+		$result = $this->post(self::URL_AUTHCODETOOPENID, $data, false);
 		return $result['openid'];
 	}
 
@@ -70,11 +70,11 @@ 
 	 * @param $out_trade_no string 商户订单号
 	 * @return array
 	 */
-	public function reverseByOutTradeNo($out_trade_no){
+	public function reverseByOutTradeNo($out_trade_no) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["out_trade_no"] = $out_trade_no;
-		$result = $this->post(self::URL_REVERSE, $data,true);
+		$result = $this->post(self::URL_REVERSE, $data, true);
 		return $result;
 	}
 
@@ -84,11 +84,11 @@ 
 	 * @param $transaction_id string 微信订单号
 	 * @return array
 	 */
-	public function reverseByTransactionId($transaction_id){
+	public function reverseByTransactionId($transaction_id) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["transaction_id"] = $transaction_id;
-		$result = $this->post(self::URL_REVERSE, $data,true);
+		$result = $this->post(self::URL_REVERSE, $data, true);
 		return $result;
 	}
 }
\ No newline at end of file

src/service/Redpack.php

Spacing +6 added lines, -6 removed lines

@@ -29,14 +29,14 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function sendRedPack($mch_billno,$send_name,$re_openid,$total_amount,$total_num,$wishing,$act_name,$remark,$scene_id = '',$riskinfo = '',$consume_mch_id = ''){
+	public function sendRedPack($mch_billno, $send_name, $re_openid, $total_amount, $total_num, $wishing, $act_name, $remark, $scene_id = '', $riskinfo = '', $consume_mch_id = '') {
 		$data = array();
 		$data["wxappid"] = $this->config["app_id"];
 		$data["mch_billno"] = $mch_billno;
 		$data["send_name"] = $send_name;
 		$data["re_openid"] = $re_openid;
 		$data["total_amount"] = $total_amount;
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000");
+		if ($total_amount > 20000 && trim($scene_id) == '') throw new Exception("scene_id is required when total_amount beyond 20000");
 		$data["total_num"] = $total_num;
 		$data["wishing"] = $wishing;
 		$data["act_name"] = $act_name;
@@ -65,14 +65,14 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function sendGroupRedPack($mch_billno,$send_name,$re_openid,$total_amount,$total_num,$wishing,$act_name,$remark,$scene_id = '',$riskinfo = '',$consume_mch_id = ''){
+	public function sendGroupRedPack($mch_billno, $send_name, $re_openid, $total_amount, $total_num, $wishing, $act_name, $remark, $scene_id = '', $riskinfo = '', $consume_mch_id = '') {
 		$data = array();
-		$data["wxappid"] = $this->config["app_id"];//NOTE: WXappid
+		$data["wxappid"] = $this->config["app_id"]; //NOTE: WXappid
 		$data["mch_billno"] = $mch_billno;
 		$data["send_name"] = $send_name;
 		$data["re_openid"] = $re_openid;
 		$data["total_amount"] = $total_amount;
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
+		if ($total_amount > 20000 && trim($scene_id) == '') throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
 		$data["total_num"] = $total_num;
 		$data["amt_type"] = 'ALL_RAND'; //红包金额设置方式 ALL_RAND—全部随机
 		$data["wishing"] = $wishing;
@@ -92,7 +92,7 @@ 
 	 * @throws Exception
 	 * @link https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_6&index=5
 	 */
-	public function getHbInfo($mch_billno){
+	public function getHbInfo($mch_billno) {
 		$data = array();
 		$data["mch_billno"] = $mch_billno;
 		$data["appid"] = $this->config["app_id"];

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 		$data["send_name"] = $send_name;
 		$data["re_openid"] = $re_openid;
 		$data["total_amount"] = $total_amount;
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000");
+		if($total_amount > 20000 && trim($scene_id)=='') {
+			throw new Exception("scene_id is required when total_amount beyond 20000");
+		}
 		$data["total_num"] = $total_num;
 		$data["wishing"] = $wishing;
 		$data["act_name"] = $act_name;
@@ -72,7 +74,9 @@ 
 		$data["send_name"] = $send_name;
 		$data["re_openid"] = $re_openid;
 		$data["total_amount"] = $total_amount;
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
+		if($total_amount > 20000 && trim($scene_id)=='') {
+			throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
+		}
 		$data["total_num"] = $total_num;
 		$data["amt_type"] = 'ALL_RAND'; //红包金额设置方式 ALL_RAND—全部随机
 		$data["wishing"] = $wishing;

src/service/Weapp.php

Spacing +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@
 	 * @return string
 	 * @throws \Exception
 	 */
-	public function getPrepayId($body,$out_trade_no,$total_fee,$openid,$spbill_create_ip = null,$ext = null) {
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function getPrepayId($body, $out_trade_no, $total_fee, $openid, $spbill_create_ip = null, $ext = null) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["body"]         = $body;
 		$data["out_trade_no"] = $out_trade_no;
 		$data["total_fee"]    = $total_fee;
-		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["REMOTE_ADDR"];
+		$data["spbill_create_ip"] = $spbill_create_ip ?: $_SERVER["REMOTE_ADDR"];
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = WechatPay::TRADETYPE_JSAPI;
-		if(!$openid) throw new Exception('openid is required when trade_type is JSAPI');
-		$data["openid"]   = $openid;
+		if (!$openid) throw new Exception('openid is required when trade_type is JSAPI');
+		$data["openid"] = $openid;
 		$result = $this->unifiedOrder($data);
 		return $result["prepay_id"];
 	}

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["REMOTE_ADDR"];
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = WechatPay::TRADETYPE_JSAPI;
-		if(!$openid) throw new Exception('openid is required when trade_type is JSAPI');
+		if(!$openid) {
+			throw new Exception('openid is required when trade_type is JSAPI');
+		}
 		$data["openid"]   = $openid;
 		$result = $this->unifiedOrder($data);
 		return $result["prepay_id"];

src/service/Native.php

Spacing +4 added lines, -4 removed lines

@@ -38,15 +38,15 @@
 	 * @return string
 	 * @throws Exception
 	 */
-	public function getCodeUrl($body,$out_trade_no,$total_fee,$product_id,$spbill_create_ip = null,$ext = null){
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function getCodeUrl($body, $out_trade_no, $total_fee, $product_id, $spbill_create_ip = null, $ext = null) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["body"]         = $body;
 		$data["out_trade_no"] = $out_trade_no;
 		$data["total_fee"]    = $total_fee;
-		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["SERVER_ADDR"];
+		$data["spbill_create_ip"] = $spbill_create_ip ?: $_SERVER["SERVER_ADDR"];
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = self::TRADETYPE_NATIVE;
-		if(!$product_id) throw new Exception('product_id is required when trade_type is NATIVE');
+		if (!$product_id) throw new Exception('product_id is required when trade_type is NATIVE');
 		$data["product_id"]   = $product_id;
 		$result = $this->unifiedOrder($data);
 		return $result["code_url"];

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["SERVER_ADDR"];
 		$data["notify_url"]   = $this->config["notify_url"];
 		$data["trade_type"]   = self::TRADETYPE_NATIVE;
-		if(!$product_id) throw new Exception('product_id is required when trade_type is NATIVE');
+		if(!$product_id) {
+			throw new Exception('product_id is required when trade_type is NATIVE');
+		}
 		$data["product_id"]   = $product_id;
 		$result = $this->unifiedOrder($data);
 		return $result["code_url"];