From a3aa32e094eb3f9dd70168c1971acb2f18d01472 Mon Sep 17 00:00:00 2001 From: Harry Date: Fri, 8 Oct 2021 09:00:04 +0700 Subject: [PATCH 1/3] Supported PHP 8.0 --- .travis.yml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 450d0c2..e2620a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ php: - 7.2 - 7.3 - 7.4 + - 8.0 install: - composer self-update diff --git a/composer.json b/composer.json index 70dcf28..c136dc7 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.1|^8.0", "ignited/laravel-omnipay": "^3.3", "illuminate/support": "^5.7 || ^6.0 || ^7.0 || ^8.0", "phpviet/omnipay-momo": "^1.0", From 1745da5e1e080e655034a982ffc0900e3d5da366 Mon Sep 17 00:00:00 2001 From: HarryTr Date: Sat, 9 Oct 2021 07:50:53 +0700 Subject: [PATCH 2/3] Update support php8 PR --- CHANGELOG.md | 4 ++++ composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505e0dc..eaf65d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Tất cả lịch sử tiến trình phát triển thư viện +### 1.1.3 + ++ Hổ trợ PHP 8 + ### 1.1.2 + Nâng cấp composer package `ignited/laravel-omnipay` lên phiên bản tối thiểu 3.3. diff --git a/composer.json b/composer.json index c136dc7..529a98b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.1|^8.0", + "php": "^7.1 || ^8.0", "ignited/laravel-omnipay": "^3.3", "illuminate/support": "^5.7 || ^6.0 || ^7.0 || ^8.0", "phpviet/omnipay-momo": "^1.0", From 674cf53c8848bc32f4ae61a468151d48eb437b60 Mon Sep 17 00:00:00 2001 From: Minh Vuong Date: Sat, 9 Oct 2021 08:42:54 +0000 Subject: [PATCH 3/3] Apply fixes from StyleCI --- src/Facades/MoMo/AllInOneGateway.php | 1 + src/Facades/MoMo/AppInAppGateway.php | 1 + src/Facades/MoMo/POSGateway.php | 1 + src/Facades/MoMo/QRCodeGateway.php | 1 + src/Facades/OnePay/DomesticGateway.php | 1 + src/Facades/OnePay/InternationalGateway.php | 1 + src/Facades/VNPay/Gateway.php | 1 + src/Facades/VTCPay/Gateway.php | 1 + src/Middleware/CompletePurchaseMiddleware.php | 5 +++-- src/OmnipayServiceProvider.php | 1 + tests/FacadeGatewayTestCase.php | 1 + tests/Facades/MoMo/AllInOneGatewayTest.php | 1 + tests/Facades/MoMo/AppInAppGatewayTest.php | 1 + tests/Facades/MoMo/POSGatewayTest.php | 1 + tests/Facades/MoMo/QRCodeGatewayTest.php | 1 + tests/Facades/OnePay/DomesticGatewayTest.php | 1 + tests/Facades/OnePay/InternationalGatewayTest.php | 1 + tests/Facades/VNPay/GatewayTest.php | 1 + tests/Facades/VTCPay/GatewayTest.php | 1 + tests/Middleware/CompletePurchaseMiddlewareTest.php | 1 + tests/TestCase.php | 1 + 21 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Facades/MoMo/AllInOneGateway.php b/src/Facades/MoMo/AllInOneGateway.php index 2707091..d448ca2 100644 --- a/src/Facades/MoMo/AllInOneGateway.php +++ b/src/Facades/MoMo/AllInOneGateway.php @@ -13,6 +13,7 @@ * @method static \Omnipay\MoMo\Message\AllInOne\QueryRefundRequest queryRefund(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class AllInOneGateway extends Facade diff --git a/src/Facades/MoMo/AppInAppGateway.php b/src/Facades/MoMo/AppInAppGateway.php index 6d4c75c..f39fe00 100644 --- a/src/Facades/MoMo/AppInAppGateway.php +++ b/src/Facades/MoMo/AppInAppGateway.php @@ -18,6 +18,7 @@ * @method static \Omnipay\MoMo\Message\PayRefundRequest queryRefund(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class AppInAppGateway extends Facade diff --git a/src/Facades/MoMo/POSGateway.php b/src/Facades/MoMo/POSGateway.php index feb6cd5..433a094 100644 --- a/src/Facades/MoMo/POSGateway.php +++ b/src/Facades/MoMo/POSGateway.php @@ -18,6 +18,7 @@ * @method static \Omnipay\MoMo\Message\PayRefundRequest queryRefund(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class POSGateway extends Facade diff --git a/src/Facades/MoMo/QRCodeGateway.php b/src/Facades/MoMo/QRCodeGateway.php index 03f5b81..6aac695 100644 --- a/src/Facades/MoMo/QRCodeGateway.php +++ b/src/Facades/MoMo/QRCodeGateway.php @@ -18,6 +18,7 @@ * @method static \Omnipay\MoMo\Message\PayRefundRequest queryRefund(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class QRCodeGateway extends Facade diff --git a/src/Facades/OnePay/DomesticGateway.php b/src/Facades/OnePay/DomesticGateway.php index c94e245..0f0b3d7 100644 --- a/src/Facades/OnePay/DomesticGateway.php +++ b/src/Facades/OnePay/DomesticGateway.php @@ -18,6 +18,7 @@ * @method static \Omnipay\OnePay\Message\IncomingRequest notification(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class DomesticGateway extends Facade diff --git a/src/Facades/OnePay/InternationalGateway.php b/src/Facades/OnePay/InternationalGateway.php index c401dec..90825a6 100644 --- a/src/Facades/OnePay/InternationalGateway.php +++ b/src/Facades/OnePay/InternationalGateway.php @@ -18,6 +18,7 @@ * @method static \Omnipay\OnePay\Message\IncomingRequest notification(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class InternationalGateway extends Facade diff --git a/src/Facades/VNPay/Gateway.php b/src/Facades/VNPay/Gateway.php index f834053..4291a57 100644 --- a/src/Facades/VNPay/Gateway.php +++ b/src/Facades/VNPay/Gateway.php @@ -19,6 +19,7 @@ * @method static \Omnipay\VNPay\Message\RefundRequest refund(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class Gateway extends Facade diff --git a/src/Facades/VTCPay/Gateway.php b/src/Facades/VTCPay/Gateway.php index 1402d89..288244a 100644 --- a/src/Facades/VTCPay/Gateway.php +++ b/src/Facades/VTCPay/Gateway.php @@ -17,6 +17,7 @@ * @method static \Omnipay\VTCPay\Message\NotificationRequest notification(array $options = []) * * @author Vuong Minh + * * @since 1.0.0 */ class Gateway extends Facade diff --git a/src/Middleware/CompletePurchaseMiddleware.php b/src/Middleware/CompletePurchaseMiddleware.php index 126f2c7..72d4264 100644 --- a/src/Middleware/CompletePurchaseMiddleware.php +++ b/src/Middleware/CompletePurchaseMiddleware.php @@ -15,13 +15,14 @@ /** * @author Vuong Minh + * * @since 1.1.0 */ class CompletePurchaseMiddleware { /** - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next, string $gateway) diff --git a/src/OmnipayServiceProvider.php b/src/OmnipayServiceProvider.php index 3c30f30..177192b 100644 --- a/src/OmnipayServiceProvider.php +++ b/src/OmnipayServiceProvider.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class OmnipayServiceProvider extends ServiceProvider diff --git a/tests/FacadeGatewayTestCase.php b/tests/FacadeGatewayTestCase.php index fa47791..5fcc28f 100644 --- a/tests/FacadeGatewayTestCase.php +++ b/tests/FacadeGatewayTestCase.php @@ -10,6 +10,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ abstract class FacadeGatewayTestCase extends TestCase diff --git a/tests/Facades/MoMo/AllInOneGatewayTest.php b/tests/Facades/MoMo/AllInOneGatewayTest.php index 0b18376..1c5f77b 100644 --- a/tests/Facades/MoMo/AllInOneGatewayTest.php +++ b/tests/Facades/MoMo/AllInOneGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class AllInOneGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/MoMo/AppInAppGatewayTest.php b/tests/Facades/MoMo/AppInAppGatewayTest.php index 3178004..d457213 100644 --- a/tests/Facades/MoMo/AppInAppGatewayTest.php +++ b/tests/Facades/MoMo/AppInAppGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class AppInAppGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/MoMo/POSGatewayTest.php b/tests/Facades/MoMo/POSGatewayTest.php index 7ec42b7..ee6c27f 100644 --- a/tests/Facades/MoMo/POSGatewayTest.php +++ b/tests/Facades/MoMo/POSGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class POSGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/MoMo/QRCodeGatewayTest.php b/tests/Facades/MoMo/QRCodeGatewayTest.php index e8ff378..201560f 100644 --- a/tests/Facades/MoMo/QRCodeGatewayTest.php +++ b/tests/Facades/MoMo/QRCodeGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class QRCodeGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/OnePay/DomesticGatewayTest.php b/tests/Facades/OnePay/DomesticGatewayTest.php index cad75bf..73bc353 100644 --- a/tests/Facades/OnePay/DomesticGatewayTest.php +++ b/tests/Facades/OnePay/DomesticGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class DomesticGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/OnePay/InternationalGatewayTest.php b/tests/Facades/OnePay/InternationalGatewayTest.php index ae66473..a05a2ab 100644 --- a/tests/Facades/OnePay/InternationalGatewayTest.php +++ b/tests/Facades/OnePay/InternationalGatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class InternationalGatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/VNPay/GatewayTest.php b/tests/Facades/VNPay/GatewayTest.php index 558d4ba..afc18b6 100644 --- a/tests/Facades/VNPay/GatewayTest.php +++ b/tests/Facades/VNPay/GatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class GatewayTest extends FacadeGatewayTestCase diff --git a/tests/Facades/VTCPay/GatewayTest.php b/tests/Facades/VTCPay/GatewayTest.php index ff6a57b..3cb8c54 100644 --- a/tests/Facades/VTCPay/GatewayTest.php +++ b/tests/Facades/VTCPay/GatewayTest.php @@ -12,6 +12,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class GatewayTest extends FacadeGatewayTestCase diff --git a/tests/Middleware/CompletePurchaseMiddlewareTest.php b/tests/Middleware/CompletePurchaseMiddlewareTest.php index 933830b..0496265 100644 --- a/tests/Middleware/CompletePurchaseMiddlewareTest.php +++ b/tests/Middleware/CompletePurchaseMiddlewareTest.php @@ -16,6 +16,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class CompletePurchaseMiddlewareTest extends TestCase diff --git a/tests/TestCase.php b/tests/TestCase.php index cf24c5a..ae72997 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -14,6 +14,7 @@ /** * @author Vuong Minh + * * @since 1.0.0 */ class TestCase extends BaseTestCase

AltStyle によって変換されたページ (->オリジナル) /