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: 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 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 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: