change: _type 类型统一定义为渠道id，如: 小程序id，公众号id等；增加 _action 为操作类型用于 shortcut

.php-cs-fixer.php

@@ -7,8 +7,10 @@
 
 return (new PhpCsFixer\Config())
     ->setUsingCache(false)
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PhpCsFixer' => true,
+        'declare_strict_types' => true,
         'single_line_comment_style' => ['comment_types' => ['hash']],
         'general_phpdoc_annotation_remove' => ['annotations' => ['author'], 'case_sensitive' => false],
         'global_namespace_import' => [

CHANGELOG.md

@@ -31,6 +31,7 @@
 - change: ParserInterface 签名由 `?ResponseInterface $response` 变更为 `PackerInterface $packer, ?ResponseInterface $response`(#754)
 - change: \Yansongda\Pay\Plugin\Wechat\RadarSignPlugin 增加 `__construct(JsonPacker $jsonPacker, XmlPacker $xmlPacker)` 方法(#753)
 - change: 所有 `Parser` 更名为 `Direction`(#770, #774)
+- change: '_type' 类型统一定义为渠道id，如: 小程序id，公众号id等；增加 '_action' 为操作类型用于 shortcut(#781)
 
 ## v3.2.14
 

src/Exception/Exception.php

@@ -56,7 +56,7 @@ class Exception extends \Exception
 
     public const PLUGIN_ERROR = 4002;
 
-    public const SHORTCUT_MULTI_TYPE_ERROR = 4003;
+    public const SHORTCUT_MULTI_ACTION_ERROR = 4003;
 
     public const METHOD_NOT_SUPPORTED = 4004;
 

src/Plugin/Alipay/Shortcut/QueryShortcut.php

@@ -19,7 +19,7 @@ class QueryShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (isset($params['out_request_no'])) {
             return $this->refundPlugins();
@@ -29,7 +29,7 @@ public function getPlugins(array $params): array
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Query type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Query action [{$typeMethod}] not supported");
     }
 
     protected function defaultPlugins(): array

src/Plugin/Unipay/Shortcut/CancelShortcut.php

@@ -17,13 +17,13 @@ class CancelShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Cancel type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Cancel action [{$typeMethod}] not supported");
     }
 
     public function defaultPlugins(): array

src/Plugin/Unipay/Shortcut/PosShortcut.php

@@ -18,13 +18,13 @@ class PosShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Pos type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Pos action [{$typeMethod}] not supported");
     }
 
     public function defaultPlugins(): array

src/Plugin/Unipay/Shortcut/QueryShortcut.php

@@ -17,13 +17,13 @@ class QueryShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Query type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Query action [{$typeMethod}] not supported");
     }
 
     public function defaultPlugins(): array

src/Plugin/Unipay/Shortcut/RefundShortcut.php

@@ -17,13 +17,13 @@ class RefundShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Refund type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Refund action [{$typeMethod}] not supported");
     }
 
     public function defaultPlugins(): array

src/Plugin/Unipay/Shortcut/ScanShortcut.php

@@ -20,13 +20,13 @@ class ScanShortcut implements ShortcutInterface
      */
     public function getPlugins(array $params): array
     {
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Scan type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Scan action [{$typeMethod}] not supported");
     }
 
     public function defaultPlugins(): array

src/Plugin/Wechat/Papay/ApplyPlugin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Yansongda\Pay\Plugin\Wechat\Papay;
 
 use Yansongda\Pay\Plugin\Wechat\GeneralV2Plugin;

src/Plugin/Wechat/Papay/ContractOrderPlugin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Yansongda\Pay\Plugin\Wechat\Papay;
 
 use Yansongda\Pay\Plugin\Wechat\GeneralV2Plugin;

src/Plugin/Wechat/Papay/OnlyContractPlugin.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Yansongda\Pay\Plugin\Wechat\Papay;
 
 use Closure;

src/Plugin/Wechat/Shortcut/CloseShortcut.php

@@ -21,13 +21,13 @@ public function getPlugins(array $params): array
             return $this->combinePlugins();
         }
 
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Query type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Query action [{$typeMethod}] not supported");
     }
 
     protected function defaultPlugins(): array

src/Plugin/Wechat/Shortcut/QueryShortcut.php

@@ -22,13 +22,13 @@ public function getPlugins(array $params): array
             return $this->combinePlugins();
         }
 
-        $typeMethod = Str::camel($params['_type'] ?? 'default').'Plugins';
+        $typeMethod = Str::camel($params['_action'] ?? 'default').'Plugins';
 
         if (method_exists($this, $typeMethod)) {
             return $this->{$typeMethod}();
         }
 
-        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_TYPE_ERROR, "Query type [{$typeMethod}] not supported");
+        throw new InvalidParamsException(Exception::SHORTCUT_MULTI_ACTION_ERROR, "Query action [{$typeMethod}] not supported");
     }
 
     protected function defaultPlugins(): array

tests/Plugin/Alipay/Shortcut/QueryShortcutTest.php

@@ -34,22 +34,22 @@ public function testRefund()
     {
         self::assertEquals([
             FastRefundQueryPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'refund']));
+        ], $this->plugin->getPlugins(['_action' => 'refund']));
     }
 
     public function testTransfer()
     {
         self::assertEquals([
             TransCommonQueryPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'transfer']));
+        ], $this->plugin->getPlugins(['_action' => 'transfer']));
     }
 
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Query type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Query action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Unipay/Shortcut/CancelShortcutTest.php

@@ -32,15 +32,15 @@ public function testQrCode()
     {
         self::assertEquals([
             \Yansongda\Pay\Plugin\Unipay\QrCode\CancelPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'qr_code']));
+        ], $this->plugin->getPlugins(['_action' => 'qr_code']));
     }
 
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Cancel type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Cancel action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Unipay/Shortcut/PosShortcutTest.php

@@ -33,15 +33,15 @@ public function testPreAuth()
     {
         self::assertEquals([
             PosPreAuthPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'pre_auth']));
+        ], $this->plugin->getPlugins(['_action' => 'pre_auth']));
     }
 
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Pos type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Pos action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Unipay/Shortcut/QueryShortcutTest.php

@@ -32,15 +32,15 @@ public function testQrCode()
     {
         self::assertEquals([
             \Yansongda\Pay\Plugin\Unipay\QrCode\QueryPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'qr_code']));
+        ], $this->plugin->getPlugins(['_action' => 'qr_code']));
     }
 
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Query type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Query action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Unipay/Shortcut/RefundShortcutTest.php

@@ -31,14 +31,14 @@ public function testQrCode()
     {
         self::assertEquals([
             \Yansongda\Pay\Plugin\Unipay\QrCode\RefundPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'qr_code']));
+        ], $this->plugin->getPlugins(['_action' => 'qr_code']));
     }
 
     public function testFoo()
     {
         $this->expectException(InvalidParamsException::class);
-        $this->expectExceptionMessage('Refund type [fooPlugins] not supported');
+        $this->expectExceptionMessage('Refund action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Unipay/Shortcut/ScanShortcutTest.php

@@ -35,29 +35,29 @@ public function testPreAuth()
     {
         self::assertEquals([
             ScanPreAuthPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'pre_auth']));
+        ], $this->plugin->getPlugins(['_action' => 'pre_auth']));
     }
 
     public function testPreOrder()
     {
         self::assertEquals([
             ScanPreOrderPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'pre_order']));
+        ], $this->plugin->getPlugins(['_action' => 'pre_order']));
     }
 
     public function testFee()
     {
         self::assertEquals([
             ScanFeePlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'fee']));
+        ], $this->plugin->getPlugins(['_action' => 'fee']));
     }
 
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Scan type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Scan action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Wechat/Shortcut/CloseShortcutTest.php

@@ -33,7 +33,7 @@ public function testCombine()
     {
         self::assertEquals([
             \Yansongda\Pay\Plugin\Wechat\Pay\Combine\ClosePlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'combine']));
+        ], $this->plugin->getPlugins(['_action' => 'combine']));
     }
 
     public function testCombineParams()
@@ -50,9 +50,9 @@ public function testCombineParams()
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Query type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Query action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Plugin/Wechat/Shortcut/QueryShortcutTest.php

@@ -33,14 +33,14 @@ public function testRefund()
     {
         self::assertEquals([
             QueryRefundPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'refund']));
+        ], $this->plugin->getPlugins(['_action' => 'refund']));
     }
 
     public function testCombine()
     {
         self::assertEquals([
             \Yansongda\Pay\Plugin\Wechat\Pay\Combine\QueryPlugin::class,
-        ], $this->plugin->getPlugins(['_type' => 'combine']));
+        ], $this->plugin->getPlugins(['_action' => 'combine']));
     }
 
     public function testCombineParams()
@@ -53,9 +53,9 @@ public function testCombineParams()
     public function testFoo()
     {
         self::expectException(InvalidParamsException::class);
-        self::expectExceptionCode(Exception::SHORTCUT_MULTI_TYPE_ERROR);
-        self::expectExceptionMessage('Query type [fooPlugins] not supported');
+        self::expectExceptionCode(Exception::SHORTCUT_MULTI_ACTION_ERROR);
+        self::expectExceptionMessage('Query action [fooPlugins] not supported');
 
-        $this->plugin->getPlugins(['_type' => 'foo']);
+        $this->plugin->getPlugins(['_action' => 'foo']);
     }
 }

tests/Provider/AlipayTest.php

@@ -89,7 +89,7 @@ public function testFindTransfer()
         $http->shouldReceive('sendRequest')->andReturn(new Response(200, [], json_encode($response)));
         Pay::set(HttpClientInterface::class, $http);
 
-        $result = Pay::alipay()->find(['out_biz_no' => '202209032319', '_type' => 'transfer']);
+        $result = Pay::alipay()->find(['out_biz_no' => '202209032319', '_action' => 'transfer']);
         self::assertEqualsCanonicalizing($response['alipay_fund_trans_common_query_response'], $result->all());
     }
 
@@ -118,7 +118,7 @@ public function testFindRefund()
         $result = Pay::alipay()->find([
             'out_trade_no' => '1623160012',
             'out_request_no' => '1623160012',
-            '_type' => 'refund'
+            '_action' => 'refund'
         ]);
         self::assertEqualsCanonicalizing($response['alipay_trade_fastpay_refund_query_response'], $result->all());