From de9c551d98b64996026ac7c06eed30b2802cdb06 Mon Sep 17 00:00:00 2001 From: Aziya <89023248+aziya-im@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:29:03 +0200 Subject: [PATCH 1/4] Update README.md (#2751) I have update the support dates for version 9 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a13985118..0c64e125b 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The schedule for the current maintained branches is: | Plugin Major Version | Release Date | Level 1 Support ends | Level 2 Support ends | Level 3 Support ends | | :----- |:--------------|:---------------------|:---------------------|:---------------------| | Version 8 | November 2021 | January 2024 | May 2024 | January 2025 | -| Version 9 | October 2023 | -- | -- | -- | +| Version 9 | October 2023 | December 2025 | May 2026 | December 2026 | Or, visualised as a calendar: From d42bf5325036d7237612e48fecf6160aa5cec538 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:16:07 +0200 Subject: [PATCH 2/4] chore(deps): update elasticsearch docker tag to v7.17.23 (#2747) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Can Demiralp --- .github/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml index 2b99bcfb0..21c4b69c9 100644 --- a/.github/docker-compose.yml +++ b/.github/docker-compose.yml @@ -12,7 +12,7 @@ services: MARIADB_USER: magento MARIADB_PASSWORD: magento elastic: - image: elasticsearch:7.17.22 + image: elasticsearch:7.17.23 container_name: elasticsearch networks: - backend From 9991d27f0598082d47ba3e3308d0ac4619cbb110 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:36:14 +0200 Subject: [PATCH 3/4] chore(deps): update mcr.microsoft.com/playwright docker tag to v1.47.2 (#2746) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/docker-compose.e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.e2e.yml b/.github/docker-compose.e2e.yml index 7a4b18fee..f5f51a866 100644 --- a/.github/docker-compose.e2e.yml +++ b/.github/docker-compose.e2e.yml @@ -1,7 +1,7 @@ version: '3' services: playwright: - image: mcr.microsoft.com/playwright:v1.47.0 + image: mcr.microsoft.com/playwright:v1.47.2 shm_size: 1gb ipc: host cap_add: From 4d2c0994ff101d88b50696b33f720a39ca26f954 Mon Sep 17 00:00:00 2001 From: Dimitri BOUTEILLE <34821762+dimitriBouteille@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:47:40 +0200 Subject: [PATCH 4/4] Fix bad StoreLocale resolver (#2743) * Fix errors in StoreLocale.php * Rename property --------- Co-authored-by: Dimitri BOUTEILLE Co-authored-by: Peter Ojo Co-authored-by: Can Demiralp --- Model/Resolver/StoreConfig/StoreLocale.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Model/Resolver/StoreConfig/StoreLocale.php b/Model/Resolver/StoreConfig/StoreLocale.php index 0babfee08..f7e0ecf9f 100644 --- a/Model/Resolver/StoreConfig/StoreLocale.php +++ b/Model/Resolver/StoreConfig/StoreLocale.php @@ -19,15 +19,13 @@ use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; use Magento\GraphQl\Model\Query\Context; use Magento\Store\Api\Data\StoreInterface; -use Reflet\GraphQlFaker\Attribute\FakeResolver; -use Reflet\GraphQlFaker\Model\Resolver\NullResolver; class StoreLocale implements ResolverInterface { - protected Data $dataHelper; + protected Data $adyenHelper; /** - * @param Data $adyenHelper + * @param \Adyen\Payment\Helper\Data $adyenHelper */ public function __construct( Data $adyenHelper