zhangv / wechat-pay

src/service/Mchpay.php

Spacing +22 added lines, -22 removed lines

@@ -24,8 +24,8 @@ 
 	 * @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){
-		if($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) throw new Exception('Real name is required');
+	public function transferWallet($partner_trade_no, $openid, $amount, $desc, $spbill_create_ip = null, $re_user_name = null, $check_name = WechatPay::CHECKNAME_FORCECHECK) {
+		if ($check_name == WechatPay::CHECKNAME_FORCECHECK && !$re_user_name) throw new Exception('Real name is required');
 		$data = [
 			"mch_appid" => $this->config["app_id"],
 			"mchid" => $this->config["mch_id"],
@@ -33,11 +33,11 @@ 
 			"openid" => $openid,
 			"amount" => $amount,
 			"desc" => $desc,
-			'spbill_create_ip' => $spbill_create_ip?:$_SERVER['SERVER_ADDR'],
+			'spbill_create_ip' => $spbill_create_ip ?: $_SERVER['SERVER_ADDR'],
 			"check_name" => $check_name,
 			"re_user_name" => $re_user_name
 		];
-		return $this->post(self::URL_TRANSFER_WALLET,$data,true);
+		return $this->post(self::URL_TRANSFER_WALLET, $data, true);
 	}
 
 	/**
@@ -45,13 +45,13 @@ 
 	 * @param $partner_trade_no
 	 * @return array
 	 */
-	public function queryTransferWallet($partner_trade_no){
+	public function queryTransferWallet($partner_trade_no) {
 		$data = [
 			"appid" => $this->config["app_id"],
 			"mch_id" => $this->config["mch_id"],
 			"partner_trade_no" => $partner_trade_no
 		];
-		return $this->post(self::URL_QUERY_TRANSFER_WALLET,$data,true);
+		return $this->post(self::URL_QUERY_TRANSFER_WALLET, $data, true);
 	}
 
 	/**
@@ -65,8 +65,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 = [
 			"partner_trade_no" => $partner_trade_no,
 			"enc_bank_no" => $this->rsaEncrypt($bank_no),
@@ -75,14 +75,14 @@ 
 			"desc" => $desc,
 			"amount" => $amount
 		];
-		return $this->post(self::URL_TRANSFER_BANKCARD,$data,true);
+		return $this->post(self::URL_TRANSFER_BANKCARD, $data, true);
 	}
 
-	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');
@@ -94,13 +94,13 @@ 
 	 * @param $partner_trade_no
 	 * @return array
 	 */
-	public function queryTransferBankCard($partner_trade_no){
+	public function queryTransferBankCard($partner_trade_no) {
 		$data = [
 			"appid" => $this->config["app_id"],
 			"mch_id" => $this->config["mch_id"],
 			"partner_trade_no" => $partner_trade_no
 		];
-		return $this->post(self::URL_QUERY_TRANSFER_WALLET,$data,true);
+		return $this->post(self::URL_QUERY_TRANSFER_WALLET, $data, true);
 	}
 
 	/**
@@ -110,18 +110,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);
 				}
@@ -130,16 +130,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;
 	}
 

Braces +15 added lines, -8 removed lines

@@ -25,7 +25,9 @@ 
 	 * @throws Exception
 	 */
 	public function transferWallet($partner_trade_no,$openid,$amount,$desc,$spbill_create_ip = null,$re_user_name = null,$check_name = WechatPay::CHECKNAME_FORCECHECK){
-		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"],
 			"mchid" => $this->config["mch_id"],
@@ -66,7 +68,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 = [
 			"partner_trade_no" => $partner_trade_no,
 			"enc_bank_no" => $this->rsaEncrypt($bank_no),
@@ -79,13 +83,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;
 	}
 
@@ -114,7 +121,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"];