zhangv / wechat-pay

src/service/Mchpay.php

Spacing +22 added lines, -22 removed lines

@@ -25,19 +25,19 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function transferWallet($partner_trade_no,$openid,$amount,$desc,$spbill_create_ip = null,$re_user_name = null,$check_name = WechatPay::CHECKNAME_FORCECHECK){
+	public function transferWallet($partner_trade_no, $openid, $amount, $desc, $spbill_create_ip = null, $re_user_name = null, $check_name = WechatPay::CHECKNAME_FORCECHECK) {
 		$data = array();
-		if($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) throw new Exception('Real name is required');
+		if ($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) throw new Exception('Real name is required');
 		$data["mch_appid"] = $this->config["app_id"];
 		$data["mchid"] = $this->config["mch_id"];
 		$data["partner_trade_no"] = $partner_trade_no;
 		$data["openid"] = $openid;
 		$data["amount"] = $amount;
 		$data["desc"] = $desc;
-		$data['spbill_create_ip'] = $spbill_create_ip?:$_SERVER['SERVER_ADDR'];
+		$data['spbill_create_ip'] = $spbill_create_ip ?: $_SERVER['SERVER_ADDR'];
 		$data["check_name"] = $check_name;
 		$data["re_user_name"] = $re_user_name;
-		$result = $this->post(self::URL_TRANSFER_WALLET,$data,true);
+		$result = $this->post(self::URL_TRANSFER_WALLET, $data, true);
 		return $result;
 	}
 
@@ -47,12 +47,12 @@ 
 	 * @param $partner_trade_no
 	 * @return array
 	 */
-	public function queryTransferWallet($partner_trade_no){
+	public function queryTransferWallet($partner_trade_no) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["mch_id"] = $this->config["mch_id"];
 		$data["partner_trade_no"] = $partner_trade_no;
-		$result = $this->post(self::URL_QUERY_TRANSFER_WALLET,$data,true);
+		$result = $this->post(self::URL_QUERY_TRANSFER_WALLET, $data, true);
 		return $result;
 	}
 
@@ -68,8 +68,8 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function transferBankCard($partner_trade_no,$bank_no,$true_name,$bank_code,$amount,$desc){
-		if(!in_array($bank_code,array_values(self::$BANKCODE))) throw new Exception("Unsupported bank code: $bank_code");
+	public function transferBankCard($partner_trade_no, $bank_no, $true_name, $bank_code, $amount, $desc) {
+		if (!in_array($bank_code, array_values(self::$BANKCODE))) throw new Exception("Unsupported bank code: $bank_code");
 		$data = array();
 		$data["partner_trade_no"] = $partner_trade_no;
 		$enc_bank_no = $this->rsaEncrypt($bank_no);
@@ -79,15 +79,15 @@ 
 		$data["bank_code"] = $bank_code;
 		$data["desc"] = $desc;
 		$data["amount"] = $amount;
-		$result = $this->post(self::URL_TRANSFER_BANKCARD,$data,true);
+		$result = $this->post(self::URL_TRANSFER_BANKCARD, $data, true);
 		return $result;
 	}
 
-	public function rsaEncrypt($data,$pubkey = null){
-		if(!$pubkey) $pubkey = $this->getPublicKey();
+	public function rsaEncrypt($data, $pubkey = null) {
+		if (!$pubkey) $pubkey = $this->getPublicKey();
 		$encrypted = null;
 		$pubkey = openssl_get_publickey($pubkey);
-		if (@openssl_public_encrypt($data, $encrypted, $pubkey,OPENSSL_PKCS1_OAEP_PADDING))
+		if (@openssl_public_encrypt($data, $encrypted, $pubkey, OPENSSL_PKCS1_OAEP_PADDING))
 			$data = base64_encode($encrypted);
 		else
 			throw new Exception('Unable to encrypt data');
@@ -100,12 +100,12 @@ 
 	 * @param $partner_trade_no
 	 * @return array
 	 */
-	public function queryTransferBankCard($partner_trade_no){
+	public function queryTransferBankCard($partner_trade_no) {
 		$data = array();
 		$data["appid"] = $this->config["app_id"];
 		$data["mch_id"] = $this->config["mch_id"];
 		$data["partner_trade_no"] = $partner_trade_no;
-		$result = $this->post(self::URL_QUERY_TRANSFER_WALLET,$data,true);
+		$result = $this->post(self::URL_QUERY_TRANSFER_WALLET, $data, true);
 		return $result;
 	}
 
@@ -116,18 +116,18 @@ 
 	 * @return string
 	 * @throws Exception
 	 */
-	public function getPublicKey($refresh = false){
-		if(!$this->publicKey) {
+	public function getPublicKey($refresh = false) {
+		if (!$this->publicKey) {
 			if (!$refresh && file_exists($this->config["rsa_pubkey_path"])) {
 				$this->publicKey = file_get_contents($this->config["rsa_pubkey_path"]);
-			}else{
+			}else {
 				$data = array();
 				$data["mch_id"] = $this->config["mch_id"];
 				$data["sign_type"] = $this->config["sign_type"];
 				$result = $this->post(self::URL_GETPUBLICKEY, $data, true);
 				$pubkey = $result['pub_key'];
 				$this->publicKey = $this->convertPKCS1toPKCS8($pubkey);
-				if($fp = @fopen($this->config["rsa_pubkey_path"], "w")) {
+				if ($fp = @fopen($this->config["rsa_pubkey_path"], "w")) {
 					fwrite($fp, $this->publicKey);
 					fclose($fp);
 				}
@@ -136,16 +136,16 @@ 
 		return $this->publicKey;
 	}
 
-	public function setPublicKey($publicKey){
+	public function setPublicKey($publicKey) {
 		$this->publicKey = $publicKey;
 	}
 
-	private function convertPKCS1toPKCS8($pkcs1){
+	private function convertPKCS1toPKCS8($pkcs1) {
 		$start_key = $pkcs1;
 		$start_key = str_replace('-----BEGIN RSA PUBLIC KEY-----', '', $start_key);
 		$start_key = trim(str_replace('-----END RSA PUBLIC KEY-----', '', $start_key));
-		$key = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A' . str_replace("\n", '', $start_key);
-		$key = "-----BEGIN PUBLIC KEY-----\n" . wordwrap($key, 64, "\n", true) . "\n-----END PUBLIC KEY-----";
+		$key = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A'.str_replace("\n", '', $start_key);
+		$key = "-----BEGIN PUBLIC KEY-----\n".wordwrap($key, 64, "\n", true)."\n-----END PUBLIC KEY-----";
 		return $key;
 	}
 }
\ No newline at end of file

Braces +15 added lines, -8 removed lines

@@ -27,7 +27,9 @@ 
 	 */
 	public function transferWallet($partner_trade_no,$openid,$amount,$desc,$spbill_create_ip = null,$re_user_name = null,$check_name = WechatPay::CHECKNAME_FORCECHECK){
 		$data = array();
-		if($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) throw new Exception('Real name is required');
+		if($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) {
+			throw new Exception('Real name is required');
+		}
 		$data["mch_appid"] = $this->config["app_id"];
 		$data["mchid"] = $this->config["mch_id"];
 		$data["partner_trade_no"] = $partner_trade_no;
@@ -69,7 +71,9 @@ 
 	 * @throws Exception
 	 */
 	public function transferBankCard($partner_trade_no,$bank_no,$true_name,$bank_code,$amount,$desc){
-		if(!in_array($bank_code,array_values(self::$BANKCODE))) throw new Exception("Unsupported bank code: $bank_code");
+		if(!in_array($bank_code,array_values(self::$BANKCODE))) {
+			throw new Exception("Unsupported bank code: $bank_code");
+		}
 		$data = array();
 		$data["partner_trade_no"] = $partner_trade_no;
 		$enc_bank_no = $this->rsaEncrypt($bank_no);
@@ -84,13 +88,16 @@ 
 	}
 
 	public function rsaEncrypt($data,$pubkey = null){
-		if(!$pubkey) $pubkey = $this->getPublicKey();
+		if(!$pubkey) {
+			$pubkey = $this->getPublicKey();
+		}
 		$encrypted = null;
 		$pubkey = openssl_get_publickey($pubkey);
-		if (@openssl_public_encrypt($data, $encrypted, $pubkey,OPENSSL_PKCS1_OAEP_PADDING))
-			$data = base64_encode($encrypted);
-		else
-			throw new Exception('Unable to encrypt data');
+		if (@openssl_public_encrypt($data, $encrypted, $pubkey,OPENSSL_PKCS1_OAEP_PADDING)) {
+					$data = base64_encode($encrypted);
+		} else {
+					throw new Exception('Unable to encrypt data');
+		}
 		return $data;
 	}
 
@@ -120,7 +127,7 @@ 
 		if(!$this->publicKey) {
 			if (!$refresh && file_exists($this->config["rsa_pubkey_path"])) {
 				$this->publicKey = file_get_contents($this->config["rsa_pubkey_path"]);
-			}else{
+			} else{
 				$data = array();
 				$data["mch_id"] = $this->config["mch_id"];
 				$data["sign_type"] = $this->config["sign_type"];

src/WechatPay.php

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;
 	}
 
@@ -337,14 +337,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;
 	}
 
@@ -355,7 +355,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;
@@ -372,7 +372,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;
@@ -391,14 +391,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;
 	}
@@ -410,11 +410,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]);
 		}
 	}
 
@@ -425,11 +425,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]);
 		}
 	}
 
@@ -455,13 +455,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;
 	}
 
@@ -481,8 +481,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;
@@ -490,12 +490,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);
 	}
 
@@ -505,11 +505,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'];
 	}
 
@@ -518,10 +518,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'];
 	}
 
@@ -531,8 +531,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";
@@ -554,29 +554,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;
 
@@ -588,23 +588,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;
 	}
@@ -614,51 +614,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;
@@ -667,14 +667,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

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;