From bf40feceee8de8ae560fd6809d57ed2053018fd1 Mon Sep 17 00:00:00 2001 From: Jakub Groncki Date: Mon, 25 Apr 2022 13:50:20 +0200 Subject: [PATCH 1/3] Bump sylius/refund-plugin version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1224d269..a0a7c6e7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "adyen/php-api-library": "^11.0", "composer/package-versions-deprecated": "^1.11", "nyholm/psr7": "^1.4", - "sylius/refund-plugin": "~1.0.0", + "sylius/refund-plugin": "^1.1", "sylius/resource-bundle": "^1.8", "sylius/sylius": "^1.10.0 || ^1.11.0", "symfony/messenger": "^4.4 || ^5.0", From 8f057da0a70ed71a6a5629d5e57bf2f8a0419f04 Mon Sep 17 00:00:00 2001 From: Jakub Groncki Date: Mon, 25 Apr 2022 15:07:32 +0200 Subject: [PATCH 2/3] Bump sylius/refund-plugin version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a0a7c6e7..ee14bb3f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "adyen/php-api-library": "^11.0", "composer/package-versions-deprecated": "^1.11", "nyholm/psr7": "^1.4", - "sylius/refund-plugin": "^1.1", + "sylius/refund-plugin": "~1.0.0 || ^1.1", "sylius/resource-bundle": "^1.8", "sylius/sylius": "^1.10.0 || ^1.11.0", "symfony/messenger": "^4.4 || ^5.0", From dd2c07657cff3c27e1e5b57c0b790f4ea405be9c Mon Sep 17 00:00:00 2001 From: Jakub Groncki Date: Mon, 25 Apr 2022 15:12:41 +0200 Subject: [PATCH 3/3] Fix psalm errors --- src/Repository/AdyenTokenRepository.php | 2 ++ src/Repository/PaymentMethodRepository.php | 4 ++++ src/Repository/PaymentRepository.php | 2 ++ src/Repository/RefundPaymentRepository.php | 4 ++++ src/Resolver/Order/PaymentCheckoutOrderResolver.php | 2 ++ 5 files changed, 14 insertions(+) diff --git a/src/Repository/AdyenTokenRepository.php b/src/Repository/AdyenTokenRepository.php index 4e055a47..e73ce1cb 100644 --- a/src/Repository/AdyenTokenRepository.php +++ b/src/Repository/AdyenTokenRepository.php @@ -20,6 +20,8 @@ final class AdyenTokenRepository extends EntityRepository implements AdyenTokenR /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function findOneByPaymentMethodAndCustomer( PaymentMethodInterface $paymentMethod, diff --git a/src/Repository/PaymentMethodRepository.php b/src/Repository/PaymentMethodRepository.php index f0669d7c..b4709a34 100644 --- a/src/Repository/PaymentMethodRepository.php +++ b/src/Repository/PaymentMethodRepository.php @@ -30,6 +30,8 @@ public function __construct(EntityRepository $baseRepository) /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function find(int $id): ?PaymentMethodInterface { @@ -39,6 +41,8 @@ public function find(int $id): ?PaymentMethodInterface /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function getOneForAdyenAndCode(string $code): PaymentMethodInterface { diff --git a/src/Repository/PaymentRepository.php b/src/Repository/PaymentRepository.php index 898f3e15..137d9115 100644 --- a/src/Repository/PaymentRepository.php +++ b/src/Repository/PaymentRepository.php @@ -26,6 +26,8 @@ public function __construct(EntityRepository $baseRepository) /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function find(int $id): ?PaymentInterface { diff --git a/src/Repository/RefundPaymentRepository.php b/src/Repository/RefundPaymentRepository.php index 0ebb1d27..7a8f01fd 100644 --- a/src/Repository/RefundPaymentRepository.php +++ b/src/Repository/RefundPaymentRepository.php @@ -26,6 +26,8 @@ public function __construct(EntityRepository $baseRepository) /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function getForOrderNumberAndRefundPaymentId( string $orderNumber, @@ -49,6 +51,8 @@ public function getForOrderNumberAndRefundPaymentId( /** * @psalm-suppress MixedReturnStatement * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ public function find(int $id): ?RefundPaymentInterface { diff --git a/src/Resolver/Order/PaymentCheckoutOrderResolver.php b/src/Resolver/Order/PaymentCheckoutOrderResolver.php index 7029ee0a..b63c801f 100644 --- a/src/Resolver/Order/PaymentCheckoutOrderResolver.php +++ b/src/Resolver/Order/PaymentCheckoutOrderResolver.php @@ -51,6 +51,8 @@ private function getCurrentRequest(): Request /** * @psalm-suppress MixedInferredReturnType + * @psalm-suppress MoreSpecificReturnType + * @psalm-suppress LessSpecificReturnStatement */ private function getCurrentOrder(): ?OrderInterface {