Merge pull request lokielse#3 from lokielse/master

Darren Gao · web-flow · commit bc42f995c1d5 · 2017-10-16T11:37:25.000+08:00
upstream update about CS problem
diff --git a/src/AppGateway.php b/src/AppGateway.php
@@ -8,7 +8,6 @@
  */
 class AppGateway extends BaseAbstractGateway
 {
-
     public function getName()
     {
         return 'WechatPay App';
diff --git a/src/BaseAbstractGateway.php b/src/BaseAbstractGateway.php
@@ -6,7 +6,6 @@
 
 abstract class BaseAbstractGateway extends AbstractGateway
 {
-
     public function setTradeType($tradeType)
     {
         $this->setParameter('trade_type', $tradeType);
@@ -102,7 +101,7 @@ public function setKeyPath($keyPath)
      *
      * @return \Omnipay\WechatPay\Message\CreateOrderRequest
      */
-    public function purchase($parameters = array ())
+    public function purchase($parameters = array())
     {
         $parameters['trade_type'] = $this->getTradeType();
 
@@ -121,12 +120,12 @@ public function getTradeType()
      *
      * @return \Omnipay\WechatPay\Message\CompletePurchaseRequest
      */
-    public function completePurchase($parameters = array ())
+    public function completePurchase($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\CompletePurchaseRequest', $parameters);
     }
 
-    public function completeRefund($parameters = array ())
+    public function completeRefund($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\CompleteRefundRequest', $parameters);
     }
@@ -137,7 +136,7 @@ public function completeRefund($parameters = array ())
      *
      * @return \Omnipay\WechatPay\Message\QueryOrderRequest
      */
-    public function query($parameters = array ())
+    public function query($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\QueryOrderRequest', $parameters);
     }
@@ -148,7 +147,7 @@ public function query($parameters = array ())
      *
      * @return \Omnipay\WechatPay\Message\CloseOrderRequest
      */
-    public function close($parameters = array ())
+    public function close($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\CloseOrderRequest', $parameters);
     }
@@ -159,7 +158,7 @@ public function close($parameters = array ())
      *
      * @return \Omnipay\WechatPay\Message\RefundOrderRequest
      */
-    public function refund($parameters = array ())
+    public function refund($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\RefundOrderRequest', $parameters);
     }
@@ -170,7 +169,7 @@ public function refund($parameters = array ())
      *
      * @return \Omnipay\WechatPay\Message\QueryOrderRequest
      */
-    public function queryRefund($parameters = array ())
+    public function queryRefund($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\QueryRefundRequest', $parameters);
     }
@@ -181,7 +180,7 @@ public function queryRefund($parameters = array ())
      *
      * @return \Omnipay\WechatPay\Message\DownloadBillRequest
      */
-    public function downloadBill($parameters = array ())
+    public function downloadBill($parameters = array())
     {
         return $this->createRequest('\Omnipay\WechatPay\Message\DownloadBillRequest', $parameters);
     }
diff --git a/src/Gateway.php b/src/Gateway.php
@@ -8,7 +8,6 @@
  */
 class Gateway extends BaseAbstractGateway
 {
-
     public function getName()
     {
         return 'WechatPay';
diff --git a/src/Helper.php b/src/Helper.php
@@ -4,7 +4,6 @@
 
 class Helper
 {
-
     public static function array2xml($arr, $root = 'xml')
     {
         $xml = "<$root>";
diff --git a/src/JsGateway.php b/src/JsGateway.php
@@ -8,7 +8,6 @@
  */
 class JsGateway extends BaseAbstractGateway
 {
-
     public function getName()
     {
         return 'WechatPay JS API/MP';
diff --git a/src/Message/CloseOrderRequest.php b/src/Message/CloseOrderRequest.php
@@ -15,7 +15,6 @@
  */
 class CloseOrderRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/closeorder';
 
 
@@ -27,10 +26,9 @@ class CloseOrderRequest extends BaseAbstractRequest
      */
     public function getData()
     {
-
         $this->validate('app_id', 'mch_id', 'out_trade_no');
 
-        $data = array (
+        $data = array(
             'appid'        => $this->getAppId(),
             'mch_id'       => $this->getMchId(),
             'out_trade_no' => $this->getOutTradeNo(),
diff --git a/src/Message/CloseOrderResponse.php b/src/Message/CloseOrderResponse.php
@@ -10,5 +10,4 @@
  */
 class CloseOrderResponse extends BaseAbstractResponse
 {
-
 }
diff --git a/src/Message/CompletePurchaseRequest.php b/src/Message/CompletePurchaseRequest.php
@@ -14,7 +14,6 @@
  */
 class CompletePurchaseRequest extends BaseAbstractRequest
 {
-
     public function setRequestParams($requestParams)
     {
         $this->setParameter('request_params', $requestParams);
@@ -33,7 +32,7 @@ public function sendData($data)
         $data = $this->getData();
         $sign = Helper::sign($data, $this->getApiKey());
 
-        $responseData = array ();
+        $responseData = array();
 
         if (isset($data['sign']) && $data['sign'] && $sign === $data['sign']) {
             $responseData['sign_match'] = true;
diff --git a/src/Message/CompleteRefundRequest.php b/src/Message/CompleteRefundRequest.php
@@ -13,7 +13,6 @@
  */
 class CompleteRefundRequest extends BaseAbstractRequest
 {
-
     public function setRequestParams($requestParams)
     {
         $this->setParameter('request_params', $requestParams);
@@ -24,7 +23,7 @@ public function sendData($data)
         $data = $this->getData();
         $sign = Helper::sign($data, $this->getApiKey());
 
-        $responseData = array ();
+        $responseData = array();
 
         if (isset($data['sign']) && $data['sign'] && $sign === $data['sign']) {
             $responseData['sign_match'] = true;
diff --git a/src/Message/CompleteRefundResponse.php b/src/Message/CompleteRefundResponse.php
@@ -12,7 +12,6 @@
  */
 class CompleteRefundResponse extends AbstractResponse
 {
-
     public function isSuccessful()
     {
         return $this->isRefunded();
diff --git a/src/Message/CreateMicroOrderRequest.php b/src/Message/CreateMicroOrderRequest.php
@@ -14,7 +14,6 @@
  */
 class CreateMicroOrderRequest extends CreateOrderRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/micropay';
 
 
@@ -28,7 +27,7 @@ public function getData()
     {
         $this->validate('app_id', 'mch_id', 'body', 'out_trade_no', 'total_fee', 'auth_code');
 
-        $data = array (
+        $data = array(
             'appid'            => $this->getAppId(),//*
             'mch_id'           => $this->getMchId(),
             'device_info'      => $this->getDeviceInfo(),//*
diff --git a/src/Message/CreateOrderRequest.php b/src/Message/CreateOrderRequest.php
@@ -14,7 +14,6 @@
  */
 class CreateOrderRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
 
 
@@ -43,7 +42,7 @@ public function getData()
             $this->validate('open_id');
         }
 
-        $data = array (
+        $data = array(
             'appid'            => $this->getAppId(),//*
             'mch_id'           => $this->getMchId(),
             'device_info'      => $this->getDeviceInfo(),//*
diff --git a/src/Message/DownloadBillRequest.php b/src/Message/DownloadBillRequest.php
@@ -15,7 +15,6 @@
  */
 class DownloadBillRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/downloadbill';
 
 
@@ -29,7 +28,7 @@ public function getData()
     {
         $this->validate('app_id', 'mch_id', 'bill_date');
 
-        $data = array (
+        $data = array(
             'appid'       => $this->getAppId(),
             'mch_id'      => $this->getMchId(),
             'device_info' => $this->getDeviceInfo(),
@@ -115,7 +114,7 @@ public function sendData($data)
     }
 
 
-    private function post($url, $data = array (), $timeout = 3)
+    private function post($url, $data = array(), $timeout = 3)
     {
         $ch = curl_init($url);
 
@@ -129,7 +128,7 @@ private function post($url, $data = array (), $timeout = 3)
         if (preg_match('#return_code#', $result)) {
             $result = Helper::xml2array($result);
         } else {
-            $result = array (['return_code' => 'SUCCESS', 'raw' => $result]);
+            $result = array(['return_code' => 'SUCCESS', 'raw' => $result]);
         }
 
         return $result;
diff --git a/src/Message/DownloadBillResponse.php b/src/Message/DownloadBillResponse.php
@@ -10,5 +10,4 @@
  */
 class DownloadBillResponse extends BaseAbstractResponse
 {
-
 }
diff --git a/src/Message/QueryOpenIdByAuthCodeRequest.php b/src/Message/QueryOpenIdByAuthCodeRequest.php
@@ -15,7 +15,6 @@
  */
 class QueryOpenIdByAuthCodeRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/tools/authcodetoopenid';
 
 
@@ -27,10 +26,9 @@ class QueryOpenIdByAuthCodeRequest extends BaseAbstractRequest
      */
     public function getData()
     {
-
         $this->validate('app_id', 'mch_id', 'auth_code');
 
-        $data = array (
+        $data = array(
             'appid'     => $this->getAppId(),
             'mch_id'    => $this->getMchId(),
             'auth_code' => $this->getAuthCode(),
diff --git a/src/Message/QueryOpenIdByAuthCodeResponse.php b/src/Message/QueryOpenIdByAuthCodeResponse.php
@@ -10,7 +10,6 @@
  */
 class QueryOpenIdByAuthCodeResponse extends BaseAbstractResponse
 {
-
     public function getOpenId()
     {
         $data = $this->getData();
diff --git a/src/Message/QueryOrderRequest.php b/src/Message/QueryOrderRequest.php
@@ -15,7 +15,6 @@
  */
 class QueryOrderRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/orderquery';
 
 
@@ -31,10 +30,9 @@ public function getData()
 
         if (! $this->getTransactionId() && ! $this->getOutTradeNo()) {
             throw new InvalidRequestException("The 'transaction_id' or 'out_trade_no' parameter is required");
-
         }
 
-        $data = array (
+        $data = array(
             'appid'          => $this->getAppId(),
             'mch_id'         => $this->getMchId(),
             'transaction_id' => $this->getTransactionId(),
diff --git a/src/Message/QueryOrderResponse.php b/src/Message/QueryOrderResponse.php
@@ -10,5 +10,4 @@
  */
 class QueryOrderResponse extends BaseAbstractResponse
 {
-
 }
diff --git a/src/Message/QueryRefundRequest.php b/src/Message/QueryRefundRequest.php
@@ -15,7 +15,6 @@
  */
 class QueryRefundRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/pay/refundquery';
 
 
@@ -37,7 +36,7 @@ public function getData()
             throw new InvalidRequestException($message);
         }
 
-        $data = array (
+        $data = array(
             'appid'          => $this->getAppId(),
             'mch_id'         => $this->getMchId(),
             'device_info'    => $this->getDeviceInfo(),
diff --git a/src/Message/QueryRefundResponse.php b/src/Message/QueryRefundResponse.php
@@ -10,5 +10,4 @@
  */
 class QueryRefundResponse extends BaseAbstractResponse
 {
-
 }
diff --git a/src/Message/RefundOrderRequest.php b/src/Message/RefundOrderRequest.php
@@ -16,7 +16,6 @@
  */
 class RefundOrderRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/secapi/pay/refund';
 
 
@@ -30,7 +29,7 @@ public function getData()
     {
         $this->validate('app_id', 'mch_id', 'out_trade_no', 'cert_path', 'key_path');
 
-        $data = array (
+        $data = array(
             'appid'           => $this->getAppId(),
             'mch_id'          => $this->getMchId(),
             'device_info'     => $this->getDeviceInfo(),//<>
@@ -238,7 +237,7 @@ public function setKeyPath($keyPath)
      */
     public function sendData($data)
     {
-        $options = array (
+        $options = array(
             CURLOPT_SSL_VERIFYPEER => true,
             CURLOPT_SSL_VERIFYHOST => 2,
             CURLOPT_SSLCERTTYPE    => 'PEM',
diff --git a/src/Message/RefundOrderResponse.php b/src/Message/RefundOrderResponse.php
@@ -10,5 +10,4 @@
  */
 class RefundOrderResponse extends BaseAbstractResponse
 {
-
 }
diff --git a/src/Message/ShortenUrlRequest.php b/src/Message/ShortenUrlRequest.php
@@ -15,7 +15,6 @@
  */
 class ShortenUrlRequest extends BaseAbstractRequest
 {
-
     protected $endpoint = 'https://api.mch.weixin.qq.com/tools/shorturl';
 
 
@@ -27,10 +26,9 @@ class ShortenUrlRequest extends BaseAbstractRequest
      */
     public function getData()
     {
-
         $this->validate('app_id', 'mch_id', 'long_url');
 
-        $data = array (
+        $data = array(
             'appid'     => $this->getAppId(),
             'mch_id'    => $this->getMchId(),
             'long_url'  => $this->getLongUrl(),
diff --git a/src/Message/ShortenUrlResponse.php b/src/Message/ShortenUrlResponse.php
@@ -10,7 +10,6 @@
  */
 class ShortenUrlResponse extends BaseAbstractResponse
 {
-
     public function getShortUrl()
     {
         $data = $this->getData();
diff --git a/src/MwebGateway.php b/src/MwebGateway.php
@@ -8,7 +8,6 @@
  */
 class MwebGateway extends BaseAbstractGateway
 {
-
     public function getName()
     {
         return 'WechatPay Mweb';
diff --git a/src/NativeGateway.php b/src/NativeGateway.php
diff --git a/src/PosGateway.php b/src/PosGateway.php
diff --git a/tests/GatewayTest.php b/tests/GatewayTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`*/`
`9`	`9`	`class AppGateway extends BaseAbstractGateway`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`public function getName()`
`13`	`12`	`{`
`14`	`13`	`return 'WechatPay App';`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`abstract class BaseAbstractGateway extends AbstractGateway`
`8`	`8`	`{`
`9`		`-`
`10`	`9`	`public function setTradeType($tradeType)`
`11`	`10`	`{`
`12`	`11`	`$this->setParameter('trade_type', $tradeType);`
`@@ -102,7 +101,7 @@ public function setKeyPath($keyPath)`
`102`	`101`	`*`
`103`	`102`	`* @return \Omnipay\WechatPay\Message\CreateOrderRequest`
`104`	`103`	`*/`
`105`		`- public function purchase($parameters = array ())`
	`104`	`+ public function purchase($parameters = array())`
`106`	`105`	`{`
`107`	`106`	`$parameters['trade_type'] = $this->getTradeType();`
`108`	`107`
`@@ -121,12 +120,12 @@ public function getTradeType()`
`121`	`120`	`*`
`122`	`121`	`* @return \Omnipay\WechatPay\Message\CompletePurchaseRequest`
`123`	`122`	`*/`
`124`		`- public function completePurchase($parameters = array ())`
	`123`	`+ public function completePurchase($parameters = array())`
`125`	`124`	`{`
`126`	`125`	`return $this->createRequest('\Omnipay\WechatPay\Message\CompletePurchaseRequest', $parameters);`
`127`	`126`	`}`
`128`	`127`
`129`		`- public function completeRefund($parameters = array ())`
	`128`	`+ public function completeRefund($parameters = array())`
`130`	`129`	`{`
`131`	`130`	`return $this->createRequest('\Omnipay\WechatPay\Message\CompleteRefundRequest', $parameters);`
`132`	`131`	`}`
`@@ -137,7 +136,7 @@ public function completeRefund($parameters = array ())`
`137`	`136`	`*`
`138`	`137`	`* @return \Omnipay\WechatPay\Message\QueryOrderRequest`
`139`	`138`	`*/`
`140`		`- public function query($parameters = array ())`
	`139`	`+ public function query($parameters = array())`
`141`	`140`	`{`
`142`	`141`	`return $this->createRequest('\Omnipay\WechatPay\Message\QueryOrderRequest', $parameters);`
`143`	`142`	`}`
`@@ -148,7 +147,7 @@ public function query($parameters = array ())`
`148`	`147`	`*`
`149`	`148`	`* @return \Omnipay\WechatPay\Message\CloseOrderRequest`
`150`	`149`	`*/`
`151`		`- public function close($parameters = array ())`
	`150`	`+ public function close($parameters = array())`
`152`	`151`	`{`
`153`	`152`	`return $this->createRequest('\Omnipay\WechatPay\Message\CloseOrderRequest', $parameters);`
`154`	`153`	`}`
`@@ -159,7 +158,7 @@ public function close($parameters = array ())`
`159`	`158`	`*`
`160`	`159`	`* @return \Omnipay\WechatPay\Message\RefundOrderRequest`
`161`	`160`	`*/`
`162`		`- public function refund($parameters = array ())`
	`161`	`+ public function refund($parameters = array())`
`163`	`162`	`{`
`164`	`163`	`return $this->createRequest('\Omnipay\WechatPay\Message\RefundOrderRequest', $parameters);`
`165`	`164`	`}`
`@@ -170,7 +169,7 @@ public function refund($parameters = array ())`
`170`	`169`	`*`
`171`	`170`	`* @return \Omnipay\WechatPay\Message\QueryOrderRequest`
`172`	`171`	`*/`
`173`		`- public function queryRefund($parameters = array ())`
	`172`	`+ public function queryRefund($parameters = array())`
`174`	`173`	`{`
`175`	`174`	`return $this->createRequest('\Omnipay\WechatPay\Message\QueryRefundRequest', $parameters);`
`176`	`175`	`}`
`@@ -181,7 +180,7 @@ public function queryRefund($parameters = array ())`
`181`	`180`	`*`
`182`	`181`	`* @return \Omnipay\WechatPay\Message\DownloadBillRequest`
`183`	`182`	`*/`
`184`		`- public function downloadBill($parameters = array ())`
	`183`	`+ public function downloadBill($parameters = array())`
`185`	`184`	`{`
`186`	`185`	`return $this->createRequest('\Omnipay\WechatPay\Message\DownloadBillRequest', $parameters);`
`187`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`*/`
`9`	`9`	`class Gateway extends BaseAbstractGateway`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`public function getName()`
`13`	`12`	`{`
`14`	`13`	`return 'WechatPay';`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`class Helper`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`public static function array2xml($arr, $root = 'xml')`
`9`	`8`	`{`
`10`	`9`	`$xml = "<$root>";`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`*/`
`9`	`9`	`class JsGateway extends BaseAbstractGateway`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`public function getName()`
`13`	`12`	`{`
`14`	`13`	`return 'WechatPay JS API/MP';`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,4 @@`
`10`	`10`	`*/`
`11`	`11`	`class CloseOrderResponse extends BaseAbstractResponse`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`*/`
`15`	`15`	`class CompletePurchaseRequest extends BaseAbstractRequest`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`public function setRequestParams($requestParams)`
`19`	`18`	`{`
`20`	`19`	`$this->setParameter('request_params', $requestParams);`
`@@ -33,7 +32,7 @@ public function sendData($data)`
`33`	`32`	`$data = $this->getData();`
`34`	`33`	`$sign = Helper::sign($data, $this->getApiKey());`
`35`	`34`
`36`		`- $responseData = array ();`
	`35`	`+ $responseData = array();`
`37`	`36`
`38`	`37`	`if (isset($data['sign']) && $data['sign'] && $sign === $data['sign']) {`
`39`	`38`	`$responseData['sign_match'] = true;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`*/`
`14`	`14`	`class CompleteRefundRequest extends BaseAbstractRequest`
`15`	`15`	`{`
`16`		`-`
`17`	`16`	`public function setRequestParams($requestParams)`
`18`	`17`	`{`
`19`	`18`	`$this->setParameter('request_params', $requestParams);`
`@@ -24,7 +23,7 @@ public function sendData($data)`
`24`	`23`	`$data = $this->getData();`
`25`	`24`	`$sign = Helper::sign($data, $this->getApiKey());`
`26`	`25`
`27`		`- $responseData = array ();`
	`26`	`+ $responseData = array();`
`28`	`27`
`29`	`28`	`if (isset($data['sign']) && $data['sign'] && $sign === $data['sign']) {`
`30`	`29`	`$responseData['sign_match'] = true;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`*/`
`13`	`13`	`class CompleteRefundResponse extends AbstractResponse`
`14`	`14`	`{`
`15`		`-`
`16`	`15`	`public function isSuccessful()`
`17`	`16`	`{`
`18`	`17`	`return $this->isRefunded();`