Inspection of "add getsession in oauth" - zhangv/wechat-pay - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( b0036f...e07037 )

by Wei

created 2018-06-05 16:16 UTC

Status

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
 namespace zhangv\wechat;
 
 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;
@@ -16,46 +16,46 @@  discard block
 block discarded – undo
 	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);
@@ -63,27 +63,27 @@  discard block
 block discarded – undo
 		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,$accesstoken = null){
-		if(!$accesstoken) $accesstoken = $this->getAccessToken();
+	public function getSession($code, $accesstoken = null) {
+		if (!$accesstoken) $accesstoken = $this->getAccessToken();
 		$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' || $_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";
@@ -101,6 +101,6 @@  discard block
 block discarded – undo
 	}
 
 	private function getNonceStr() {
-		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
+		return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
 	}
 }

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -64,7 +64,9 @@  discard block
 block discarded – undo
 	}
 
 	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);
@@ -72,7 +74,9 @@  discard block
 block discarded – undo
 	}
 
 	public function getSession($code,$accesstoken = null){
-		if(!$accesstoken) $accesstoken = $this->getAccessToken();
+		if(!$accesstoken) {
+			$accesstoken = $this->getAccessToken();
+		}
 		$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);
@@ -83,7 +87,9 @@  discard block
 block discarded – undo
 			$url = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_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";

Please login to merge, or discard this patch.

src/cache/JsonFileCacheProvider.php 2 patches

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -4,15 +4,15 @@  discard block
 block discarded – undo
  * Time: 2018/5/29 16:41
  */
 namespace zhangv\wechat\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";
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
 		if ($fp) 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);
 			}
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 		return $cache;
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		if (file_exists($file)) {
 			unlink($file);

Please login to merge, or discard this patch.

Braces +8 added lines, -3 removed lines patch added patch discarded remove patch

@@ -8,8 +8,11 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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){

Please login to merge, or discard this patch.

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	namespace zhangv\wechat;
7	7
8	8	class WechatOAuth {
9		- const TICKETTYPE_JSAPI = 'jsapi',TICKETTYPE_WXCARD = 'wx_card';
	9	+ const TICKETTYPE_JSAPI = 'jsapi', TICKETTYPE_WXCARD = 'wx_card';
10	10	public $responseJSON = null;
11	11	public $errCode = null;
12	12	public $errMsg = null;
		@@ -16,46 +16,46 @@ discard block
		block discarded – undo
16	16	private $httpClient = null;
17	17	private $accessToken = null;
18	18
19		- public function __construct($appId,$appSecret) {
	19	+ public function __construct($appId, $appSecret) {
20	20	$this->appId = $appId;
21	21	$this->appSecret = $appSecret;
22	22	$this->httpClient = new HttpClient();
23	23	}
24	24
25		- public function setHttpClient($httpClient){
	25	+ public function setHttpClient($httpClient) {
26	26	$this->httpClient = $httpClient;
27	27	}
28	28
29		- public function authorizeURI($redirectURI,$scope = 'snsapi_userinfo',$state = ''){
	29	+ public function authorizeURI($redirectURI, $scope = 'snsapi_userinfo', $state = '') {
30	30	$redirectURI = urlencode($redirectURI);
31	31	return "https://open.weixin.qq.com/connect/oauth2/authorize?appid={$this->appId}&redirect_uri={$redirectURI}&response_type=code&scope=$scope&state=$state#wechat_redirect";
32	32	}
33	33
34		- public function authorize($code){
	34	+ public function authorize($code) {
35	35	$url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid={$this->appId}&secret={$this->appSecret}&code=$code&grant_type=authorization_code";
36	36	$this->responseJSON = $this->httpClient->get($url);
37	37	return json_decode($this->responseJSON);
38	38	}
39	39
40		- public function getUserInfo($openId){
	40	+ public function getUserInfo($openId) {
41	41	$url = "https://api.weixin.qq.com/sns/userinfo?access_token={$this->accessToken}&openid=$openId&lang=zh_CN";
42	42	$this->responseJSON = $this->httpClient->get($url);
43	43	return json_decode($this->responseJSON);
44	44	}
45	45
46		- public function refreshToken($refreshToken){
	46	+ public function refreshToken($refreshToken) {
47	47	$url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid={$this->appId}&grant_type=refresh_token&refresh_token=$refreshToken";
48	48	$this->responseJSON = $this->httpClient->get($url);
49	49	return json_decode($this->responseJSON);
50	50	}
51	51
52		- public function verifyToken($accessToken,$openId){
	52	+ public function verifyToken($accessToken, $openId) {
53	53	$url = "https://api.weixin.qq.com/sns/auth?access_token=$accessToken&openid=$openId";
54	54	$this->responseJSON = $this->httpClient->get($url);
55	55	return json_decode($this->responseJSON);
56	56	}
57	57
58		- public function getAccessToken(){
	58	+ public function getAccessToken() {
59	59	$url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={$this->appId}&secret={$this->appSecret}";
60	60	$this->responseJSON = $this->httpClient->get($url);
61	61	$json = json_decode($this->responseJSON);
		@@ -63,27 +63,27 @@ discard block
		block discarded – undo
63	63	return $this->accessToken;
64	64	}
65	65
66		- public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null){
67		- if(!$accessToken) $accessToken = $this->getAccessToken();
	66	+ public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null) {
	67	+ if (!$accessToken) $accessToken = $this->getAccessToken();
68	68	// $url = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=$accessToken";
69	69	$url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type={$type}&access_token=$accessToken";
70	70	$this->responseJSON = $this->httpClient->get($url);
71	71	return json_decode($this->responseJSON);
72	72	}
73	73
74		- public function getSession($code,$accesstoken = null){
75		- if(!$accesstoken) $accesstoken = $this->getAccessToken();
	74	+ public function getSession($code, $accesstoken = null) {
	75	+ if (!$accesstoken) $accesstoken = $this->getAccessToken();
76	76	$url = "https://api.weixin.qq.com/sns/jscode2session?appid={$this->appId}&secret={$this->appSecret}&js_code=$code&grant_type=authorization_code";
77	77	$this->responseJSON = $this->httpClient->get($url);
78	78	return json_decode($this->responseJSON);
79	79	}
80	80
81		- public function getSignPackage($url = null, $ticket = null){
82		- if(!$url){
	81	+ public function getSignPackage($url = null, $ticket = null) {
	82	+ if (!$url) {
83	83	$url = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' \|\| $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
84	84	$url .= "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
85	85	}
86		- if(!$ticket) $ticket = $this->getTicket();
	86	+ if (!$ticket) $ticket = $this->getTicket();
87	87	$timestamp = time();
88	88	$nonceStr = $this->getNonceStr();
89	89	$rawString = "jsapi_ticket=$ticket&noncestr=$nonceStr&timestamp=$timestamp&url=$url";
		@@ -101,6 +101,6 @@ discard block
		block discarded – undo
101	101	}
102	102
103	103	private function getNonceStr() {
104		- return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"),0,32);
	104	+ return substr(str_shuffle("abcdefghijklmnopqrstuvwxyz0123456789"), 0, 32);
105	105	}
106	106	}

		@@ -64,7 +64,9 @@ discard block
		block discarded – undo
64	64	}
65	65
66	66	public function getTicket($type = WechatOAuth::TICKETTYPE_JSAPI, $accessToken = null){
67		- if(!$accessToken) $accessToken = $this->getAccessToken();
	67	+ if(!$accessToken) {
	68	+ $accessToken = $this->getAccessToken();
	69	+ }
68	70	// $url = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=$accessToken";
69	71	$url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type={$type}&access_token=$accessToken";
70	72	$this->responseJSON = $this->httpClient->get($url);
		@@ -72,7 +74,9 @@ discard block
		block discarded – undo
72	74	}
73	75
74	76	public function getSession($code,$accesstoken = null){
75		- if(!$accesstoken) $accesstoken = $this->getAccessToken();
	77	+ if(!$accesstoken) {
	78	+ $accesstoken = $this->getAccessToken();
	79	+ }
76	80	$url = "https://api.weixin.qq.com/sns/jscode2session?appid={$this->appId}&secret={$this->appSecret}&js_code=$code&grant_type=authorization_code";
77	81	$this->responseJSON = $this->httpClient->get($url);
78	82	return json_decode($this->responseJSON);
		@@ -83,7 +87,9 @@ discard block
		block discarded – undo
83	87	$url = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' \|\| $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
84	88	$url .= "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
85	89	}
86		- if(!$ticket) $ticket = $this->getTicket();
	90	+ if(!$ticket) {
	91	+ $ticket = $this->getTicket();
	92	+ }
87	93	$timestamp = time();
88	94	$nonceStr = $this->getNonceStr();
89	95	$rawString = "jsapi_ticket=$ticket&noncestr=$nonceStr&timestamp=$timestamp&url=$url";

		@@ -4,15 +4,15 @@ discard block
		block discarded – undo
4	4	* Time: 2018/5/29 16:41
5	5	*/
6	6	namespace zhangv\wechat\cache;
7		-class JsonFileCacheProvider implements CacheProvider{
	7	+class JsonFileCacheProvider implements CacheProvider {
8	8	private $cacheDir = null;
9	9
10		- public function __construct($cacheDir = null){
11		- if(!$cacheDir) $this->cacheDir = __DIR__;
	10	+ public function __construct($cacheDir = null) {
	11	+ if (!$cacheDir) $this->cacheDir = __DIR__;
12	12	else $this->cacheDir = $cacheDir;
13	13	}
14	14
15		- public function set($key,$jsonobj,$expireAt = null){
	15	+ public function set($key, $jsonobj, $expireAt = null) {
16	16	$data = $jsonobj;
17	17	$data->expires_at = $expireAt;
18	18	$file = "{$this->cacheDir}/{$key}.json";
		@@ -21,12 +21,12 @@ discard block
		block discarded – undo
21	21	if ($fp) fclose($fp);
22	22	}
23	23
24		- public function get($key){
	24	+ public function get($key) {
25	25	$file = "{$this->cacheDir}/{$key}.json";
26	26	$cache = null;
27		- if(file_exists($file)){
	27	+ if (file_exists($file)) {
28	28	$cache = json_decode(file_get_contents($file));
29		- if($cache->expires_at < time()){
	29	+ if ($cache->expires_at < time()) {
30	30	$cache = null;
31	31	$this->clear($key);
32	32	}
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	return $cache;
35	35	}
36	36
37		- public function clear($key){
	37	+ public function clear($key) {
38	38	$file = "{$this->cacheDir}/{$key}.json";
39	39	if (file_exists($file)) {
40	40	unlink($file);

		@@ -8,8 +8,11 @@ discard block
		block discarded – undo
8	8	private $cacheDir = null;
9	9
10	10	public function __construct($cacheDir = null){
11		- if(!$cacheDir) $this->cacheDir = __DIR__;
12		- else $this->cacheDir = $cacheDir;
	11	+ if(!$cacheDir) {
	12	+ $this->cacheDir = __DIR__;
	13	+ } else {
	14	+ $this->cacheDir = $cacheDir;
	15	+ }
13	16	}
14	17
15	18	public function set($key,$jsonobj,$expireAt = null){
		@@ -18,7 +21,9 @@ discard block
		block discarded – undo
18	21	$file = "{$this->cacheDir}/{$key}.json";
19	22	$fp = fopen($file, "w");
20	23	fwrite($fp, json_encode($data));
21		- if ($fp) fclose($fp);
	24	+ if ($fp) {
	25	+ fclose($fp);
	26	+ }
22	27	}
23	28
24	29	public function get($key){

zhangv / wechat-pay

Push — master ( b0036f...e07037 )

Status

Category

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Braces +8 added lines, -3 removed lines patch added patch discarded remove patch