yansongda / pay

src/Gateways/Wechat/Support.php

Spacing +9 added lines, -10 removed lines

@@ -151,7 +151,7 @@ 
      */
     public static function requestApi($endpoint, $data, $cert = false): Collection
     {
-        Events::dispatch(new Events\ApiRequesting('Wechat', '', self::$instance->getBaseUri().$endpoint, $data));
+        Events::dispatch(new Events\ApiRequesting('Wechat', '', self::$instance->getBaseUri() . $endpoint, $data));
 
         $result = self::$instance->post(
             $endpoint,
@@ -163,7 +163,7 @@ 
         );
         $result = is_array($result) ? $result : self::fromXml($result);
 
-        Events::dispatch(new Events\ApiRequested('Wechat', '', self::$instance->getBaseUri().$endpoint, $result));
+        Events::dispatch(new Events\ApiRequested('Wechat', '', self::$instance->getBaseUri() . $endpoint, $result));
 
         return self::processingApiResult($endpoint, $result);
     }
@@ -190,7 +190,7 @@ 
         $payload['appid'] = self::$instance->getConfig($type, '');
 
         if (Wechat::MODE_SERVICE === self::$instance->getConfig('mode', Wechat::MODE_NORMAL)) {
-            $payload['sub_appid'] = self::$instance->getConfig('sub_'.$type, '');
+            $payload['sub_appid'] = self::$instance->getConfig('sub_' . $type, '');
         }
 
         unset($payload['trade_type'], $payload['type']);
@@ -222,7 +222,7 @@ 
 
         ksort($data);
 
-        $string = md5(self::getSignContent($data).'&key='.$key);
+        $string = md5(self::getSignContent($data) . '&key=' . $key);
 
         Log::debug('Wechat Generate Sign Before UPPER', [$data, $string]);
 
@@ -241,7 +241,7 @@ 
         $buff = '';
 
         foreach ($data as $k => $v) {
-            $buff .= ('sign' != $k && '' != $v && !is_array($v)) ? $k.'='.$v.'&' : '';
+            $buff .= ('sign' != $k && '' != $v && !is_array($v)) ? $k . '=' . $v . '&' : '';
         }
 
         Log::debug('Wechat Generate Sign Content Before Trim', [$data, $buff]);
@@ -283,8 +283,7 @@ 
 
         $xml = '<xml>';
         foreach ($data as $key => $val) {
-            $xml .= is_numeric($val) ? '<'.$key.'>'.$val.'</'.$key.'>' :
-                                       '<'.$key.'><![CDATA['.$val.']]></'.$key.'>';
+            $xml .= is_numeric($val) ? '<' . $key . '>' . $val . '</' . $key . '>' : '<' . $key . '><![CDATA[' . $val . ']]></' . $key . '>';
         }
         $xml .= '</xml>';
 
@@ -351,7 +350,7 @@ 
                 $type = 'appid';
                 break;
             default:
-                $type = $type.'_id';
+                $type = $type . '_id';
         }
 
         return $type;
@@ -385,11 +384,11 @@ 
     protected static function processingApiResult($endpoint, array $result)
     {
         if (!isset($result['return_code']) || 'SUCCESS' != $result['return_code']) {
-            throw new GatewayException('Get Wechat API Error:'.($result['return_msg'] ?? $result['retmsg'] ?? ''), $result);
+            throw new GatewayException('Get Wechat API Error:' . ($result['return_msg'] ?? $result['retmsg'] ?? ''), $result);
         }
 
         if (isset($result['result_code']) && 'SUCCESS' != $result['result_code']) {
-            throw new BusinessException('Wechat Business Error: '.$result['err_code'].' - '.$result['err_code_des'], $result);
+            throw new BusinessException('Wechat Business Error: ' . $result['err_code'] . ' - ' . $result['err_code_des'], $result);
         }
 
         if ('pay/getsignkey' === $endpoint ||

src/Gateways/Alipay/Support.php

Spacing +19 added lines, -19 removed lines

@@ -135,7 +135,7 @@ 
     {
         Events::dispatch(new Events\ApiRequesting('Alipay', '', self::$instance->getBaseUri(), $data));
 
-        $data = array_filter($data, function ($value) {
+        $data = array_filter($data, function($value) {
             return ('' == $value || is_null($value)) ? false : true;
         });
 
@@ -163,11 +163,11 @@ 
 
         if (Str::endsWith($privateKey, '.pem')) {
             $privateKey = openssl_pkey_get_private(
-                Str::startsWith($privateKey, 'file://') ? $privateKey : 'file://'.$privateKey
+                Str::startsWith($privateKey, 'file://') ? $privateKey : 'file://' . $privateKey
             );
-        } else {
-            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n".
-                wordwrap($privateKey, 64, "\n", true).
+        }else {
+            $privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" .
+                wordwrap($privateKey, 64, "\n", true) .
                 "\n-----END RSA PRIVATE KEY-----";
         }
 
@@ -206,11 +206,11 @@ 
             $publicKey = file_get_contents($publicKey);
         } elseif (Str::endsWith($publicKey, '.pem')) {
             $publicKey = openssl_pkey_get_public(
-                Str::startsWith($publicKey, 'file://') ? $publicKey : 'file://'.$publicKey
+                Str::startsWith($publicKey, 'file://') ? $publicKey : 'file://' . $publicKey
             );
-        } else {
-            $publicKey = "-----BEGIN PUBLIC KEY-----\n".
-                wordwrap($publicKey, 64, "\n", true).
+        }else {
+            $publicKey = "-----BEGIN PUBLIC KEY-----\n" .
+                wordwrap($publicKey, 64, "\n", true) .
                 "\n-----END PUBLIC KEY-----";
         }
 
@@ -241,10 +241,10 @@ 
         $stringToBeSigned = '';
         foreach ($data as $k => $v) {
             if ($verify && 'sign' != $k && 'sign_type' != $k) {
-                $stringToBeSigned .= $k.'='.$v.'&';
+                $stringToBeSigned .= $k . '=' . $v . '&';
             }
             if (!$verify && '' !== $v && !is_null($v) && 'sign' != $k && '@' != substr($v, 0, 1)) {
-                $stringToBeSigned .= $k.'='.$v.'&';
+                $stringToBeSigned .= $k . '=' . $v . '&';
             }
         }
 
@@ -327,12 +327,12 @@ 
         }
         $issuer_arr = [];
         foreach ($certdata['issuer'] as $key => $val) {
-            $issuer_arr[] = $key.'='.$val;
+            $issuer_arr[] = $key . '=' . $val;
         }
         $issuer = implode(',', array_reverse($issuer_arr));
         Log::debug('getCertSN:', [$certPath, $issuer, $certdata['serialNumber']]);
 
-        return md5($issuer.$certdata['serialNumber']);
+        return md5($issuer . $certdata['serialNumber']);
     }
 
     /**
@@ -360,21 +360,21 @@ 
         $md5_arr = [];
         foreach ($certStrList as $one) {
             if (!empty(trim($one))) {
-                $_x509data = $one.$kCertificateEnd;
+                $_x509data = $one . $kCertificateEnd;
                 openssl_x509_read($_x509data);
                 $_certdata = openssl_x509_parse($_x509data);
                 if (in_array($_certdata['signatureTypeSN'], ['RSA-SHA256', 'RSA-SHA1'])) {
                     $issuer_arr = [];
                     foreach ($_certdata['issuer'] as $key => $val) {
-                        $issuer_arr[] = $key.'='.$val;
+                        $issuer_arr[] = $key . '=' . $val;
                     }
                     $_issuer = implode(',', array_reverse($issuer_arr));
                     if (0 === strpos($_certdata['serialNumber'], '0x')) {
                         $serialNumber = self::bchexdec($_certdata['serialNumber']);
-                    } else {
+                    }else {
                         $serialNumber = $_certdata['serialNumber'];
                     }
-                    $md5_arr[] = md5($_issuer.$serialNumber);
+                    $md5_arr[] = md5($_issuer . $serialNumber);
                     Log::debug('getRootCertSN Sub:', [$certPath, $_issuer, $serialNumber]);
                 }
             }
@@ -397,10 +397,10 @@ 
      */
     protected static function processingApiResult($data, $result): Collection
     {
-        $method = str_replace('.', '_', $data['method']).'_response';
+        $method = str_replace('.', '_', $data['method']) . '_response';
 
         if (!isset($result['sign']) || '10000' != $result[$method]['code']) {
-            throw new GatewayException('Get Alipay API Error:'.$result[$method]['msg'].(isset($result[$method]['sub_code']) ? (' - '.$result[$method]['sub_code']) : ''), $result);
+            throw new GatewayException('Get Alipay API Error:' . $result[$method]['msg'] . (isset($result[$method]['sub_code']) ? (' - ' . $result[$method]['sub_code']) : ''), $result);
         }
 
         if (self::verifySign($result[$method], true, $result['sign'])) {