refactor: 所有参数判断使用 $payload->has() 判断是否存在 (#778)

yansongda · Apr 14, 2023 · 5baa7a7 · 5baa7a7
1 parent d676442
commit 5baa7a7
Show file tree

Hide file tree

Showing 30 changed files with 40 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - refactor: 重构 ArrayParser 类(#754)
 - refactor: coding style(#769)
 - refactor: 优化现有微信v2插件代码(#772)
+- refactor: 所有参数判断使用 `$payload->has()` 判断是否存在(#778)
 
 ### changed
 

diff --git a/src/Plugin/Wechat/Ecommerce/Refund/QueryPlugin.php b/src/Plugin/Wechat/Ecommerce/Refund/QueryPlugin.php
@@ -37,11 +37,11 @@ protected function getPartnerUri(Rocket $rocket): string
         $config = get_wechat_config($rocket->getParams());
         $subMchId = $payload->get('sub_mchid', $config['sub_mch_id'] ?? '');
 
-        if (!is_null($payload->get('refund_id'))) {
+        if ($payload->has('refund_id')) {
             return 'v3/ecommerce/refunds/id/'.$payload->get('refund_id').'?sub_mchid='.$subMchId;
         }
 
-        if (!is_null($payload->get('out_refund_no'))) {
+        if ($payload->has('out_refund_no')) {
             return 'v3/ecommerce/refunds/out-refund-no/'.$payload->get('out_refund_no').'?sub_mchid='.$subMchId;
         }
 

diff --git a/src/Plugin/Wechat/Ecommerce/Refund/QueryReturnAdvancePlugin.php b/src/Plugin/Wechat/Ecommerce/Refund/QueryReturnAdvancePlugin.php
@@ -37,7 +37,7 @@ protected function getPartnerUri(Rocket $rocket): string
         $config = get_wechat_config($rocket->getParams());
         $subMchId = $payload->get('sub_mchid', $config['sub_mch_id'] ?? '');
 
-        if (is_null($payload->get('refund_id'))) {
+        if (!$payload->has('refund_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Ecommerce/Refund/ReturnAdvancePlugin.php b/src/Plugin/Wechat/Ecommerce/Refund/ReturnAdvancePlugin.php
@@ -34,7 +34,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('refund_id'))) {
+        if (!$payload->has('refund_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Balance/QueryDayEndPlugin.php b/src/Plugin/Wechat/Fund/Balance/QueryDayEndPlugin.php
@@ -27,7 +27,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('account_type')) || is_null($payload->get('date'))) {
+        if (!$payload->has('account_type') || !$payload->has('date')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Balance/QueryPlugin.php b/src/Plugin/Wechat/Fund/Balance/QueryPlugin.php
@@ -27,7 +27,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('account_type'))) {
+        if (!$payload->has('account_type')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Profitsharing/DownloadBillPlugin.php b/src/Plugin/Wechat/Fund/Profitsharing/DownloadBillPlugin.php
@@ -22,7 +22,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('download_url'))) {
+        if (!$payload->has('download_url')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Profitsharing/QueryAmountsPlugin.php b/src/Plugin/Wechat/Fund/Profitsharing/QueryAmountsPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('transaction_id'))) {
+        if (!$payload->has('transaction_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Profitsharing/QueryPlugin.php b/src/Plugin/Wechat/Fund/Profitsharing/QueryPlugin.php
@@ -39,8 +39,7 @@ protected function getUri(Rocket $rocket): string
         $payload = $rocket->getPayload();
         $config = get_wechat_config($rocket->getParams());
 
-        if (is_null($payload->get('out_order_no'))
-            || is_null($payload->get('transaction_id'))) {
+        if (!$payload->has('out_order_no') || !$payload->has('transaction_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Profitsharing/QueryReturnPlugin.php b/src/Plugin/Wechat/Fund/Profitsharing/QueryReturnPlugin.php
@@ -39,8 +39,7 @@ protected function getUri(Rocket $rocket): string
         $payload = $rocket->getPayload();
         $config = get_wechat_config($rocket->getParams());
 
-        if (is_null($payload->get('out_return_no'))
-            || is_null($payload->get('out_order_no'))) {
+        if (!$payload->has('out_return_no') || !$payload->has('out_order_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/CreateBillReceiptPlugin.php b/src/Plugin/Wechat/Fund/Transfer/CreateBillReceiptPlugin.php
@@ -21,7 +21,7 @@ protected function doSomething(Rocket $rocket): void
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no'))) {
+        if (!$payload->has('out_batch_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
     }

diff --git a/src/Plugin/Wechat/Fund/Transfer/CreateDetailReceiptPlugin.php b/src/Plugin/Wechat/Fund/Transfer/CreateDetailReceiptPlugin.php
@@ -21,7 +21,7 @@ protected function doSomething(Rocket $rocket): void
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_detail_no')) || is_null($payload->get('accept_type'))) {
+        if (!$payload->has('out_detail_no') || !$payload->has('accept_type')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
     }

diff --git a/src/Plugin/Wechat/Fund/Transfer/DownloadReceiptPlugin.php b/src/Plugin/Wechat/Fund/Transfer/DownloadReceiptPlugin.php
@@ -22,7 +22,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('download_url'))) {
+        if (!$payload->has('download_url')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryBatchDetailIdPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryBatchDetailIdPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('batch_id')) || is_null($payload->get('detail_id'))) {
+        if (!$payload->has('batch_id') || !$payload->get('detail_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 
@@ -48,7 +48,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('batch_id')) || is_null($payload->get('detail_id'))) {
+        if (!$payload->has('batch_id') || !$payload->has('detail_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryBatchIdPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryBatchIdPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('batch_id')) || is_null($payload->get('need_query_detail'))) {
+        if (!$payload->has('batch_id') || !$payload->has('need_query_detail')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 
@@ -50,7 +50,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('batch_id')) || is_null($payload->get('need_query_detail'))) {
+        if (!$payload->has('batch_id') || !$payload->has('need_query_detail')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryBillReceiptPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryBillReceiptPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no'))) {
+        if (!$payload->has('out_batch_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryDetailReceiptPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryDetailReceiptPlugin.php
@@ -26,7 +26,7 @@ protected function doSomething(Rocket $rocket): void
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_detail_no')) || is_null($payload->get('accept_type'))) {
+        if (!$payload->has('out_detail_no') || !$payload->has('accept_type')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryOutBatchDetailNoPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryOutBatchDetailNoPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no')) || is_null($payload->get('out_detail_no'))) {
+        if (!$payload->has('out_batch_no') || !$payload->has('out_detail_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 
@@ -48,7 +48,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no')) || is_null($payload->get('out_detail_no'))) {
+        if (!$payload->has('out_batch_no') || !$payload->has('out_detail_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Fund/Transfer/QueryOutBatchNoPlugin.php b/src/Plugin/Wechat/Fund/Transfer/QueryOutBatchNoPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no')) || is_null($payload->get('need_query_detail'))) {
+        if (!$payload->has('out_batch_no') || !$payload->has('need_query_detail')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 
@@ -50,7 +50,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_batch_no')) || is_null($payload->get('need_query_detail'))) {
+        if (!$payload->has('out_batch_no') || !$payload->has('need_query_detail')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Pay/Combine/ClosePlugin.php b/src/Plugin/Wechat/Pay/Combine/ClosePlugin.php
@@ -22,8 +22,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('combine_out_trade_no'))
-            && is_null($payload->get('out_trade_no'))) {
+        if (!$payload->has('combine_out_trade_no') && !$payload->has('out_trade_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Pay/Combine/QueryPlugin.php b/src/Plugin/Wechat/Pay/Combine/QueryPlugin.php
@@ -17,8 +17,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('combine_out_trade_no'))
-            && is_null($payload->get('transaction_id'))) {
+        if (!$payload->has('combine_out_trade_no') && !$payload->has('transaction_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Pay/Common/ClosePlugin.php b/src/Plugin/Wechat/Pay/Common/ClosePlugin.php
@@ -25,7 +25,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_trade_no'))) {
+        if (!$payload->has('out_trade_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 
@@ -41,7 +41,7 @@ protected function getPartnerUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_trade_no'))) {
+        if (!$payload->has('out_trade_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Pay/Common/DownloadBillPlugin.php b/src/Plugin/Wechat/Pay/Common/DownloadBillPlugin.php
@@ -19,7 +19,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('download_url'))) {
+        if (!$payload->has('download_url')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Pay/Common/QueryPlugin.php b/src/Plugin/Wechat/Pay/Common/QueryPlugin.php
@@ -25,13 +25,13 @@ protected function getUri(Rocket $rocket): string
         $config = get_wechat_config($rocket->getParams());
         $payload = $rocket->getPayload();
 
-        if (!is_null($payload->get('transaction_id'))) {
+        if ($payload->has('transaction_id')) {
             return 'v3/pay/transactions/id/'.
                 $payload->get('transaction_id').
                 '?mchid='.($config['mch_id'] ?? '');
         }
 
-        if (!is_null($payload->get('out_trade_no'))) {
+        if ($payload->has('out_trade_no')) {
             return 'v3/pay/transactions/out-trade-no/'.
                 $payload->get('out_trade_no').
                 '?mchid='.($config['mch_id'] ?? '');
@@ -50,14 +50,14 @@ protected function getPartnerUri(Rocket $rocket): string
         $config = get_wechat_config($rocket->getParams());
         $payload = $rocket->getPayload();
 
-        if (!is_null($payload->get('transaction_id'))) {
+        if ($payload->has('transaction_id')) {
             return 'v3/pay/partner/transactions/id/'.
                 $payload->get('transaction_id').
                 '?sp_mchid='.($config['mch_id'] ?? '').
                 '&sub_mchid='.$payload->get('sub_mchid', $config['sub_mch_id'] ?? null);
         }
 
-        if (!is_null($payload->get('out_trade_no'))) {
+        if ($payload->has('out_trade_no')) {
             return 'v3/pay/partner/transactions/out-trade-no/'.
                 $payload->get('out_trade_no').
                 '?sp_mchid='.($config['mch_id'] ?? '').

diff --git a/src/Plugin/Wechat/Pay/Common/QueryRefundPlugin.php b/src/Plugin/Wechat/Pay/Common/QueryRefundPlugin.php
@@ -22,7 +22,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('out_refund_no'))) {
+        if (!$payload->has('out_refund_no')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Risk/Complaints/CompleteComplaintPlugin.php b/src/Plugin/Wechat/Risk/Complaints/CompleteComplaintPlugin.php
@@ -43,7 +43,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('complaint_id'))) {
+        if (!$payload->has('complaint_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Risk/Complaints/DownloadMediaPlugin.php b/src/Plugin/Wechat/Risk/Complaints/DownloadMediaPlugin.php
@@ -22,7 +22,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('media_url'))) {
+        if (!$payload->has('media_url')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Risk/Complaints/QueryComplaintDetailPlugin.php b/src/Plugin/Wechat/Risk/Complaints/QueryComplaintDetailPlugin.php
@@ -31,7 +31,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('complaint_id'))) {
+        if (!$payload->has('complaint_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Risk/Complaints/ResponseComplaintPlugin.php b/src/Plugin/Wechat/Risk/Complaints/ResponseComplaintPlugin.php
@@ -32,7 +32,7 @@ protected function doSomething(Rocket $rocket): void
 
         $payload->forget('complaint_id');
 
-        if (is_null($payload->get('complainted_mchid'))) {
+        if (!$payload->has('complainted_mchid')) {
             $rocket->mergePayload([
                 'complainted_mchid' => $config['mch_id'] ?? '',
             ]);
@@ -46,7 +46,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('complaint_id'))) {
+        if (!$payload->has('complaint_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }
 

diff --git a/src/Plugin/Wechat/Risk/Complaints/UpdateRefundPlugin.php b/src/Plugin/Wechat/Risk/Complaints/UpdateRefundPlugin.php
@@ -26,7 +26,7 @@ protected function getUri(Rocket $rocket): string
     {
         $payload = $rocket->getPayload();
 
-        if (is_null($payload->get('complaint_id'))) {
+        if (!$payload->has('complaint_id')) {
             throw new InvalidParamsException(Exception::MISSING_NECESSARY_PARAMS);
         }