Merge branch 'develop' into add-codeql

Adyen · Sep 12, 2024 · 20e770f · 20e770f
2 parents 8a6740e + 9d5f638
commit 20e770f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -1,7 +1,8 @@
+
 name: E2E Test
 run-name: Headless E2E tests for Adyen Shopware Plugin
 
-on: 
+on:
   pull_request:
   workflow_dispatch:
 
@@ -52,7 +53,7 @@ jobs:
           docker exec shopware6 bash -c 'php bin/console adyen:fetch-logos'
 
       - name: Run E2E Tests
-        run: docker-compose -f .github/workflows/templates/docker-compose.playwright.yml run --rm playwright /e2e.sh
+        run: docker compose -f .github/workflows/templates/docker-compose.playwright.yml run --rm playwright /e2e.sh
         env:
           INTEGRATION_TESTS_BRANCH: develop
           SHOPWARE_BASE_URL: ${{secrets.SHOPWARE_BASE_URL}}

diff --git a/.github/workflows/templates/docker-compose.playwright.yml b/.github/workflows/templates/docker-compose.playwright.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:focal
+    image: mcr.microsoft.com/playwright:v1.47.0-focal 
     networks:
       - localnetwork
     shm_size: 1gb

diff --git a/composer.json b/composer.json
@@ -6,13 +6,13 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {
         "shopware/core": "~6.6.0",
         "shopware/storefront": "~6.6.0",
-        "adyen/php-api-library": "^17.5.0",
+        "adyen/php-api-library": "^20.2.0",
         "adyen/php-webhook-module": "^1",
         "ext-json": "*"
     },

diff --git a/src/ScheduledTask/ProcessNotificationsHandler.php b/src/ScheduledTask/ProcessNotificationsHandler.php
@@ -46,7 +46,9 @@
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskHandler;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
+#[AsMessageHandler(handles: ProcessNotifications::class)]
 class ProcessNotificationsHandler extends ScheduledTaskHandler
 {
     use LoggerAwareTrait;

diff --git a/src/ScheduledTask/ScheduleNotificationsHandler.php b/src/ScheduledTask/ScheduleNotificationsHandler.php
@@ -28,7 +28,9 @@
 use Psr\Log\LoggerAwareTrait;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskHandler;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
+#[AsMessageHandler(handles: ScheduleNotifications::class)]
 class ScheduleNotificationsHandler extends ScheduledTaskHandler
 {
     use LoggerAwareTrait;