update

yansongda · Dec 22, 2023 · a1cfed2 · a1cfed2
1 parent a853468
commit a1cfed2
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - change: cancel 的 API 参数只支持 array，不再支持 string(#900)
 - change: close 的 API 参数只支持 array，不再支持 string(#901)
 - change(internal): 错误代码 const 命名规则统一(#902, #903)
+- change(internal): 微信 shortcut 从 plugin 文件夹独立出来(#904)
 
 ## v3.5.3
 

diff --git a/src/Provider/Wechat.php b/src/Provider/Wechat.php
@@ -53,8 +53,7 @@ class Wechat extends AbstractProvider
      */
     public function __call(string $shortcut, array $params): null|Collection|MessageInterface
     {
-        $plugin = '\\Yansongda\\Pay\\Plugin\\Wechat\\Shortcut\\'.
-            Str::studly($shortcut).'Shortcut';
+        $plugin = '\\Yansongda\\Pay\\Shortcut\\Wechat\\'.Str::studly($shortcut).'Shortcut';
 
         return $this->call($plugin, ...$params);
     }

diff --git a/src/Plugin/Wechat/Shortcut/AppShortcut.php → src/Shortcut/Wechat/AppShortcut.php b/src/Plugin/Wechat/Shortcut/AppShortcut.php → src/Shortcut/Wechat/AppShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/CloseShortcut.php → src/Shortcut/Wechat/CloseShortcut.php b/src/Plugin/Wechat/Shortcut/CloseShortcut.php → src/Shortcut/Wechat/CloseShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

diff --git a/src/Plugin/Wechat/Shortcut/MiniShortcut.php → src/Shortcut/Wechat/MiniShortcut.php b/src/Plugin/Wechat/Shortcut/MiniShortcut.php → src/Shortcut/Wechat/MiniShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/MpShortcut.php → src/Shortcut/Wechat/MpShortcut.php b/src/Plugin/Wechat/Shortcut/MpShortcut.php → src/Shortcut/Wechat/MpShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/PapayShortcut.php → src/Shortcut/Wechat/PapayShortcut.php b/src/Plugin/Wechat/Shortcut/PapayShortcut.php → src/Shortcut/Wechat/PapayShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

diff --git a/src/Plugin/Wechat/Shortcut/PosShortcut.php → src/Shortcut/Wechat/PosShortcut.php b/src/Plugin/Wechat/Shortcut/PosShortcut.php → src/Shortcut/Wechat/PosShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Wechat\Pay\Pos\PayPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/QueryShortcut.php → src/Shortcut/Wechat/QueryShortcut.php b/src/Plugin/Wechat/Shortcut/QueryShortcut.php → src/Shortcut/Wechat/QueryShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

diff --git a/...Plugin/Wechat/Shortcut/RefundShortcut.php → src/Shortcut/Wechat/RefundShortcut.php b/...Plugin/Wechat/Shortcut/RefundShortcut.php → src/Shortcut/Wechat/RefundShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/ScanShortcut.php → src/Shortcut/Wechat/ScanShortcut.php b/src/Plugin/Wechat/Shortcut/ScanShortcut.php → src/Shortcut/Wechat/ScanShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/...ugin/Wechat/Shortcut/TransferShortcut.php → src/Shortcut/Wechat/TransferShortcut.php b/...ugin/Wechat/Shortcut/TransferShortcut.php → src/Shortcut/Wechat/TransferShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/src/Plugin/Wechat/Shortcut/WapShortcut.php → src/Shortcut/Wechat/WapShortcut.php b/src/Plugin/Wechat/Shortcut/WapShortcut.php → src/Shortcut/Wechat/WapShortcut.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Shortcut\Wechat;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\ParserPlugin;

diff --git a/...gin/Wechat/Shortcut/CloseShortcutTest.php → tests/Shortcut/Wechat/CloseShortcutTest.php b/...gin/Wechat/Shortcut/CloseShortcutTest.php → tests/Shortcut/Wechat/CloseShortcutTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Tests\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Wechat;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -12,7 +12,7 @@
 use Yansongda\Pay\Plugin\Wechat\Pay\Common\ClosePlugin;
 use Yansongda\Pay\Plugin\Wechat\PreparePlugin;
 use Yansongda\Pay\Plugin\Wechat\RadarSignPlugin;
-use Yansongda\Pay\Plugin\Wechat\Shortcut\CloseShortcut;
+use Yansongda\Pay\Shortcut\Wechat\CloseShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class CloseShortcutTest extends TestCase

diff --git a/...gin/Wechat/Shortcut/PapayShortcutTest.php → tests/Shortcut/Wechat/PapayShortcutTest.php b/...gin/Wechat/Shortcut/PapayShortcutTest.php → tests/Shortcut/Wechat/PapayShortcutTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Tests\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Wechat;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -13,7 +13,7 @@
 use Yansongda\Pay\Plugin\Wechat\Pay\Common\InvokePrepayV2Plugin;
 use Yansongda\Pay\Plugin\Wechat\PreparePlugin;
 use Yansongda\Pay\Plugin\Wechat\RadarSignPlugin;
-use Yansongda\Pay\Plugin\Wechat\Shortcut\PapayShortcut;
+use Yansongda\Pay\Shortcut\Wechat\PapayShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class PapayShortcutTest extends TestCase

diff --git a/...lugin/Wechat/Shortcut/PosShortcutTest.php → tests/Shortcut/Wechat/PosShortcutTest.php b/...lugin/Wechat/Shortcut/PosShortcutTest.php → tests/Shortcut/Wechat/PosShortcutTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Tests\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Wechat;
 
 use Yansongda\Pay\Plugin\Wechat\Pay\Pos\PayPlugin;
-use Yansongda\Pay\Plugin\Wechat\Shortcut\PosShortcut;
+use Yansongda\Pay\Shortcut\Wechat\PosShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class PosShortcutTest extends TestCase

diff --git a/...gin/Wechat/Shortcut/QueryShortcutTest.php → tests/Shortcut/Wechat/QueryShortcutTest.php b/...gin/Wechat/Shortcut/QueryShortcutTest.php → tests/Shortcut/Wechat/QueryShortcutTest.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Tests\Plugin\Wechat\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Wechat;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Wechat\LaunchPlugin;
-use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin;
 use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryPlugin;
+use Yansongda\Pay\Plugin\Wechat\Pay\Common\QueryRefundPlugin;
 use Yansongda\Pay\Plugin\Wechat\PreparePlugin;
 use Yansongda\Pay\Plugin\Wechat\RadarSignPlugin;
-use Yansongda\Pay\Plugin\Wechat\Shortcut\QueryShortcut;
+use Yansongda\Pay\Shortcut\Wechat\QueryShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class QueryShortcutTest extends TestCase