change(internal): 支付宝 shortcut 从 plugin 文件夹独立出来

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - change(internal): shortcut 完整标明各个插件，不使用 commonPlugin(#886)
 - change(internal): 按场景对支付宝插件进行分类(#894)
+- change(internal): 支付宝 shortcut 从 plugin 文件夹独立出来(#895)
 
 ## v3.5.3
 

src/Provider/Alipay.php

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

src/Plugin/Alipay/Shortcut/AppShortcut.php → src/Shortcut/Alipay/AppShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;

src/Plugin/Alipay/Shortcut/CancelShortcut.php → src/Shortcut/Alipay/CancelShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

src/Plugin/Alipay/Shortcut/CloseShortcut.php → src/Shortcut/Alipay/CloseShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

src/Plugin/Alipay/Shortcut/MiniShortcut.php → src/Shortcut/Alipay/MiniShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;

src/Plugin/Alipay/Shortcut/PosShortcut.php → src/Shortcut/Alipay/PosShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;

src/Plugin/Alipay/Shortcut/QueryShortcut.php → src/Shortcut/Alipay/QueryShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

src/Plugin/Alipay/Shortcut/RefundShortcut.php → src/Shortcut/Alipay/RefundShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Exception\Exception;

src/Plugin/Alipay/Shortcut/ScanShortcut.php → src/Shortcut/Alipay/ScanShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;

src/Plugin/Alipay/Shortcut/TransferShortcut.php → src/Shortcut/Alipay/TransferShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;

src/Plugin/Alipay/Shortcut/WapShortcut.php → src/Shortcut/Alipay/WapShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;

src/Plugin/Alipay/Shortcut/WebShortcut.php → src/Shortcut/Alipay/WebShortcut.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yansongda\Pay\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Shortcut\Alipay;
 
 use Yansongda\Pay\Contract\ShortcutInterface;
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;

tests/Plugin/Alipay/Shortcut/AppShortcutTest.php → tests/Shortcut/Alipay/AppShortcutTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\App\PayPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponseInvokeStringPlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\AppShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\AppShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class AppShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/CancelShortcutTest.php → tests/Shortcut/Alipay/CancelShortcutTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -13,10 +13,10 @@
 use Yansongda\Pay\Plugin\Alipay\Pay\Pos\CancelPlugin as PosCancelPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Scan\CancelPlugin as ScanCancelPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\CancelShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\CancelShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class CancelShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/CloseShortcutTest.php → tests/Shortcut/Alipay/CloseShortcutTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -16,10 +16,10 @@
 use Yansongda\Pay\Plugin\Alipay\Pay\Wap\ClosePlugin as WapClosePlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Web\ClosePlugin as WebClosePlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\CloseShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\CloseShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class CloseShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/MiniShortcutTest.php → tests/Shortcut/Alipay/MiniShortcutTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Mini\PayPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\MiniShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\MiniShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class MiniShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/PosShortcutTest.php → tests/Shortcut/Alipay/PosShortcutTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\PosShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
 use Yansongda\Pay\Plugin\Wechat\Pay\Pos\PayPlugin;
+use Yansongda\Pay\Shortcut\Alipay\PosShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class PosShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/QueryShortcutTest.php → tests/Shortcut/Alipay/QueryShortcutTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -25,10 +25,10 @@
 use Yansongda\Pay\Plugin\Alipay\Pay\Web\QueryPlugin as WebQueryPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Web\QueryRefundPlugin as WebQueryRefundPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\QueryShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\QueryShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class QueryShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/RefundShortcutTest.php → tests/Shortcut/Alipay/RefundShortcutTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Exception\InvalidParamsException;
@@ -17,10 +17,10 @@
 use Yansongda\Pay\Plugin\Alipay\Pay\Wap\RefundPlugin as WapRefundPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Web\RefundPlugin as WebRefundPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\RefundShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\RefundShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class RefundShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/ScanShortcutTest.php → tests/Shortcut/Alipay/ScanShortcutTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Scan\PayPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\ScanShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\ScanShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class ScanShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/TransferShortcutTest.php → tests/Shortcut/Alipay/TransferShortcutTest.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Fund\Transfer\TransferPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponsePlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\TransferShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\Alipay\VerifySignaturePlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\TransferShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class TransferShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/WapShortcutTest.php → tests/Shortcut/Alipay/WapShortcutTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Wap\PayPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponseHtmlPlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\WapShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\WapShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class WapShortcutTest extends TestCase

tests/Plugin/Alipay/Shortcut/WebShortcutTest.php → tests/Shortcut/Alipay/WebShortcutTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Yansongda\Pay\Tests\Plugin\Alipay\Shortcut;
+namespace Yansongda\Pay\Tests\Shortcut\Alipay;
 
 use Yansongda\Pay\Plugin\Alipay\AddRadarPlugin;
 use Yansongda\Pay\Plugin\Alipay\AddSignaturePlugin;
 use Yansongda\Pay\Plugin\Alipay\FormatBizContentPlugin;
 use Yansongda\Pay\Plugin\Alipay\Pay\Web\PayPlugin;
 use Yansongda\Pay\Plugin\Alipay\ResponseHtmlPlugin;
-use Yansongda\Pay\Plugin\Alipay\Shortcut\WebShortcut;
 use Yansongda\Pay\Plugin\Alipay\StartPlugin;
 use Yansongda\Pay\Plugin\ParserPlugin;
+use Yansongda\Pay\Shortcut\Alipay\WebShortcut;
 use Yansongda\Pay\Tests\TestCase;
 
 class WebShortcutTest extends TestCase