zhangv / wechat-pay

demo/config.php

Spacing +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@
 	'app_id' => 'XXXXXXXXXXXXXXXXXXX', //APPID
 	'app_secret' => 'XXXXXXXXXXXXXXXXXXXXXXXXX', //App Secret
 	'api_key' =>'XXXXXXXXXXXXXXXXXXXXXXX', //支付密钥
-	'ssl_cert_path' => __DIR__ . '/../cert/apiclient_cert.pem',
-	'ssl_key_path' => __DIR__ .'/../cert/apiclient_key.pem',
+	'ssl_cert_path' => __DIR__.'/../cert/apiclient_cert.pem',
+	'ssl_key_path' => __DIR__.'/../cert/apiclient_key.pem',
 	'sign_type' => 'MD5',
 	'notify_url' => 'http://XXX.XXX/paidnotify.php',
 	'refund_notify_url' => 'http://XXX.XXX/refundednotify.php',
 	'h5_scene_info' => [//required in H5
 		'h5_info' => ['type' => 'Wap', 'wap_url' => 'http://wapurl', 'wap_name' => 'wapname']
 	],
-	'rsa_pubkey_path' => __DIR__ .'/../cert/pubkey.pem',
-	'jsapi_ticket' => __DIR__ .'/jsapi_ticket.json'
+	'rsa_pubkey_path' => __DIR__.'/../cert/pubkey.pem',
+	'jsapi_ticket' => __DIR__.'/jsapi_ticket.json'
 ];
\ No newline at end of file

src/WechatPay.php

Spacing +154 added lines, -154 removed lines

@@ -8,9 +8,9 @@ 
 use \Exception;
 
 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 CHECKNAME_FORCECHECK = 'FORCE_CHECK', CHECKNAME_NOCHECK = 'NO_CHECK';
 	/** 支付 */
 	const URL_UNIFIEDORDER = "https://api.mch.weixin.qq.com/pay/unifiedorder";
 	const URL_ORDERQUERY = "https://api.mch.weixin.qq.com/pay/orderquery";
@@ -41,7 +41,7 @@ 
 	const URL_GETPUBLICKEY = 'https://fraud.mch.weixin.qq.com/risk/getpublickey';
 	public static $BANKCODE = ['工商银行' => '1002', '农业银行' => '1005', '中国银行' => '1026', '建设银行' => '1003', '招商银行' => '1001',
 		'邮储银行' => '1066', '交通银行' => '1020', '浦发银行' => '1004', '民生银行' => '1006', '兴业银行' => '1009', '平安银行' => '1010',
-		'中信银行' => '1021', '华夏银行' => '1025', '广发银行' => '1027', '光大银行' => '1022', '北京银行' => '1032', '宁波银行' => '1056',];
+		'中信银行' => '1021', '华夏银行' => '1025', '广发银行' => '1027', '光大银行' => '1022', '北京银行' => '1032', '宁波银行' => '1056', ];
 
 	public $getSignKeyUrl = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
 	public $sandbox = false;
@@ -79,18 +79,18 @@ 
 		$this->httpClient = new HttpClient(5);
 	}
 
-	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 setHttpClient($httpClient){
+	public function setHttpClient($httpClient) {
 		$this->httpClient = $httpClient;
 	}
 
@@ -105,15 +105,15 @@ 
 	 * @param $ext array
 	 * @return string
 	 */
-	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;
-		$data["openid"]   = $openid;
+		$data["openid"] = $openid;
 		$result = $this->unifiedOrder($data);
 		return $result["prepay_id"];
 	}
@@ -128,8 +128,8 @@ 
 	 * @param $ext array
 	 * @return string
 	 */
-	public function getPrepayIdAPP($body,$out_trade_no,$total_fee,$spbill_create_ip,$ext = null) {
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function getPrepayIdAPP($body, $out_trade_no, $total_fee, $spbill_create_ip, $ext = null) {
+		$data = ($ext && is_array($ext)) ? $ext : array();
 		$data["body"]         = $body;
 		$data["out_trade_no"] = $out_trade_no;
 		$data["total_fee"]    = $total_fee;
@@ -151,12 +151,12 @@ 
 	 * @param $ext array
 	 * @return null
 	 */
-	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;
 		$data["product_id"]   = $product_id;
@@ -174,15 +174,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"];
@@ -197,21 +197,21 @@ 
 	private 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'];
-		$data["product_id"] = isset($params['product_id'])?$params['product_id']:null;//required when trade_type = NATIVE
-		$data["openid"] = isset($params['openid'])?$params['openid']:null;//required when trade_type = JSAPI
+		$data["product_id"] = isset($params['product_id']) ? $params['product_id'] : null; //required when trade_type = NATIVE
+		$data["openid"] = isset($params['openid']) ? $params['openid'] : null; //required when trade_type = JSAPI
 		$result = $this->post(self::URL_UNIFIEDORDER, $data);
 		return $result;
 	}
@@ -222,7 +222,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;
@@ -236,7 +236,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;
@@ -251,7 +251,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;
@@ -267,7 +267,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;
@@ -283,7 +283,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;
@@ -299,7 +299,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;
@@ -314,11 +314,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;
 	}
 
@@ -333,14 +333,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;
 	}
 
@@ -355,14 +355,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;
 	}
 
@@ -372,11 +372,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;
 	}
 
@@ -386,11 +386,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;
 	}
 
@@ -400,7 +400,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;
@@ -426,14 +426,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;
@@ -462,14 +462,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;
@@ -489,7 +489,7 @@ 
 	 * @throws Exception
 	 * @ref 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"];
@@ -506,14 +506,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;
 	}
@@ -526,21 +526,21 @@ 
 	 */
 	public function getPackage($prepay_id, $trade_type = WechatPay::TRADETYPE_JSAPI) {
 		$data = array();
-		if ($trade_type == WechatPay::TRADETYPE_JSAPI){
+		if ($trade_type == WechatPay::TRADETYPE_JSAPI) {
 			$data["package"]   = "prepay_id=$prepay_id";
 			$data["timeStamp"] = time();
 			$data["nonceStr"]  = $this->getNonceStr();
 			$data["appId"] = $this->config["app_id"];
 			$data["signType"]  = "MD5";
 			$data["paySign"]   = $this->sign($data);
-		} else if ($trade_type == WechatPay::TRADETYPE_APP){
+		}else if ($trade_type == WechatPay::TRADETYPE_APP) {
 			$data["package"]   = "Sign=WXPay";
 			$data['prepayid'] = $prepay_id;
 			$data['partnerid'] = $this->config["mch_id"];
 			$data["timestamp"] = time();
 			$data["noncestr"]  = $this->getNonceStr();
 			$data["appid"] = $this->config["app_id"];
-			$data["sign"]   = $this->sign($data);
+			$data["sign"] = $this->sign($data);
 		}
 		return $data;
 	}
@@ -556,15 +556,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,false);
+		$result = $this->post(self::URL_MICROPAY, $data, false);
 		return $result;
 	}
 
@@ -575,17 +575,17 @@ 
 	 * @return null
 	 * @throws Exception
 	 */
-	public function onPaidNotify($notify_data,callable $callback = null){
-		if(!is_array($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)){
-			if($callback && is_callable($callback)){
-				return call_user_func_array( $callback , [$notify_data] );
-			}else{
+		if ($this->validateSign($notify_data)) {
+			if ($callback && is_callable($callback)) {
+				return call_user_func_array($callback, [$notify_data]);
+			}else {
 				$this->responseNotify();
 			}
-		}else{
+		}else {
 			throw new Exception('Invalid paid notify data');
 		}
 	}
@@ -597,17 +597,17 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function onRefundedNotify($notify_data,callable $callback = null){
-		if(!is_array($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)){
-			if($callback && is_callable($callback)){
-				return call_user_func_array( $callback , $notify_data );
-			}else{
+		if ($this->validateSign($notify_data)) {
+			if ($callback && is_callable($callback)) {
+				return call_user_func_array($callback, $notify_data);
+			}else {
 				$this->responseNotify();
 			}
-		}else{
+		}else {
 			throw new Exception('Invalid refunded notify data');
 		}
 	}
@@ -631,7 +631,7 @@ 
 	 * @param $return_code string 返回状态码 SUCCESS/FAIL
 	 * @param $return_msg string 返回信息
 	 */
-	public function responseNotify($return_code="SUCCESS", $return_msg= 'OK') {
+	public function responseNotify($return_code = "SUCCESS", $return_msg = 'OK') {
 		$data = array();
 		$data["return_code"] = $return_code;
 		if ($return_msg) {
@@ -657,8 +657,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;
@@ -666,12 +666,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;
 		$result = $this->post(self::URL_REPORT, $data, false);
 		return $result;
 	}
@@ -682,11 +682,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'];
 	}
 
@@ -695,11 +695,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'];
 	}
 
@@ -716,19 +716,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;
 	}
 
@@ -738,12 +738,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;
 	}
 
@@ -759,8 +759,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);
@@ -770,7 +770,7 @@ 
 		$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;
 	}
 
@@ -784,14 +784,14 @@ 
 	 * @param array $ext
 	 * @return array
 	 */
-	public function sendCoupon($coupon_stock_id,$open_id,$partner_trade_no,$op_user_id = '',$ext = array()){
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
+	public function sendCoupon($coupon_stock_id, $open_id, $partner_trade_no, $op_user_id = '', $ext = array()) {
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
 		$data["partner_trade_no"] = $partner_trade_no;
 		$data["coupon_stock_id"] = $coupon_stock_id;
 		$data["openid_count"] = 1;
 		$data["open_id"] = $open_id;
 		$data["op_user_id"] = $op_user_id;
-		$result = $this->post(self::URL_SEND_COUPON,$data,true);
+		$result = $this->post(self::URL_SEND_COUPON, $data, true);
 		return $result;
 	}
 
@@ -802,11 +802,11 @@ 
 	 * @param string $op_user_id
 	 * @return array
 	 */
-	public function queryCouponStock($coupon_stock_id,$op_user_id = ''){
+	public function queryCouponStock($coupon_stock_id, $op_user_id = '') {
 		$data = array();
 		$data["coupon_stock_id"] = $coupon_stock_id;
 		$data["op_user_id"] = $op_user_id;
-		$result = $this->post(self::URL_QUERY_COUPON_STOCK,$data,false);
+		$result = $this->post(self::URL_QUERY_COUPON_STOCK, $data, false);
 		return $result;
 	}
 
@@ -820,13 +820,13 @@ 
 	 * @param array $ext
 	 * @return array
 	 */
-	public function queryCouponsInfo($coupon_id,$open_id,$stock_id,$op_user_id = '',$ext = array()){
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
+	public function queryCouponsInfo($coupon_id, $open_id, $stock_id, $op_user_id = '', $ext = array()) {
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
 		$data["coupon_id"] = $coupon_id;
 		$data["stock_id"] = $stock_id;
 		$data["open_id"] = $open_id;
 		$data["op_user_id"] = $op_user_id;
-		$result = $this->post(self::URL_QUERY_COUPON_INFO,$data,false);
+		$result = $this->post(self::URL_QUERY_COUPON_INFO, $data, false);
 		return $result;
 	}
 
@@ -837,7 +837,7 @@ 
 	 * @return string
 	 * @throws Exception
 	 */
-	public function getPublicKey($refresh = false){
+	public function getPublicKey($refresh = false) {
 		if (!$refresh && file_exists($this->config["rsa_pubkey_path"])) {
 			$pubkey = file_get_contents($this->config["rsa_pubkey_path"]);
 			return $pubkey;
@@ -845,7 +845,7 @@ 
 		$data = array();
 		$data["mch_id"] = $this->config["mch_id"];
 		$data["sign_type"] = $this->config["sign_type"];
-		$result = $this->post(self::URL_GETPUBLICKEY,$data,true);
+		$result = $this->post(self::URL_GETPUBLICKEY, $data, true);
 		$pubkey = $result['pub_key'];
 		$pubkey = $this->convertPKCS1toPKCS8($pubkey);
 		$fp = fopen($this->config["rsa_pubkey_path"], "w");
@@ -858,20 +858,20 @@ 
 		}
 	}
 
-	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;
 	}
 
-	public function rsaEncrypt($data){
+	public function rsaEncrypt($data) {
 		$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');
@@ -884,12 +884,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;
 	}
 
@@ -898,10 +898,10 @@ 
 	 * @ref 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'];
 	}
 
@@ -909,7 +909,7 @@ 
 	 * 获取JSAPI所需要的页面参数
 	 * @return array
 	 */
-	public function getSignPackage($url){
+	public function getSignPackage($url) {
 		$jsapiTicket = $this->getJSAPITicket();
 		$timestamp = time();
 		$nonceStr = $this->getNonceStr();
@@ -931,8 +931,8 @@ 
 	 * 获取JSAPI Ticket
 	 * @return string
 	 */
-	public function getJSAPITicket(){
-		if(isset($this->config['jsapi_ticket']) && file_exists($this->config['jsapi_ticket'])){
+	public function getJSAPITicket() {
+		if (isset($this->config['jsapi_ticket']) && file_exists($this->config['jsapi_ticket'])) {
 			$data = json_decode(file_get_contents($this->config['jsapi_ticket']));
 			if (!$data || $data->expire_time < time()) {
 				$data = $this->getWechatOAuth()->getTicket();
@@ -945,10 +945,10 @@ 
 		}
 	}
 
-	private 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);
+	private 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;
 
@@ -960,53 +960,53 @@ 
 			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])){
+		if (in_array($url, [self::URL_DOWNLOADBILL])) {
 			$processResponse = false;
 		}
-		if($this->sandbox === true){
+		if ($this->sandbox === true) {
 			$host = "https://api.mch.weixin.qq.com";
-			$url = str_replace($host,'',$url);
+			$url = str_replace($host, '', $url);
 			$url = "{$host}/sandboxnew{$url}";
 		}
-		$content = $this->httpClient->post($url,$this->requestXML,[],$opts);
-		if(!$content) throw new Exception("Empty response with {$this->requestXML}");
+		$content = $this->httpClient->post($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;
 
 	}
 
-	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($result["return_code"] == "FAIL"){
+		}else {
+			if ($result["return_code"] == "FAIL") {
 				throw new Exception($this->returnMsg);
-			}else{
+			}else {
 				$this->resultCode = $result['result_code'];
 				$this->errCode = $result['err_code'];
 				$this->errCodeDes = $result['err_code_des'];
@@ -1015,28 +1015,28 @@ 
 		}
 	}
 
-	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;
@@ -1045,17 +1045,17 @@ 
 	private function xml2array($xml) {
 		$array = array();
 		$tmp = array();
-		try{
+		try {
 			$tmp = (array) simplexml_load_string($xml);
-		}catch(Exception $e){}
-		foreach ( $tmp as $k => $v) {
+		} catch (Exception $e) {}
+		foreach ($tmp as $k => $v) {
 			$array[$k] = (string) $v;
 		}
 		return $array;
 	}
 
 	private function getNonceStr() {
-		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
+		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
 	}
 
 }
\ No newline at end of file

Braces +73 added lines, -35 removed lines

@@ -182,7 +182,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"];
@@ -433,7 +435,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;
@@ -469,7 +473,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;
@@ -582,10 +588,10 @@ 
 		if($this->validateSign($notify_data)){
 			if($callback && is_callable($callback)){
 				return call_user_func_array( $callback , [$notify_data] );
-			}else{
+			} else{
 				$this->responseNotify();
 			}
-		}else{
+		} else{
 			throw new Exception('Invalid paid notify data');
 		}
 	}
@@ -604,10 +610,10 @@ 
 		if($this->validateSign($notify_data)){
 			if($callback && is_callable($callback)){
 				return call_user_func_array( $callback , $notify_data );
-			}else{
+			} else{
 				$this->responseNotify();
 			}
-		}else{
+		} else{
 			throw new Exception('Invalid refunded notify data');
 		}
 	}
@@ -666,12 +672,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;
+		}
 		$result = $this->post(self::URL_REPORT, $data, false);
 		return $result;
 	}
@@ -718,7 +736,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;
@@ -760,7 +780,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);
@@ -853,7 +875,7 @@ 
 			fwrite($fp, $pubkey);
 			fclose($fp);
 			return $pubkey;
-		}else {
+		} else {
 			throw new Exception("RSA public key not found");
 		}
 	}
@@ -871,10 +893,11 @@ 
 		$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;
 	}
 
@@ -938,7 +961,9 @@ 
 				$data = $this->getWechatOAuth()->getTicket();
 				$fp = fopen($this->config["jsapi_ticket"], "w");
 				fwrite($fp, $data);
-				if ($fp) fclose($fp);
+				if ($fp) {
+					fclose($fp);
+				}
 				$data = json_decode($data);
 			}
 			return $data->jsapi_ticket;
@@ -946,9 +971,15 @@ 
 	}
 
 	private 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;
 
@@ -976,12 +1007,16 @@ 
 			$url = "{$host}/sandboxnew{$url}";
 		}
 		$content = $this->httpClient->post($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;
+		}
 
 	}
 
@@ -1000,13 +1035,13 @@ 
 				$this->errCode = $result['err_code'];
 				$this->errCodeDes = $result['err_code_des'];
 				throw new Exception("[$this->errCode]$this->errCodeDes");
-			}else{
+			} else{
 				return $result;
 			}
 		} else {
 			if($result["return_code"] == "FAIL"){
 				throw new Exception($this->returnMsg);
-			}else{
+			} else{
 				$this->resultCode = $result['result_code'];
 				$this->errCode = $result['err_code'];
 				$this->errCodeDes = $result['err_code_des'];
@@ -1026,17 +1061,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;
@@ -1047,7 +1085,7 @@ 
 		$tmp = array();
 		try{
 			$tmp = (array) simplexml_load_string($xml);
-		}catch(Exception $e){}
+		} catch(Exception $e){}
 		foreach ( $tmp as $k => $v) {
 			$array[$k] = (string) $v;
 		}