change: 所有的 Find*Plugin 调整为 Query*Plugin

yansongda · Mar 19, 2023 · 6814580 · 6814580
1 parent 258ff12
commit 6814580
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,9 @@
 
 ### changed
 
+- change: 所有的 `Find*Plugin` 调整为 `Query*Plugin`(#756)
 - change: 插件开始装载日志由 `info` 调整为 `debug`(#755)
-- change: ParserInterface 签名由 `?ResponseInterface $response` 变更为 `PackerInterface $packer, ?ResponseInterface $response`(#754)
+- change: ParserInterface 签名由 `?ResponseInterface $response` 调整为 `PackerInterface $packer, ?ResponseInterface $response`(#754)
 
 ## v3.2.14
 

diff --git a/...in/Wechat/Ecommerce/Refund/FindPlugin.php → ...n/Wechat/Ecommerce/Refund/QueryPlugin.php b/...in/Wechat/Ecommerce/Refund/FindPlugin.php → ...n/Wechat/Ecommerce/Refund/QueryPlugin.php
@@ -15,7 +15,7 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter7_6_2.shtml
  */
-class FindPlugin extends GeneralPlugin
+class QueryPlugin extends GeneralPlugin
 {
     /**
      * @throws \Yansongda\Pay\Exception\InvalidParamsException

diff --git a/...mmerce/Refund/FindReturnAdvancePlugin.php → ...merce/Refund/QueryReturnAdvancePlugin.php b/...mmerce/Refund/FindReturnAdvancePlugin.php → ...merce/Refund/QueryReturnAdvancePlugin.php
@@ -15,7 +15,7 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter7_6_5.shtml
  */
-class FindReturnAdvancePlugin extends GeneralPlugin
+class QueryReturnAdvancePlugin extends GeneralPlugin
 {
     /**
      * @throws \Yansongda\Pay\Exception\InvalidParamsException

diff --git a/...lugin/Wechat/Pay/App/FindRefundPlugin.php → ...ugin/Wechat/Pay/App/QueryRefundPlugin.php b/...lugin/Wechat/Pay/App/FindRefundPlugin.php → ...ugin/Wechat/Pay/App/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_2_10.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/...n/Wechat/Pay/Combine/FindRefundPlugin.php → .../Wechat/Pay/Combine/QueryRefundPlugin.php b/...n/Wechat/Pay/Combine/FindRefundPlugin.php → .../Wechat/Pay/Combine/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter5_1_15.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/...in/Wechat/Pay/Common/FindRefundPlugin.php → ...n/Wechat/Pay/Common/QueryRefundPlugin.php b/...in/Wechat/Pay/Common/FindRefundPlugin.php → ...n/Wechat/Pay/Common/QueryRefundPlugin.php
@@ -12,7 +12,7 @@
 use Yansongda\Pay\Plugin\Wechat\GeneralPlugin;
 use Yansongda\Pay\Rocket;
 
-class FindRefundPlugin extends GeneralPlugin
+class QueryRefundPlugin extends GeneralPlugin
 {
     /**
      * @throws \Yansongda\Pay\Exception\InvalidParamsException

diff --git a/...Plugin/Wechat/Pay/H5/FindRefundPlugin.php → ...lugin/Wechat/Pay/H5/QueryRefundPlugin.php b/...Plugin/Wechat/Pay/H5/FindRefundPlugin.php → ...lugin/Wechat/Pay/H5/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_3_10.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/...gin/Wechat/Pay/Jsapi/FindRefundPlugin.php → ...in/Wechat/Pay/Jsapi/QueryRefundPlugin.php b/...gin/Wechat/Pay/Jsapi/FindRefundPlugin.php → ...in/Wechat/Pay/Jsapi/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_10.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/...ugin/Wechat/Pay/Mini/FindRefundPlugin.php → ...gin/Wechat/Pay/Mini/QueryRefundPlugin.php b/...ugin/Wechat/Pay/Mini/FindRefundPlugin.php → ...gin/Wechat/Pay/Mini/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_5_10.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/...in/Wechat/Pay/Native/FindRefundPlugin.php → ...n/Wechat/Pay/Native/QueryRefundPlugin.php b/...in/Wechat/Pay/Native/FindRefundPlugin.php → ...n/Wechat/Pay/Native/QueryRefundPlugin.php
@@ -7,6 +7,6 @@
 /**
  * @see https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_4_10.shtml
  */
-class FindRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+class QueryRefundPlugin extends \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
 {
 }
diff --git a/src/Plugin/Wechat/Shortcut/QueryShortcut.php b/src/Plugin/Wechat/Shortcut/QueryShortcut.php
@@ -7,7 +7,7 @@
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
-use Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin;
+use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin;
 use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryPlugin;
 use Yansongda\Supports\Str;
 
@@ -41,7 +41,7 @@ protected function defaultPlugins(): array
     protected function refundPlugins(): array
     {
         return [
-            FindRefundPlugin::class,
+            QueryRefundPlugin::class,
         ];
     }
 

diff --git a/...echat/Ecommerce/Refund/FindPluginTest.php → ...chat/Ecommerce/Refund/QueryPluginTest.php b/...echat/Ecommerce/Refund/FindPluginTest.php → ...chat/Ecommerce/Refund/QueryPluginTest.php
@@ -6,24 +6,24 @@
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Pay;
-use Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\FindPlugin;
+use Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\QueryPlugin;
 use Yansongda\Pay\Provider\Wechat;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;
 
-class FindPluginTest extends TestCase
+class QueryPluginTest extends TestCase
 {
     /**
-     * @var \Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\FindPlugin
+     * @var \Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\QueryPlugin
      */
     protected $plugin;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->plugin = new FindPlugin();
+        $this->plugin = new QueryPlugin();
     }
 
     public function testNotInServiceMode()

diff --git a/...ce/Refund/FindReturnAdvancePluginTest.php → ...e/Refund/QueryReturnAdvancePluginTest.php b/...ce/Refund/FindReturnAdvancePluginTest.php → ...e/Refund/QueryReturnAdvancePluginTest.php
@@ -6,24 +6,24 @@
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Pay;
-use Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\FindReturnAdvancePlugin;
+use Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\QueryReturnAdvancePlugin;
 use Yansongda\Pay\Provider\Wechat;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;
 
-class FindReturnAdvancePluginTest extends TestCase
+class QueryReturnAdvancePluginTest extends TestCase
 {
     /**
-     * @var \Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\FindReturnAdvancePlugin
+     * @var \Yansongda\Pay\Plugin\Wechat\Ecommerce\Refund\QueryReturnAdvancePlugin
      */
     protected $plugin;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->plugin = new FindReturnAdvancePlugin();
+        $this->plugin = new QueryReturnAdvancePlugin();
     }
 
     public function testNotInServiceMode()

diff --git a/...echat/Pay/Common/FindRefundPluginTest.php → ...chat/Pay/Common/QueryRefundPluginTest.php b/...echat/Pay/Common/FindRefundPluginTest.php → ...chat/Pay/Common/QueryRefundPluginTest.php
@@ -5,24 +5,24 @@
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\RequestInterface;
 use Yansongda\Pay\Pay;
-use Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin;
+use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin;
 use Yansongda\Pay\Provider\Wechat;
 use Yansongda\Pay\Rocket;
 use Yansongda\Pay\Tests\TestCase;
 use Yansongda\Supports\Collection;
 
-class FindRefundPluginTest extends TestCase
+class QueryRefundPluginTest extends TestCase
 {
     /**
-     * @var \Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin
+     * @var \Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin
      */
     protected $plugin;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->plugin = new FindRefundPlugin();
+        $this->plugin = new QueryRefundPlugin();
     }
 
     public function testNormal()

diff --git a/tests/Plugin/Wechat/Shortcut/QueryShortcutTest.php b/tests/Plugin/Wechat/Shortcut/QueryShortcutTest.php
@@ -6,7 +6,7 @@
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
-use Yansongda\Pay\Plugin\Wechat\Pay\Common\FindRefundPlugin;
+use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin;
 use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryPlugin;
 use Yansongda\Pay\Plugin\Wechat\Shortcut\QueryShortcut;
 use Yansongda\Pay\Tests\TestCase;
@@ -32,7 +32,7 @@ public function testDefault()
     public function testRefund()
     {
         self::assertEquals([
-            FindRefundPlugin::class,
+            QueryRefundPlugin::class,
         ], $this->plugin->getPlugins(['_type' => 'refund']));
     }