zhangv / wechat-pay

src/HttpClient.php

Braces +15 added lines, -5 removed lines

@@ -32,8 +32,12 @@ 
 	}
 
 	public function get($url,$params = array(),$headers = array(),$opts = array()) {
-		if (!$this->instance)	$this->initInstance($this->timeout);
-		if($params && count($params) > 0) $url .= '?' . http_build_query($params);
+		if (!$this->instance) {
+			$this->initInstance($this->timeout);
+		}
+		if($params && count($params) > 0) {
+			$url .= '?' . http_build_query($params);
+		}
 		curl_setopt($this->instance, CURLOPT_URL, $url);
 		curl_setopt($this->instance, CURLOPT_HTTPGET, true);
 		curl_setopt($this->instance, CURLOPT_HTTPHEADER, $headers);
@@ -45,7 +49,9 @@ 
 	}
 
 	public function post($url, $params = array(),$headers = array(),$opts = array()) {
-		if (!$this->instance)	$this->initInstance($this->timeout);
+		if (!$this->instance) {
+			$this->initInstance($this->timeout);
+		}
 		curl_setopt($this->instance, CURLOPT_URL, $url);
 		curl_setopt($this->instance, CURLOPT_POST, true);
 		curl_setopt($this->instance, CURLOPT_POSTFIELDS, $params);
@@ -65,8 +71,12 @@ 
 	}
 
 	public function setOpt($optArray) {
-		if (!$this->instance)	return;
-		if (!is_array($optArray))	throw new \Exception("Argument is not an array!");
+		if (!$this->instance) {
+			return;
+		}
+		if (!is_array($optArray)) {
+			throw new \Exception("Argument is not an array!");
+		}
 		curl_setopt_array($this->instance, $optArray);
 	}
 

demo/wxoauthcallback.php

Braces +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 
 	if(!$at || empty($at->openid)){
 		die('授权失败');
-	}else{
+	} else{
 		$accesstoken = $at->access_token;
 		$openid = $at->openid;
 		header('Location: '."http://{$_SERVER['HTTP_HOST']}/wechat-pay/demo/pay.php?openid=$openid");
 	}
-}else{
+} else{
 	die('授权失败，请重试。');
 }
\ No newline at end of file

src/WechatPay.php

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;
 	}
 
@@ -930,7 +953,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;
@@ -938,9 +963,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;
 
@@ -968,12 +999,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;
+		}
 
 	}
 
@@ -992,13 +1027,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'];
@@ -1018,17 +1053,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;
@@ -1039,7 +1077,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;
 		}