Completed
Push — master ( 9bc9b6...ec4bbc )
by Wei
04:31
created
src/cache/JsonFileCacheProvider.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,30 +6,30 @@  discard block
 block discarded – undo
6 6
  * @author zhangv
7 7
  */
8 8
 namespace zhangv\wechat\pay\cache;
9
-class JsonFileCacheProvider implements CacheProvider{
9
+class JsonFileCacheProvider implements CacheProvider {
10 10
 	private $cacheDir = null;
11 11
 
12
-	public function __construct($cacheDir = null){
13
-		if(!$cacheDir) $this->cacheDir = __DIR__;
12
+	public function __construct($cacheDir = null) {
13
+		if (!$cacheDir) $this->cacheDir = __DIR__;
14 14
 		else $this->cacheDir = $cacheDir;
15 15
 	}
16 16
 
17
-	public function set($key,$jsonobj,$expireAt = null){
17
+	public function set($key, $jsonobj, $expireAt = null) {
18 18
 		$data = $jsonobj;
19 19
 		$data->expires_at = $expireAt;
20 20
 		$file = "{$this->cacheDir}/{$key}.json";
21
-		if($fp = @fopen($file, "w")){
21
+		if ($fp = @fopen($file, "w")) {
22 22
 			fwrite($fp, json_encode($data));
23 23
 			fclose($fp);
24 24
 		}
25 25
 	}
26 26
 
27
-	public function get($key){
27
+	public function get($key) {
28 28
 		$file = "{$this->cacheDir}/{$key}.json";
29 29
 		$cache = null;
30
-		if(file_exists($file)){
30
+		if (file_exists($file)) {
31 31
 			$cache = json_decode(file_get_contents($file));
32
-			if($cache->expires_at < time()){
32
+			if ($cache->expires_at < time()) {
33 33
 				$cache = null;
34 34
 				$this->clear($key);
35 35
 			}
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		return $cache;
38 38
 	}
39 39
 
40
-	public function clear($key){
40
+	public function clear($key) {
41 41
 		$file = "{$this->cacheDir}/{$key}.json";
42 42
 		if (file_exists($file)) {
43 43
 			unlink($file);
Please login to merge, or discard this patch.
src/cache/CacheProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
  */
8 8
 namespace zhangv\wechat\pay\cache;
9 9
 
10
-interface CacheProvider{
11
-	function set($key,$value,$expireAt);
10
+interface CacheProvider {
11
+	function set($key, $value, $expireAt);
12 12
 	function get($key);
13 13
 	function clear($key);
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
src/cache/RedisCacheProvider.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,25 +6,25 @@
 block discarded – undo
6 6
  * @author zhangv
7 7
  */
8 8
 namespace zhangv\wechat\pay\cache;
9
-class RedisCacheProvider implements CacheProvider{
9
+class RedisCacheProvider implements CacheProvider {
10 10
 	/** @var Redis */
11 11
 	private $redis = null;
12 12
 
13
-	public function __construct($redis = null){
13
+	public function __construct($redis = null) {
14 14
 		$this->redis = $redis;
15 15
 	}
16 16
 
17
-	public function set($key,$jsonobj,$expireAt){
17
+	public function set($key, $jsonobj, $expireAt) {
18 18
 		$data = $jsonobj;
19 19
 		$data->expires_at = $expireAt;
20 20
 		$this->redis->set($key, json_encode($data));
21 21
 	}
22 22
 
23
-	public function get($key){
23
+	public function get($key) {
24 24
 		return $this->redis->get($key);
25 25
 	}
26 26
 
27
-	public function clear($key){
27
+	public function clear($key) {
28 28
 		$this->redis->delete($key);
29 29
 	}
30 30
 }
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
src/service/Mweb.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,15 +35,15 @@
 block discarded – undo
35 35
 	 * @return string
36 36
 	 * @throws Exception
37 37
 	 */
38
-	public function getMwebUrl($body,$out_trade_no,$total_fee,$ext = null){
39
-		$data = ($ext && is_array($ext))?$ext:array();
38
+	public function getMwebUrl($body, $out_trade_no, $total_fee, $ext = null) {
39
+		$data = ($ext && is_array($ext)) ? $ext : array();
40 40
 		$data["body"]         = $body;
41 41
 		$data["out_trade_no"] = $out_trade_no;
42 42
 		$data["total_fee"]    = $total_fee;
43
-		$data["spbill_create_ip"] = isset($_SERVER["REMOTE_ADDR"])?$_SERVER["REMOTE_ADDR"]:'';
43
+		$data["spbill_create_ip"] = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : '';
44 44
 		$data["notify_url"]   = $this->config["notify_url"];
45 45
 		$data["trade_type"]   = self::TRADETYPE_MWEB;
46
-		if(!isset($this->config['h5_scene_info'])) throw new Exception('h5_scene_info should be configured');
46
+		if (!isset($this->config['h5_scene_info'])) throw new Exception('h5_scene_info should be configured');
47 47
 		$data["scene_info"]   = json_encode($this->config['h5_scene_info']);
48 48
 		$result = $this->unifiedOrder($data);
49 49
 		return $result["mweb_url"];
Please login to merge, or discard this patch.
src/service/Micro.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 	 * @param array $ext
38 38
 	 * @return array
39 39
 	 */
40
-	public function microPay($body,$out_trade_no,$total_fee,$spbill_create_ip,$auth_code,$ext = array()){
41
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
40
+	public function microPay($body, $out_trade_no, $total_fee, $spbill_create_ip, $auth_code, $ext = array()) {
41
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
42 42
 		$data["appid"] = $this->config["app_id"];
43 43
 		$data["body"]         = $body;
44 44
 		$data["out_trade_no"] = $out_trade_no;
45 45
 		$data["total_fee"]    = $total_fee;
46 46
 		$data["spbill_create_ip"] = $spbill_create_ip;
47 47
 		$data["auth_code"] = $auth_code;
48
-		$result = $this->post(self::URL_MICROPAY,$data,true);
48
+		$result = $this->post(self::URL_MICROPAY, $data, true);
49 49
 		return $result;
50 50
 	}
51 51
 
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 	 * @param $auth_code
56 56
 	 * @return mixed
57 57
 	 */
58
-	public function authCodeToOpenId($auth_code){
58
+	public function authCodeToOpenId($auth_code) {
59 59
 		$data = array();
60 60
 		$data["appid"] = $this->config["app_id"];
61 61
 		$data["auth_code"] = $auth_code;
62
-		$result = $this->post(self::URL_AUTHCODETOOPENID,$data,false);
62
+		$result = $this->post(self::URL_AUTHCODETOOPENID, $data, false);
63 63
 		return $result['openid'];
64 64
 	}
65 65
 
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 * @param $out_trade_no string 商户订单号
71 71
 	 * @return array
72 72
 	 */
73
-	public function reverseByOutTradeNo($out_trade_no){
73
+	public function reverseByOutTradeNo($out_trade_no) {
74 74
 		$data = array();
75 75
 		$data["appid"] = $this->config["app_id"];
76 76
 		$data["out_trade_no"] = $out_trade_no;
77
-		$result = $this->post(self::URL_REVERSE, $data,true);
77
+		$result = $this->post(self::URL_REVERSE, $data, true);
78 78
 		return $result;
79 79
 	}
80 80
 
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
 	 * @param $transaction_id string 微信订单号
85 85
 	 * @return array
86 86
 	 */
87
-	public function reverseByTransactionId($transaction_id){
87
+	public function reverseByTransactionId($transaction_id) {
88 88
 		$data = array();
89 89
 		$data["appid"] = $this->config["app_id"];
90 90
 		$data["transaction_id"] = $transaction_id;
91
-		$result = $this->post(self::URL_REVERSE, $data,true);
91
+		$result = $this->post(self::URL_REVERSE, $data, true);
92 92
 		return $result;
93 93
 	}
94 94
 }
95 95
\ No newline at end of file
Please login to merge, or discard this patch.
src/service/Redpack.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,14 +29,14 @@  discard block
 block discarded – undo
29 29
 	 * @return array
30 30
 	 * @throws Exception
31 31
 	 */
32
-	public function sendRedPack($mch_billno,$send_name,$re_openid,$total_amount,$total_num,$wishing,$act_name,$remark,$scene_id = '',$riskinfo = '',$consume_mch_id = ''){
32
+	public function sendRedPack($mch_billno, $send_name, $re_openid, $total_amount, $total_num, $wishing, $act_name, $remark, $scene_id = '', $riskinfo = '', $consume_mch_id = '') {
33 33
 		$data = array();
34 34
 		$data["wxappid"] = $this->config["app_id"];
35 35
 		$data["mch_billno"] = $mch_billno;
36 36
 		$data["send_name"] = $send_name;
37 37
 		$data["re_openid"] = $re_openid;
38 38
 		$data["total_amount"] = $total_amount;
39
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000");
39
+		if ($total_amount > 20000 && trim($scene_id) == '') throw new Exception("scene_id is required when total_amount beyond 20000");
40 40
 		$data["total_num"] = $total_num;
41 41
 		$data["wishing"] = $wishing;
42 42
 		$data["act_name"] = $act_name;
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
 	 * @return array
66 66
 	 * @throws Exception
67 67
 	 */
68
-	public function sendGroupRedPack($mch_billno,$send_name,$re_openid,$total_amount,$total_num,$wishing,$act_name,$remark,$scene_id = '',$riskinfo = '',$consume_mch_id = ''){
68
+	public function sendGroupRedPack($mch_billno, $send_name, $re_openid, $total_amount, $total_num, $wishing, $act_name, $remark, $scene_id = '', $riskinfo = '', $consume_mch_id = '') {
69 69
 		$data = array();
70
-		$data["wxappid"] = $this->config["app_id"];//NOTE: WXappid
70
+		$data["wxappid"] = $this->config["app_id"]; //NOTE: WXappid
71 71
 		$data["mch_billno"] = $mch_billno;
72 72
 		$data["send_name"] = $send_name;
73 73
 		$data["re_openid"] = $re_openid;
74 74
 		$data["total_amount"] = $total_amount;
75
-		if($total_amount > 20000 && trim($scene_id)=='') throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
75
+		if ($total_amount > 20000 && trim($scene_id) == '') throw new Exception("scene_id is required when total_amount beyond 20000(200rmb)");
76 76
 		$data["total_num"] = $total_num;
77 77
 		$data["amt_type"] = 'ALL_RAND'; //红包金额设置方式 ALL_RAND—全部随机
78 78
 		$data["wishing"] = $wishing;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @throws Exception
93 93
 	 * @link https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_6&index=5
94 94
 	 */
95
-	public function getHbInfo($mch_billno){
95
+	public function getHbInfo($mch_billno) {
96 96
 		$data = array();
97 97
 		$data["mch_billno"] = $mch_billno;
98 98
 		$data["appid"] = $this->config["app_id"];
Please login to merge, or discard this patch.
src/service/Weapp.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -38,16 +38,16 @@
 block discarded – undo
38 38
 	 * @return string
39 39
 	 * @throws \Exception
40 40
 	 */
41
-	public function getPrepayId($body,$out_trade_no,$total_fee,$openid,$spbill_create_ip = null,$ext = null) {
42
-		$data = ($ext && is_array($ext))?$ext:array();
41
+	public function getPrepayId($body, $out_trade_no, $total_fee, $openid, $spbill_create_ip = null, $ext = null) {
42
+		$data = ($ext && is_array($ext)) ? $ext : array();
43 43
 		$data["body"]         = $body;
44 44
 		$data["out_trade_no"] = $out_trade_no;
45 45
 		$data["total_fee"]    = $total_fee;
46
-		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["REMOTE_ADDR"];
46
+		$data["spbill_create_ip"] = $spbill_create_ip ?: $_SERVER["REMOTE_ADDR"];
47 47
 		$data["notify_url"]   = $this->config["notify_url"];
48 48
 		$data["trade_type"]   = WechatPay::TRADETYPE_JSAPI;
49
-		if(!$openid) throw new Exception('openid is required when trade_type is JSAPI');
50
-		$data["openid"]   = $openid;
49
+		if (!$openid) throw new Exception('openid is required when trade_type is JSAPI');
50
+		$data["openid"] = $openid;
51 51
 		$result = $this->unifiedOrder($data);
52 52
 		return $result["prepay_id"];
53 53
 	}
Please login to merge, or discard this patch.
src/service/Native.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,15 +38,15 @@
 block discarded – undo
38 38
 	 * @return string
39 39
 	 * @throws Exception
40 40
 	 */
41
-	public function getCodeUrl($body,$out_trade_no,$total_fee,$product_id,$spbill_create_ip = null,$ext = null){
42
-		$data = ($ext && is_array($ext))?$ext:array();
41
+	public function getCodeUrl($body, $out_trade_no, $total_fee, $product_id, $spbill_create_ip = null, $ext = null) {
42
+		$data = ($ext && is_array($ext)) ? $ext : array();
43 43
 		$data["body"]         = $body;
44 44
 		$data["out_trade_no"] = $out_trade_no;
45 45
 		$data["total_fee"]    = $total_fee;
46
-		$data["spbill_create_ip"] = $spbill_create_ip?:$_SERVER["SERVER_ADDR"];
46
+		$data["spbill_create_ip"] = $spbill_create_ip ?: $_SERVER["SERVER_ADDR"];
47 47
 		$data["notify_url"]   = $this->config["notify_url"];
48 48
 		$data["trade_type"]   = self::TRADETYPE_NATIVE;
49
-		if(!$product_id) throw new Exception('product_id is required when trade_type is NATIVE');
49
+		if (!$product_id) throw new Exception('product_id is required when trade_type is NATIVE');
50 50
 		$data["product_id"]   = $product_id;
51 51
 		$result = $this->unifiedOrder($data);
52 52
 		return $result["code_url"];
Please login to merge, or discard this patch.
src/service/Coupon.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 	 * @param array $ext
23 23
 	 * @return array
24 24
 	 */
25
-	public function sendCoupon($coupon_stock_id,$open_id,$partner_trade_no,$op_user_id = '',$ext = array()){
26
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
25
+	public function sendCoupon($coupon_stock_id, $open_id, $partner_trade_no, $op_user_id = '', $ext = array()) {
26
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
27 27
 		$data["partner_trade_no"] = $partner_trade_no;
28 28
 		$data["coupon_stock_id"] = $coupon_stock_id;
29 29
 		$data["openid_count"] = 1;
30 30
 		$data["open_id"] = $open_id;
31 31
 		$data["op_user_id"] = $op_user_id;
32
-		$result = $this->post(self::URL_SEND_COUPON,$data,true);
32
+		$result = $this->post(self::URL_SEND_COUPON, $data, true);
33 33
 		return $result;
34 34
 	}
35 35
 
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
 	 * @param string $op_user_id
41 41
 	 * @return array
42 42
 	 */
43
-	public function queryCouponStock($coupon_stock_id,$op_user_id = ''){
43
+	public function queryCouponStock($coupon_stock_id, $op_user_id = '') {
44 44
 		$data = array();
45 45
 		$data["coupon_stock_id"] = $coupon_stock_id;
46 46
 		$data["op_user_id"] = $op_user_id;
47
-		$result = $this->post(self::URL_QUERY_COUPON_STOCK,$data,false);
47
+		$result = $this->post(self::URL_QUERY_COUPON_STOCK, $data, false);
48 48
 		return $result;
49 49
 	}
50 50
 
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
 	 * @param array $ext
59 59
 	 * @return array
60 60
 	 */
61
-	public function queryCouponsInfo($coupon_id,$open_id,$stock_id,$op_user_id = '',$ext = array()){
62
-		$data = (!empty($ext) && is_array($ext))?$ext:array();
61
+	public function queryCouponsInfo($coupon_id, $open_id, $stock_id, $op_user_id = '', $ext = array()) {
62
+		$data = (!empty($ext) && is_array($ext)) ? $ext : array();
63 63
 		$data["coupon_id"] = $coupon_id;
64 64
 		$data["stock_id"] = $stock_id;
65 65
 		$data["open_id"] = $open_id;
66 66
 		$data["op_user_id"] = $op_user_id;
67
-		$result = $this->post(self::URL_QUERY_COUPON_INFO,$data,false);
67
+		$result = $this->post(self::URL_QUERY_COUPON_INFO, $data, false);
68 68
 		return $result;
69 69
 	}
70 70
 
Please login to merge, or discard this patch.