Completed
Push — master ( 347ac3...226098 )
by Songda
03:44
created
src/Gateways/Wechat.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
      * @author yansongda <[email protected]>
122 122
      *
123 123
      * @param string $gateway
124
-     * @param array  $params
124
+     * @param string  $params
125 125
      *
126 126
      * @throws InvalidGatewayException
127 127
      *
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 
146 146
         $this->payload = array_merge($this->payload, $params);
147 147
 
148
-        $gateway = get_class($this).'\\'.Str::studly($gateway).'Gateway';
148
+        $gateway = get_class($this) . '\\' . Str::studly($gateway) . 'Gateway';
149 149
 
150 150
         if (class_exists($gateway)) {
151 151
             return $this->makePay($gateway);
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
         );
345 345
 
346 346
         if (is_array($result)) {
347
-            throw new GatewayException('Get Wechat API Error: '.$result['return_msg'], $result);
347
+            throw new GatewayException('Get Wechat API Error: ' . $result['return_msg'], $result);
348 348
         }
349 349
 
350 350
         return $result;
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
         $app = new $gateway();
367 367
 
368 368
         if ($app instanceof GatewayInterface) {
369
-            return $app->pay($this->gateway, array_filter($this->payload, function ($value) {
369
+            return $app->pay($this->gateway, array_filter($this->payload, function($value) {
370 370
                 return $value !== '' && !is_null($value);
371 371
             }));
372 372
         }
Please login to merge, or discard this patch.
src/Gateways/Wechat/RedpackGateway.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         }
37 37
 
38 38
         unset($payload['appid'], $payload['trade_type'],
39
-              $payload['notify_url'], $payload['spbill_create_ip']);
39
+                $payload['notify_url'], $payload['spbill_create_ip']);
40 40
 
41 41
         $payload['sign'] = Support::generateSign($payload);
42 42
 
Please login to merge, or discard this patch.
src/Gateways/Wechat/GroupRedpackGateway.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         }
37 37
 
38 38
         unset($payload['appid'], $payload['trade_type'],
39
-              $payload['notify_url'], $payload['spbill_create_ip']);
39
+                $payload['notify_url'], $payload['spbill_create_ip']);
40 40
 
41 41
         $payload['sign'] = Support::generateSign($payload);
42 42
 
Please login to merge, or discard this patch.
src/Gateways/Alipay.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
         $this->payload['biz_content'] = json_encode($params);
125 125
 
126
-        $gateway = get_class($this).'\\'.Str::studly($gateway).'Gateway';
126
+        $gateway = get_class($this) . '\\' . Str::studly($gateway) . 'Gateway';
127 127
 
128 128
         if (class_exists($gateway)) {
129 129
             return $this->makePay($gateway);
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         $app = new $gateway();
333 333
 
334 334
         if ($app instanceof GatewayInterface) {
335
-            return $app->pay($this->gateway, array_filter($this->payload, function ($value) {
335
+            return $app->pay($this->gateway, array_filter($this->payload, function($value) {
336 336
                 return $value !== '' && !is_null($value);
337 337
             }));
338 338
         }
Please login to merge, or discard this patch.
src/Gateways/Alipay/WebGateway.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,10 +47,10 @@
 block discarded – undo
47 47
      */
48 48
     protected function buildPayHtml($endpoint, $payload): Response
49 49
     {
50
-        $sHtml = "<form id='alipaysubmit' name='alipaysubmit' action='".$endpoint."' method='POST'>";
50
+        $sHtml = "<form id='alipaysubmit' name='alipaysubmit' action='" . $endpoint . "' method='POST'>";
51 51
         foreach ($payload as $key => $val) {
52 52
             $val = str_replace("'", '&apos;', $val);
53
-            $sHtml .= "<input type='hidden' name='".$key."' value='".$val."'/>";
53
+            $sHtml .= "<input type='hidden' name='" . $key . "' value='" . $val . "'/>";
54 54
         }
55 55
         $sHtml .= "<input type='submit' value='ok' style='display:none;'></form>";
56 56
         $sHtml .= "<script>document.forms['alipaysubmit'].submit();</script>";
Please login to merge, or discard this patch.
src/Pay.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
      */
74 74
     protected function create($method): GatewayApplicationInterface
75 75
     {
76
-        $gateway = __NAMESPACE__.'\\Gateways\\'.Str::studly($method);
76
+        $gateway = __NAMESPACE__ . '\\Gateways\\' . Str::studly($method);
77 77
 
78 78
         if (class_exists($gateway)) {
79 79
             return self::make($gateway);
Please login to merge, or discard this patch.
src/Gateways/Wechat/WapGateway.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@
 block discarded – undo
29 29
 
30 30
         $mweb_url = $this->preOrder($payload)->get('mweb_url');
31 31
 
32
-        $url = is_null(Support::getInstance()->return_url) ? $mweb_url : $mweb_url.
33
-                        '&redirect_url='.urlencode(Support::getInstance()->return_url);
32
+        $url = is_null(Support::getInstance()->return_url) ? $mweb_url : $mweb_url .
33
+                        '&redirect_url=' . urlencode(Support::getInstance()->return_url);
34 34
 
35 35
         return RedirectResponse::create($url);
36 36
     }
Please login to merge, or discard this patch.
src/Gateways/Wechat/MpGateway.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
             'appId'     => !$this->payRequestUseSubAppId ? $payload['appid'] : $payload['sub_appid'],
37 37
             'timeStamp' => strval(time()),
38 38
             'nonceStr'  => Str::random(),
39
-            'package'   => 'prepay_id='.$this->preOrder($payload)->get('prepay_id'),
39
+            'package'   => 'prepay_id=' . $this->preOrder($payload)->get('prepay_id'),
40 40
             'signType'  => 'MD5',
41 41
         ];
42 42
         $pay_request['paySign'] = Support::generateSign($pay_request);
Please login to merge, or discard this patch.
src/Gateways/Alipay/Support.php 1 patch
Spacing   +12 added lines, -13 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     {
126 126
         Events::dispatch(Events::API_REQUESTING, new Events\ApiRequesting('Alipay', '', self::$instance->getBaseUri(), $data));
127 127
 
128
-        $data = array_filter($data, function ($value) {
128
+        $data = array_filter($data, function($value) {
129 129
             return ($value == '' || is_null($value)) ? false : true;
130 130
         });
131 131
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
         Events::dispatch(Events::API_REQUESTED, new Events\ApiRequested('Alipay', '', self::$instance->getBaseUri(), $result));
136 136
 
137
-        $method = str_replace('.', '_', $data['method']).'_response';
137
+        $method = str_replace('.', '_', $data['method']) . '_response';
138 138
 
139 139
         if (!isset($result['sign']) || $result[$method]['code'] != '10000') {
140 140
             throw new GatewayException(
141
-                'Get Alipay API Error:'.$result[$method]['msg'].($result[$method]['sub_code'] ?? ''),
141
+                'Get Alipay API Error:' . $result[$method]['msg'] . ($result[$method]['sub_code'] ?? ''),
142 142
                 $result,
143 143
                 $result[$method]['code']
144 144
             );
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
 
175 175
         if (Str::endsWith($privateKey, '.pem')) {
176 176
             $privateKey = openssl_pkey_get_private($privateKey);
177
-        } else {
178
-            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n".
179
-                wordwrap($privateKey, 64, "\n", true).
177
+        }else {
178
+            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" .
179
+                wordwrap($privateKey, 64, "\n", true) .
180 180
                 "\n-----END RSA PRIVATE KEY-----";
181 181
         }
182 182
 
@@ -212,16 +212,15 @@  discard block
 block discarded – undo
212 212
 
213 213
         if (Str::endsWith($publicKey, '.pem')) {
214 214
             $publicKey = openssl_pkey_get_public($publicKey);
215
-        } else {
216
-            $publicKey = "-----BEGIN PUBLIC KEY-----\n".
217
-                wordwrap($publicKey, 64, "\n", true).
215
+        }else {
216
+            $publicKey = "-----BEGIN PUBLIC KEY-----\n" .
217
+                wordwrap($publicKey, 64, "\n", true) .
218 218
                 "\n-----END PUBLIC KEY-----";
219 219
         }
220 220
 
221 221
         $sign = $sign ?? $data['sign'];
222 222
 
223
-        $toVerify = $sync ? mb_convert_encoding(json_encode($data, JSON_UNESCAPED_UNICODE), 'gb2312', 'utf-8') :
224
-                            self::getSignContent($data, true);
223
+        $toVerify = $sync ? mb_convert_encoding(json_encode($data, JSON_UNESCAPED_UNICODE), 'gb2312', 'utf-8') : self::getSignContent($data, true);
225 224
 
226 225
         return openssl_verify($toVerify, base64_decode($sign), $publicKey, OPENSSL_ALGO_SHA256) === 1;
227 226
     }
@@ -245,10 +244,10 @@  discard block
 block discarded – undo
245 244
         $stringToBeSigned = '';
246 245
         foreach ($data as $k => $v) {
247 246
             if ($verify && $k != 'sign' && $k != 'sign_type') {
248
-                $stringToBeSigned .= $k.'='.$v.'&';
247
+                $stringToBeSigned .= $k . '=' . $v . '&';
249 248
             }
250 249
             if (!$verify && $v !== '' && !is_null($v) && $k != 'sign' && '@' != substr($v, 0, 1)) {
251
-                $stringToBeSigned .= $k.'='.$v.'&';
250
+                $stringToBeSigned .= $k . '=' . $v . '&';
252 251
             }
253 252
         }
254 253
 
Please login to merge, or discard this patch.