Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change(internal): 微信 shortcut 从 plugin 文件夹独立出来 #904

Merged
merged 1 commit into from
Dec 22, 2023
+22 −22
Merged

change(internal): 微信 shortcut 从 plugin 文件夹独立出来 #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Wechat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/AppShortcut.php → src/Shortcut/Wechat/AppShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/CloseShortcut.php → src/Shortcut/Wechat/CloseShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/MiniShortcut.php → src/Shortcut/Wechat/MiniShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/MpShortcut.php → src/Shortcut/Wechat/MpShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/PapayShortcut.php → src/Shortcut/Wechat/PapayShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/PosShortcut.php → src/Shortcut/Wechat/PosShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/QueryShortcut.php → src/Shortcut/Wechat/QueryShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...Plugin/Wechat/Shortcut/RefundShortcut.php → src/Shortcut/Wechat/RefundShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/ScanShortcut.php → src/Shortcut/Wechat/ScanShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ugin/Wechat/Shortcut/TransferShortcut.php → src/Shortcut/Wechat/TransferShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/Wechat/Shortcut/WapShortcut.php → src/Shortcut/Wechat/WapShortcut.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...gin/Wechat/Shortcut/CloseShortcutTest.php → tests/Shortcut/Wechat/CloseShortcutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...gin/Wechat/Shortcut/PapayShortcutTest.php → tests/Shortcut/Wechat/PapayShortcutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...lugin/Wechat/Shortcut/PosShortcutTest.php → tests/Shortcut/Wechat/PosShortcutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...gin/Wechat/Shortcut/QueryShortcutTest.php → tests/Shortcut/Wechat/QueryShortcutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down