zhangv / wechat-pay

src/service/App.php

Spacing +3 added lines, -3 removed lines

@@ -36,8 +36,8 @@ 
 	 * @param $ext array
 	 * @return string
 	 */
-	public function getPrepayId($body,$out_trade_no,$total_fee,$spbill_create_ip,$ext = null) {
-		$data = ($ext && is_array($ext))?$ext:array();
+	public function getPrepayId($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;
@@ -62,7 +62,7 @@ 
 		$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;
 	}
 }
\ No newline at end of file

src/util/WechatOAuth.php

Spacing +16 added lines, -16 removed lines

@@ -8,7 +8,7 @@ 
 namespace zhangv\wechat\pay\util;
 
 class WechatOAuth {
-	const TICKETTYPE_JSAPI = 'jsapi',TICKETTYPE_WXCARD = 'wx_card';
+	const TICKETTYPE_JSAPI = 'jsapi', TICKETTYPE_WXCARD = 'wx_card';
 	public $responseJSON = null;
 	public $errCode = null;
 	public $errMsg = null;
@@ -18,46 +18,46 @@ 
 	private $httpClient = null;
 	private $accessToken = null;
 
-	public function __construct($appId,$appSecret) {
+	public function __construct($appId, $appSecret) {
 		$this->appId = $appId;
 		$this->appSecret = $appSecret;
 		$this->httpClient = new HttpClient();
 	}
 
-	public function setHttpClient($httpClient){
+	public function setHttpClient($httpClient) {
 		$this->httpClient = $httpClient;
 	}
 
-	public function authorizeURI($redirectURI,$scope = 'snsapi_userinfo',$state = ''){
+	public function authorizeURI($redirectURI, $scope = 'snsapi_userinfo', $state = '') {
 		$redirectURI = urlencode($redirectURI);
 		return "https://open.weixin.qq.com/connect/oauth2/authorize?appid={$this->appId}&redirect_uri={$redirectURI}&response_type=code&scope=$scope&state=$state#wechat_redirect";
 	}
 
-	public function authorize($code){
+	public function authorize($code) {
 		$url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={$this->appId}&secret={$this->appSecret}&code=$code&grant_type=authorization_code";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getUserInfo($openId){
+	public function getUserInfo($openId) {
 		$url = "https://api.weixin.qq.com/sns/userinfo?access_token={$this->accessToken}&openid=$openId&lang=zh_CN";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function refreshToken($refreshToken){
+	public function refreshToken($refreshToken) {
 		$url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid={$this->appId}&grant_type=refresh_token&refresh_token=$refreshToken";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function verifyToken($accessToken,$openId){
+	public function verifyToken($accessToken, $openId) {
 		$url = "https://api.weixin.qq.com/sns/auth?access_token=$accessToken&openid=$openId";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getAccessToken(){
+	public function getAccessToken() {
 		$url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={$this->appId}&secret={$this->appSecret}";
 		$this->responseJSON = $this->httpClient->get($url);
 		$json = json_decode($this->responseJSON);
@@ -65,27 +65,27 @@ 
 		return $this->accessToken;
 	}
 
-	public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null){
-		if(!$accessToken) $accessToken = $this->getAccessToken();
+	public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null) {
+		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);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getSession($code){
+	public function getSession($code) {
 		$url = "https://api.weixin.qq.com/sns/jscode2session?appid={$this->appId}&secret={$this->appSecret}&js_code=$code&grant_type=authorization_code";
 		$this->responseJSON = $this->httpClient->get($url);
 		return json_decode($this->responseJSON);
 	}
 
-	public function getSignPackage($url = null, $ticket = null){
-		if(!$url){
+	public function getSignPackage($url = null, $ticket = null) {
+		if (!$url) {
 			$url = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ||
 				(!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";
@@ -103,6 +103,6 @@ 
 	}
 
 	private function getNonceStr() {
-		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
+		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
 	}
 }

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/util/HttpClient.php

Spacing +10 added lines, -10 removed lines

@@ -7,9 +7,9 @@ 
  */
 namespace zhangv\wechat\pay\util;
 
-class HttpClient{
+class HttpClient {
 
-	const GET = 'get',POST = 'post', DELETE = 'delete',PUT = 'put';
+	const GET = 'get', POST = 'post', DELETE = 'delete', PUT = 'put';
 	private $instance = null;
 	private $errNo = null;
 	private $info = null;
@@ -19,8 +19,8 @@ 
 		$this->initInstance($timeout);
 	}
 
-	public function initInstance($timeout){
-		if(!$this->instance) {
+	public function initInstance($timeout) {
+		if (!$this->instance) {
 			$this->instance = curl_init();
 			curl_setopt($this->instance, CURLOPT_TIMEOUT, intval($timeout));
 			curl_setopt($this->instance, CURLOPT_RETURNTRANSFER, true);
@@ -29,26 +29,26 @@ 
 		}
 	}
 
-	public function get($url,$params = array(),$headers = array(),$opts = array()) {
+	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 ($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);
-		curl_setopt_array($this->instance,$opts);
+		curl_setopt_array($this->instance, $opts);
 		$result = $this->execute();
 		curl_close($this->instance);
 		$this->instance = null;
 		return $result;
 	}
 
-	public function post($url, $params = array(),$headers = array(),$opts = array()) {
+	public function post($url, $params = array(), $headers = array(), $opts = array()) {
 		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);
 		curl_setopt($this->instance, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt_array($this->instance,$opts);
+		curl_setopt_array($this->instance, $opts);
 		$result = $this->execute();
 		curl_close($this->instance);
 		$this->instance = null;
@@ -62,7 +62,7 @@ 
 		return $result;
 	}
 
-	public function getInfo(){
+	public function getInfo() {
 		return $this->info;
 	}
 }
\ No newline at end of file

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/service/Jsapi.php

Spacing +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@
 	 * @return string
 	 * @throws \Exception
 	 */
-	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;
-		if(!$openid) throw new Exception('openid is required when trade_type is JSAPI');
-		$data["openid"]   = $openid;
+		if (!$openid) throw new Exception('openid is required when trade_type is JSAPI');
+		$data["openid"] = $openid;
 		$result = $this->unifiedOrder($data);
 		return $result["prepay_id"];
 	}

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,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"];

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"];