zhangv / wechat-pay

src/cache/JsonFileCacheProvider.php

Braces +5 added lines, -2 removed lines

@@ -10,8 +10,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){

Spacing +9 added lines, -9 removed lines

@@ -6,30 +6,30 @@ 
  * @author zhangv
  */
 namespace zhangv\wechat\pay\cache;
-class JsonFileCacheProvider implements CacheProvider{
+class JsonFileCacheProvider implements CacheProvider {
 	private $cacheDir = null;
 
-	public function __construct($cacheDir = null){
-		if(!$cacheDir) $this->cacheDir = __DIR__;
+	public function __construct($cacheDir = null) {
+		if (!$cacheDir) $this->cacheDir = __DIR__;
 		else $this->cacheDir = $cacheDir;
 	}
 
-	public function set($key,$jsonobj,$expireAt = null){
+	public function set($key, $jsonobj, $expireAt = null) {
 		$data = $jsonobj;
 		$data->expires_at = $expireAt;
 		$file = "{$this->cacheDir}/{$key}.json";
-		if($fp = @fopen($file, "w")){
+		if ($fp = @fopen($file, "w")) {
 			fwrite($fp, json_encode($data));
 			fclose($fp);
 		}
 	}
 
-	public function get($key){
+	public function get($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		$cache = null;
-		if(file_exists($file)){
+		if (file_exists($file)) {
 			$cache = json_decode(file_get_contents($file));
-			if($cache->expires_at < time()){
+			if ($cache->expires_at < time()) {
 				$cache = null;
 				$this->clear($key);
 			}
@@ -37,7 +37,7 @@ 
 		return $cache;
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		if (file_exists($file)) {
 			unlink($file);

src/cache/CacheProvider.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  */
 namespace zhangv\wechat\pay\cache;
 
-interface CacheProvider{
-	function set($key,$value,$expireAt);
+interface CacheProvider {
+	function set($key, $value, $expireAt);
 	function get($key);
 	function clear($key);
 }
\ No newline at end of file

src/cache/RedisCacheProvider.php

Spacing +5 added lines, -5 removed lines

@@ -6,25 +6,25 @@
  * @author zhangv
  */
 namespace zhangv\wechat\pay\cache;
-class RedisCacheProvider implements CacheProvider{
+class RedisCacheProvider implements CacheProvider {
 	/** @var Redis */
 	private $redis = null;
 
-	public function __construct($redis = null){
+	public function __construct($redis = null) {
 		$this->redis = $redis;
 	}
 
-	public function set($key,$jsonobj,$expireAt){
+	public function set($key, $jsonobj, $expireAt) {
 		$data = $jsonobj;
 		$data->expires_at = $expireAt;
 		$this->redis->set($key, json_encode($data));
 	}
 
-	public function get($key){
+	public function get($key) {
 		return $this->redis->get($key);
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$this->redis->delete($key);
 	}
 }
\ No newline at end of file

src/service/Mweb.php

Spacing +4 added lines, -4 removed lines

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

Braces +3 added lines, -1 removed lines

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

src/service/Redpack.php

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,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;
@@ -72,7 +74,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;

Spacing +6 added lines, -6 removed lines

@@ -28,14 +28,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;
@@ -62,14 +62,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;
@@ -87,7 +87,7 @@ 
 	 * @return array
 	 * @throws Exception
 	 */
-	public function getHbInfo($mch_billno){
+	public function getHbInfo($mch_billno) {
 		$data = array();
 		$data["mch_billno"] = $mch_billno;
 		$data["appid"] = $this->config["app_id"];

src/service/Weapp.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/Native.php

Spacing +4 added lines, -4 removed lines

@@ -38,15 +38,15 @@
 	 * @return string
 	 * @throws Exception
 	 */
-	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;
-		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"];

Braces +3 added lines, -1 removed lines

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

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);