Completed
Push — master ( 4acb65...24404c )
by Songda
01:42
created
src/Gateways/Alipay/Support.php 1 patch
Spacing   +12 added lines, -13 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     {
131 131
         Log::debug('Request To Alipay Api', [self::getInstance()->getBaseUri(), $data]);
132 132
 
133
-        $data = array_filter($data, function ($value) {
133
+        $data = array_filter($data, function($value) {
134 134
             return ($value == '' || is_null($value)) ? false : true;
135 135
         });
136 136
 
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 
140 140
         Log::debug('Result Of Alipay Api', $result);
141 141
 
142
-        $method = str_replace('.', '_', $data['method']).'_response';
142
+        $method = str_replace('.', '_', $data['method']) . '_response';
143 143
 
144 144
         if (!isset($result['sign']) || $result[$method]['code'] != '10000') {
145 145
             throw new GatewayException(
146
-                'Get Alipay API Error:'.$result[$method]['msg'].($result[$method]['sub_code'] ?? ''),
146
+                'Get Alipay API Error:' . $result[$method]['msg'] . ($result[$method]['sub_code'] ?? ''),
147 147
                 $result,
148 148
                 $result[$method]['code']
149 149
             );
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 
181 181
         if (Str::endsWith($privateKey, '.pem')) {
182 182
             $privateKey = openssl_pkey_get_private($privateKey);
183
-        } else {
184
-            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n".
185
-                wordwrap($privateKey, 64, "\n", true).
183
+        }else {
184
+            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" .
185
+                wordwrap($privateKey, 64, "\n", true) .
186 186
                 "\n-----END RSA PRIVATE KEY-----";
187 187
         }
188 188
 
@@ -219,16 +219,15 @@  discard block
 block discarded – undo
219 219
 
220 220
         if (Str::endsWith($publicKey, '.pem')) {
221 221
             $publicKey = openssl_pkey_get_public($publicKey);
222
-        } else {
223
-            $publicKey = "-----BEGIN PUBLIC KEY-----\n".
224
-                wordwrap($publicKey, 64, "\n", true).
222
+        }else {
223
+            $publicKey = "-----BEGIN PUBLIC KEY-----\n" .
224
+                wordwrap($publicKey, 64, "\n", true) .
225 225
                 "\n-----END PUBLIC KEY-----";
226 226
         }
227 227
 
228 228
         $sign = $sign ?? $data['sign'];
229 229
 
230
-        $toVerify = $sync ? mb_convert_encoding(json_encode($data, JSON_UNESCAPED_UNICODE), 'gb2312', 'utf-8') :
231
-                            self::getSignContent($data, true);
230
+        $toVerify = $sync ? mb_convert_encoding(json_encode($data, JSON_UNESCAPED_UNICODE), 'gb2312', 'utf-8') : self::getSignContent($data, true);
232 231
 
233 232
         return openssl_verify($toVerify, base64_decode($sign), $publicKey, OPENSSL_ALGO_SHA256) === 1;
234 233
     }
@@ -252,10 +251,10 @@  discard block
 block discarded – undo
252 251
         $stringToBeSigned = '';
253 252
         foreach ($data as $k => $v) {
254 253
             if ($verify && $k != 'sign' && $k != 'sign_type') {
255
-                $stringToBeSigned .= $k.'='.$v.'&';
254
+                $stringToBeSigned .= $k . '=' . $v . '&';
256 255
             }
257 256
             if (!$verify && $v !== '' && !is_null($v) && $k != 'sign' && '@' != substr($v, 0, 1)) {
258
-                $stringToBeSigned .= $k.'='.$v.'&';
257
+                $stringToBeSigned .= $k . '=' . $v . '&';
259 258
             }
260 259
         }
261 260
 
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/WapGateway.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@
 block discarded – undo
30 30
 
31 31
         $data = $this->preOrder($payload);
32 32
 
33
-        $url = is_null(Support::getInstance()->return_url) ? $data->mweb_url : $data->mweb_url.
34
-                        '&redirect_url='.urlencode(Support::getInstance()->return_url);
33
+        $url = is_null(Support::getInstance()->return_url) ? $data->mweb_url : $data->mweb_url .
34
+                        '&redirect_url=' . urlencode(Support::getInstance()->return_url);
35 35
 
36 36
         return RedirectResponse::create($url);
37 37
     }
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
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
             'appId'     => $payload['appid'],
32 32
             'timeStamp' => strval(time()),
33 33
             'nonceStr'  => Str::random(),
34
-            'package'   => 'prepay_id='.$this->preOrder($payload)->prepay_id,
34
+            'package'   => 'prepay_id=' . $this->preOrder($payload)->prepay_id,
35 35
             'signType'  => 'MD5',
36 36
         ];
37 37
         $payRequest['paySign'] = Support::generateSign($payRequest);
Please login to merge, or discard this patch.
src/Gateways/Wechat/Support.php 1 patch
Spacing   +7 added lines, -8 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
      */
138 138
     public static function requestApi($endpoint, $data, $cert = false): Collection
139 139
     {
140
-        Log::debug('Request To Wechat Api', [self::getInstance()->getBaseUri().$endpoint, $data]);
140
+        Log::debug('Request To Wechat Api', [self::getInstance()->getBaseUri() . $endpoint, $data]);
141 141
 
142 142
         $result = self::getInstance()->post(
143 143
             $endpoint,
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
         if (!isset($result['return_code']) || $result['return_code'] != 'SUCCESS' || $result['result_code'] != 'SUCCESS') {
155 155
             throw new GatewayException(
156
-                'Get Wechat API Error:'.$result['return_msg'].($result['err_code_des'] ?? ''),
156
+                'Get Wechat API Error:' . $result['return_msg'] . ($result['err_code_des'] ?? ''),
157 157
                 $result,
158 158
                 20000
159 159
             );
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
         $payload['appid'] = self::getInstance()->getConfig($type, '');
194 194
 
195 195
         if (self::getInstance()->getConfig('mode', Wechat::MODE_NORMAL) === Wechat::MODE_SERVICE) {
196
-            $payload['sub_appid'] = self::getInstance()->getConfig('sub_'.$type, '');
196
+            $payload['sub_appid'] = self::getInstance()->getConfig('sub_' . $type, '');
197 197
         }
198 198
 
199 199
         unset($payload['trade_type'], $payload['type']);
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 
229 229
         ksort($data);
230 230
 
231
-        $string = md5(self::getSignContent($data).'&key='.$key);
231
+        $string = md5(self::getSignContent($data) . '&key=' . $key);
232 232
 
233 233
         Log::debug('Wechat Generate Sign Before UPPER', [$data, $string]);
234 234
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         $buff = '';
250 250
 
251 251
         foreach ($data as $k => $v) {
252
-            $buff .= ($k != 'sign' && $v != '' && !is_array($v)) ? $k.'='.$v.'&' : '';
252
+            $buff .= ($k != 'sign' && $v != '' && !is_array($v)) ? $k . '=' . $v . '&' : '';
253 253
         }
254 254
 
255 255
         Log::debug('Wechat Generate Sign Content Before Trim', [$data, $buff]);
@@ -297,8 +297,7 @@  discard block
 block discarded – undo
297 297
 
298 298
         $xml = '<xml>';
299 299
         foreach ($data as $key => $val) {
300
-            $xml .= is_numeric($val) ? '<'.$key.'>'.$val.'</'.$key.'>' :
301
-                                       '<'.$key.'><![CDATA['.$val.']]></'.$key.'>';
300
+            $xml .= is_numeric($val) ? '<' . $key . '>' . $val . '</' . $key . '>' : '<' . $key . '><![CDATA[' . $val . ']]></' . $key . '>';
302 301
         }
303 302
         $xml .= '</xml>';
304 303
 
@@ -377,7 +376,7 @@  discard block
 block discarded – undo
377 376
      */
378 377
     public function getTypeName($type = ''): string
379 378
     {
380
-        $type = $type.'_id';
379
+        $type = $type . '_id';
381 380
 
382 381
         if ($type == 'app') {
383 382
             $type = 'appid';
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
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         $this->mode !== Wechat::MODE_SERVICE ?: $payload['msgappid'] = $payload['appid'];
31 31
 
32 32
         unset($payload['appid'], $payload['trade_type'],
33
-              $payload['notify_url'], $payload['spbill_create_ip']);
33
+                $payload['notify_url'], $payload['spbill_create_ip']);
34 34
 
35 35
         $payload['sign'] = Support::generateSign($payload);
36 36
 
Please login to merge, or discard this patch.