zhangv / wechat-pay

src/HttpClient.php

Spacing +11 added lines, -11 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,12 +17,12 @@ 
 		$this->initInstance($timeout);
 	}
 
-	public function initInstance($timeout){
-		if(!$this->instance) {
+	public function initInstance($timeout) {
+		if (!$this->instance) {
 			$this->instance = curl_init();
 			if ($timeout < 1) {
 				curl_setopt($this->instance, CURLOPT_TIMEOUT_MS, intval($timeout * 1000));
-			} else {
+			}else {
 				curl_setopt($this->instance, CURLOPT_TIMEOUT, intval($timeout));
 			}
 			curl_setopt($this->instance, CURLOPT_RETURNTRANSFER, true);
@@ -31,26 +31,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;
@@ -70,7 +70,7 @@ 
 		curl_setopt_array($this->instance, $optArray);
 	}
 
-	public function getInfo(){
+	public function getInfo() {
 		return $this->info;
 	}
 }
\ No newline at end of file

Braces +15 added lines, -5 removed lines

@@ -32,8 +32,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);
@@ -45,7 +49,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);
@@ -65,8 +71,12 @@ 
 	}
 
 	public function setOpt($optArray) {
-		if (!$this->instance)	return;
-		if (!is_array($optArray))	throw new \Exception("Argument is not an array!");
+		if (!$this->instance) {
+			return;
+		}
+		if (!is_array($optArray)) {
+			throw new \Exception("Argument is not an array!");
+		}
 		curl_setopt_array($this->instance, $optArray);
 	}
 

src/WechatOAuth.php

Spacing +10 added lines, -10 removed lines

@@ -17,50 +17,50 @@ 
 	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 setAccessToken($accessToken){
+	public function setAccessToken($accessToken) {
 		$this->accessToken = $accessToken;
 	}
 
-	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 $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 $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);
@@ -68,7 +68,7 @@ 
 		return $this->accessToken;
 	}
 
-	public function getTicket(){
+	public function getTicket() {
 		$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=jsapi&access_token=$accessToken";

demo/wxoauthcallback.php

Braces +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 
 	if(!$at || empty($at->openid)){
 		die('授权失败');
-	}else{
+	} else{
 		$accesstoken = $at->access_token;
 		$openid = $at->openid;
 		header('Location: '."http://{$_SERVER['HTTP_HOST']}/wechat-pay/demo/pay.php?openid=$openid");
 	}
-}else{
+} else{
 	die('授权失败，请重试。');
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,24 +1,24 @@
 <?php
 
 //OAuth授权回调
-require_once __DIR__ . "/autoload.php";
+require_once __DIR__."/autoload.php";
 use zhangv\wechat\WechatOAuth;
 
-if (isset($_GET['code'])){
+if (isset($_GET['code'])) {
 	$cfg = require './config.php';
 
 	$code = trim($_GET['code']);
 	$state = trim($_GET['state']);
-	$oauth = new WechatOAuth($cfg['app_id'],$cfg['app_secret']);
+	$oauth = new WechatOAuth($cfg['app_id'], $cfg['app_secret']);
 	$at = $oauth->authorize($code);
 
-	if(!$at || empty($at->openid)){
+	if (!$at || empty($at->openid)) {
 		die('授权失败');
-	}else{
+	}else {
 		$accesstoken = $at->access_token;
 		$openid = $at->openid;
 		header('Location: '."http://{$_SERVER['HTTP_HOST']}/wechat-pay/demo/pay.php?openid=$openid");
 	}
-}else{
+}else {
 	die('授权失败，请重试。');
 }
\ No newline at end of file

demo/config.php

Spacing +4 added lines, -4 removed lines

@@ -5,14 +5,14 @@
 	'app_id'            => 'XXXXXXXXXXXXXXXXXXX', //APPID
 	'app_secret'        => 'XXXXXXXXXXXXXXXXXXXXXXXXX', //App Secret
 	'api_key'           =>'XXXXXXXXXXXXXXXXXXXXXXX', //支付密钥
-	'ssl_cert_path'     => __DIR__ . '/../cert/apiclient_cert.pem',
-	'ssl_key_path'      => __DIR__ .'/../cert/apiclient_key.pem',
+	'ssl_cert_path'     => __DIR__.'/../cert/apiclient_cert.pem',
+	'ssl_key_path'      => __DIR__.'/../cert/apiclient_key.pem',
 	'sign_type'         => 'MD5',
 	'notify_url'        => 'http://XXX.XXX/paidnotify.php',
 	'refund_notify_url' => 'http://XXX.XXX/refundednotify.php',
 	'h5_scene_info'     => [//required in H5
 		'h5_info' => ['type' => 'Wap', 'wap_url' => 'http://wapurl', 'wap_name' => 'wapname']
 	],
-	'rsa_pubkey_path'   => __DIR__ .'/../cert/pubkey.pem',
-	'jsapi_ticket'      => __DIR__ .'/jsapi_ticket.json'
+	'rsa_pubkey_path'   => __DIR__.'/../cert/pubkey.pem',
+	'jsapi_ticket'      => __DIR__.'/jsapi_ticket.json'
 ];
\ No newline at end of file

demo/pay-qrcode.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 //扫码支付
-require_once __DIR__ . "/autoload.php";
+require_once __DIR__."/autoload.php";
 use zhangv\wechat\WechatPay;
 
 $cfg = include './config.php';
@@ -12,7 +12,7 @@ 
 $desc = "desc$stamp";
 $productid = "testproduct";
 $amt = 1;
-$codeurl = $payment->getCodeUrl($desc, $orderid, $amt,$productid);
+$codeurl = $payment->getCodeUrl($desc, $orderid, $amt, $productid);
 
 ?>
 <script type="text/javascript" src="js/jquery.js"></script>

demo/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-if(file_exists(__DIR__ . '/../vendor/autoload.php')){
+if (file_exists(__DIR__.'/../vendor/autoload.php')) {
 	/** @var \Composer\Autoload\ClassLoader $loader */
-	$loader = require __DIR__ . '/../vendor/autoload.php';
-}else{//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
+	$loader = require __DIR__.'/../vendor/autoload.php';
+}else {//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
 	function __autoload($class) {
 		$class = str_replace('zhangv\\wechat\\', 'src/', $class);
-		$file = __DIR__ . '/../' . $class . '.php';
+		$file = __DIR__.'/../'.$class.'.php';
 		require_once $file;
 	}
 	spl_autoload_register('__autoload');

Braces +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 if(file_exists(__DIR__ . '/../vendor/autoload.php')){
 	/** @var \Composer\Autoload\ClassLoader $loader */
 	$loader = require __DIR__ . '/../vendor/autoload.php';
-}else{//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
+} else{//if the composer is not initialized, note: this is not work in phpunit, switch to composer when unit testing
 	function __autoload($class) {
 		$class = str_replace('zhangv\\wechat\\', 'src/', $class);
 		$file = __DIR__ . '/../' . $class . '.php';

demo/wxoauth.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 //OAuth授权
-require_once __DIR__ . "/autoload.php";
+require_once __DIR__."/autoload.php";
 
 use zhangv\wechat\WechatOAuth;
 
@@ -10,7 +10,7 @@ 
 $redirect = "http://{$_SERVER['HTTP_HOST']}/wechat-pay/demo/wxoauthcallback.php";
 $scope = 'snsapi_userinfo';
 $state = "";
-$oauth =new WechatOAuth($appid,$cfg['app_secret']);
-$url = $oauth->authorizeURI($redirect,$scope);
+$oauth = new WechatOAuth($appid, $cfg['app_secret']);
+$url = $oauth->authorizeURI($redirect, $scope);
 
 header('Location: '.$redirect);
\ No newline at end of file

demo/refundednotify.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->onRefundedNotify($xml,function($notifydata) use ($payment){
+$payment->onRefundedNotify($xml, function($notifydata) use ($payment){
 	//do stuff
 	print_r($notifydata);
 	$payment->responseNotify();

demo/pay.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 //公众号支付
-require_once __DIR__ . "/autoload.php";
+require_once __DIR__."/autoload.php";
 
 use zhangv\wechat\WechatPay;
 $cfg = include './config.php';
 
-if(empty( $_REQUEST['openid'])) {
+if (empty($_REQUEST['openid'])) {
 	$redirect = "http://{$_SERVER['HTTP_HOST']}/wechat-pay/demo/wxoauth.php";
 	header('Location: '.$redirect);
 	exit;