zhangv / wechat-pay

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

demo/autoload.php

Braces +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 if(file_exists(__DIR__ . '/../vendor/autoload.php')){
 	/** @var \Composer\Autoload\ClassLoader $loader */
 	$loader = require __DIR__ . '/../vendor/autoload.php';
-}else{//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
+} else{//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
 	function __autoload($class) {
 		$class = str_replace('zhangv\\wechat\\', 'src/', $class);
 		$file = __DIR__ . '/../' . $class . '.php';

src/HttpClient.php

Braces +9 added lines, -3 removed lines

@@ -28,8 +28,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);
@@ -41,7 +45,9 @@ 
 	}
 
 	public function post($url, $params = array(),$headers = array(),$opts = array()) {
-		if (!$this->instance)	$this->initInstance($this->timeout);
+		if (!$this->instance) {
+			$this->initInstance($this->timeout);
+		}
 		curl_setopt($this->instance, CURLOPT_URL, $url);
 		curl_setopt($this->instance, CURLOPT_POST, true);
 		curl_setopt($this->instance, CURLOPT_POSTFIELDS, $params);

src/cache/JsonFileCacheProvider.php

Braces +8 added lines, -3 removed lines

@@ -8,8 +8,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){
@@ -18,7 +21,9 @@ 
 		$file = "{$this->cacheDir}/{$key}.json";
 		$fp = fopen($file, "w");
 		fwrite($fp, json_encode($data));
-		if ($fp) fclose($fp);
+		if ($fp) {
+			fclose($fp);
+		}
 	}
 
 	public function get($key){

src/WechatOAuth.php

Braces +6 added lines, -2 removed lines

@@ -66,7 +66,9 @@ 
 	}
 
 	public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null){
-		if(!$accessToken) $accessToken = $this->getAccessToken();
+		if(!$accessToken) {
+			$accessToken = $this->getAccessToken();
+		}
 		// $url = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=$accessToken";
 		$url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type={$type}&access_token=$accessToken";
 		$this->responseJSON = $this->httpClient->get($url);
@@ -85,7 +87,9 @@ 
 				(!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? "https://" : "http://";
 			$url .= "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
 		}
-		if(!$ticket) $ticket = $this->getTicket();
+		if(!$ticket) {
+			$ticket = $this->getTicket();
+		}
 		$timestamp = time();
 		$nonceStr = $this->getNonceStr();
 		$rawString = "jsapi_ticket=$ticket&noncestr=$nonceStr&timestamp=$timestamp&url=$url";

src/WechatPay.php

Braces +100 added lines, -41 removed lines

@@ -141,7 +141,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"];
@@ -189,7 +191,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"];
@@ -213,7 +217,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"];
@@ -243,11 +249,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);
@@ -490,7 +500,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;
@@ -526,7 +538,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;
@@ -634,8 +648,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] );
 		}
@@ -649,8 +667,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] );
 		}
@@ -684,8 +706,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;
+		}
 	}
 
 	/**
@@ -713,12 +738,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;
 	}
@@ -766,7 +803,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;
@@ -808,7 +847,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);
@@ -904,7 +945,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"];
@@ -933,13 +974,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;
 	}
 
@@ -962,7 +1006,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";
@@ -1004,9 +1050,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;
 
@@ -1034,12 +1086,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;
+		}
 
 	}
 
@@ -1063,7 +1119,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'){
@@ -1082,17 +1138,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;
@@ -1103,7 +1162,7 @@ 
 		$tmp = null;
 		try{
 			$tmp = (array) simplexml_load_string($xml);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			throw $e;
 		}
 		foreach ( $tmp as $k => $v) {