Merge pull request #2151 from Adyen/develop

Release 8.20.0

.github/Makefile

@@ -20,11 +20,6 @@ install:
  bin/magento setup:upgrade
  bin/magento setup:di:compile
 
-# Install developer module
-dev-module:
- bin/magento module:enable Adyen_Developer
- bin/magento setup:upgrade
-
 # Configuration
 configure: n98-magerun2.phar
  bin/magento config:set payment/adyen_abstract/demo_mode 1

.github/docker-compose.e2e.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
  playwright:
- image: mcr.microsoft.com/playwright:v1.36.0-focal
+ image: mcr.microsoft.com/playwright:v1.36.2-focal
  shm_size: 1gb
  ipc: host
  cap_add:

.github/workflows/e2e-test.yml

@@ -17,6 +17,7 @@ jobs:
  ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
  steps:
  - uses: actions/checkout@v3
+
  - name: Install Magento
  run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento
 
@@ -36,26 +37,6 @@ jobs:
 
  - name: Install plugin
  run: docker exec -u www-data magento2-container make plugin
-
- - name: Checkout developer module
- uses: actions/checkout@v3
- with: 
- repository: Adyen/adyen-magento2-dev
- ref: 'main'
- token: ${{ secrets.ADYEN_AUTOMATION_BOT_TEST_ACCESS_TOKEN }}
- path: Developer
-
- - name: Make the folder for dev module
- run: docker exec -u www-data magento2-container mkdir -p /var/www/html/app/code/Adyen
-
- - name: Copy dev module into Docker container
- run: docker cp ./Developer magento2-container:/var/www/html/app/code/Adyen
-
- - name: Change ownership of developer module folder
- run: docker exec magento2-container chown -R www-data:www-data /var/www/html/app/code/Adyen/Developer
-
- - name: Enable developer module
- run: docker exec -u www-data magento2-container make dev-module
 
  - run: docker exec magento2-container /etc/init.d/cron stop
 

.github/workflows/main.yml

@@ -12,11 +12,13 @@ jobs:
 
  steps:
  - uses: actions/checkout@v3
+
  - name: Use PHP ${{ matrix.php-version }}
  uses: shivammathur/setup-php@v2
  with:
  php-version: ${{ matrix.php-version }}
- tools: composer:v1, 
+ tools: composer:v1
+
  - name: Test plugin installation
  run: |
  echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > auth.json
@@ -25,7 +27,20 @@ jobs:
  CI: true
  MAGENTO_USERNAME: ${{ secrets.MAGENTO_USERNAME }}
  MAGENTO_PASSWORD: ${{ secrets.MAGENTO_PASSWORD }}
+
  - name: Code Sniffer
  run: vendor/bin/phpcs --extensions=php,phtml --error-severity=10 --ignore-annotations
+
  - name: Run PHPUnit
- run: vendor/bin/phpunit Test/Unit
+ run: vendor/bin/phpunit --coverage-clover=build/clover.xml --log-junit=build/tests-log.xml -c Test/phpunit.xml Test/Unit
+
+ - name: Fix code coverage paths
+ run: sed -i "s;`pwd`/;;g" build/*.xml
+
+ - name: SonarCloud Scan
+ if: ${{ env.SONAR_TOKEN }}
+ uses: SonarSource/sonarcloud-github-action@master
+ continue-on-error: true
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/test-repo-e2e.yml

@@ -14,14 +14,14 @@ jobs:
  runs-on:
  group: larger-runners
  labels: ubuntu-latest-8-cores
- timeout-minutes: 20
  env:
  PHP_VERSION: "8.1"
  MAGENTO_VERSION: "2.4.5"
  ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
  ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
  steps:
  - uses: actions/checkout@v3
+
  - name: Install Magento
  run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento
 
@@ -41,28 +41,6 @@ jobs:
 
  - name: Install plugin
  run: docker exec -u www-data magento2-container make plugin
-
- - name: Checkout developer module
- uses: actions/checkout@v3
- with: 
- repository: Adyen/adyen-magento2-dev
- ref: 'main'
- token: ${{ secrets.ADYEN_AUTOMATION_BOT_TEST_ACCESS_TOKEN }}
- path: Developer
-
- - name: Make the folder for dev module
- run: docker exec -u www-data magento2-container mkdir -p /var/www/html/app/code/Adyen
-
- - name: Copy dev module into Docker container
- run: docker cp ./Developer magento2-container:/var/www/html/app/code/Adyen
-
- - name: Change ownership of developer module folder
- run: docker exec magento2-container chown -R www-data:www-data /var/www/html/app/code/Adyen/Developer
-
- - name: Enable developer module
- run: docker exec -u www-data magento2-container make dev-module
-
- - run: docker exec magento2-container /etc/init.d/cron stop
 
  - name: Switch to production mode
  run: docker exec -u www-data magento2-container make production
@@ -88,4 +66,4 @@ jobs:
  uses: actions/upload-artifact@v3
  with:
  name: html-report
- path: test-report
+ path: test-report

Helper/PaymentMethods/ApplePayPaymentMethod.php

@@ -44,11 +44,11 @@ public function supportsCardOnFile(): bool
 
  public function supportsSubscription(): bool
  {
- return false;
+ return true;
  }
 
  public function supportsUnscheduledCardOnFile(): bool
  {
- return false;
+ return true;
  }
 }