Skip to content

Commit ca9bfe7

Browse files
authored
Merge branch 'main' into ECP-9481-2
2 parents a0c5994 + a100a50 commit ca9bfe7

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

.github/docker-compose.e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
playwright:
4-
image: mcr.microsoft.com/playwright:v1.49.1
4+
image: mcr.microsoft.com/playwright:v1.50.0
55
shm_size: 1gb
66
ipc: host
77
cap_add:

.github/workflows/e2e-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Archive test result artifacts
135135
if: always()
136-
uses: actions/upload-artifact@v3
136+
uses: actions/upload-artifact@v4
137137
with:
138138
name: html-report
139139
path: test-report

Controller/Adminhtml/Configuration/DownloadApplePayDomainAssociationFile.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313

1414
use Adyen\Payment\Logger\AdyenLogger;
1515
use Exception;
16-
use Magento\Framework\App\ResponseInterface;
1716
use Magento\Framework\Controller\ResultInterface;
18-
use Magento\Framework\Exception\FileSystemException;
1917
use Magento\Framework\Filesystem\DirectoryList;
2018
use Magento\Backend\App\Action\Context;
2119
use Magento\Framework\Controller\ResultFactory;
@@ -30,7 +28,7 @@ class DownloadApplePayDomainAssociationFile extends Action
3028
const WELL_KNOWN_PATH = '.well-known';
3129

3230
public function __construct(
33-
private readonly Context $context,
31+
Context $context,
3432
private readonly DirectoryList $directoryList,
3533
private readonly File $fileIo,
3634
private readonly AdyenLogger $adyenLogger
@@ -39,10 +37,9 @@ public function __construct(
3937
}
4038

4139
/**
42-
* @return ResultInterface|ResponseInterface
43-
* @throws FileSystemException
40+
* @return ResultInterface
4441
*/
45-
public function execute(): ResultInterface|ResponseInterface
42+
public function execute(): ResultInterface
4643
{
4744
$redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
4845
$redirect->setUrl($this->_redirect->getRefererUrl());

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.13.0
1+
9.14.0

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "adyen/module-payment",
33
"description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
44
"type": "magento2-module",
5-
"version": "9.13.0",
5+
"version": "9.14.0",
66
"license": "MIT",
77
"repositories": [
88
{

0 commit comments

Comments
 (0)