zhangv / wechat-pay

src/HttpClient.php

Spacing +10 added lines, -10 removed lines

@@ -5,9 +5,9 @@ 
  */
 namespace zhangv\wechat;
 
-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;
@@ -17,8 +17,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);
@@ -27,26 +27,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;
@@ -60,7 +60,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);

demo/paidnotify.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-require_once __DIR__ . "/autoload.php";
+require_once __DIR__."/autoload.php";
 use zhangv\wechat\WechatPay;
 
 $xml = file_get_contents("php://input");
 
 $cfg = require './config.php';
 $payment = new WechatPay($cfg);
-$payment->onPaidNotify($xml,function($notifydata) use ($payment){
+$payment->onPaidNotify($xml, function($notifydata) use ($payment){
 	//do stuff
 	print_r($notifydata);
 	$payment->responseNotify();

src/cache/RedisCacheProvider.php

Spacing +5 added lines, -5 removed lines

@@ -4,25 +4,25 @@
  * Time: 2018/5/29 16:41
  */
 namespace zhangv\wechat\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/cache/JsonFileCacheProvider.php

Spacing +7 added lines, -7 removed lines

@@ -4,15 +4,15 @@ 
  * 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){
+	public function set($key, $jsonobj, $expireAt) {
 		$data = $jsonobj;
 		$data->expires_at = $expireAt;
 		$file = "{$this->cacheDir}/{$key}.json";
@@ -21,16 +21,16 @@ 
 		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));
 		}
 		return $cache;
 	}
 
-	public function clear($key){
+	public function clear($key) {
 		$file = "{$this->cacheDir}/{$key}.json";
 		if (file_exists($file)) {
 			unlink($file);

Braces +8 added lines, -3 removed lines

@@ -8,8 +8,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){
@@ -18,7 +21,9 @@ 
 		$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){

src/cache/CacheProvider.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
  */
 namespace zhangv\wechat\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/WechatOAuth.php

Spacing +15 added lines, -15 removed lines

@@ -6,7 +6,7 @@ 
 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 @@ 
 	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,20 +63,20 @@ 
 		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 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";
@@ -94,6 +94,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

@@ -64,7 +64,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);
@@ -76,7 +78,9 @@ 
 			$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";