[ECP-9569] Update dependencies and unit tests

Author: candemiralp

Helper/PaymentMethods.php

@@ -22,15 +22,12 @@
 use Adyen\Payment\Model\Ui\Adminhtml\AdyenMotoConfigProvider;
 use Adyen\Payment\Model\Ui\AdyenPayByLinkConfigProvider;
 use Adyen\Payment\Model\Ui\AdyenPosCloudConfigProvider;
-use Adyen\Payment\Helper\PlatformInfo;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\Asset\Source;
@@ -86,110 +83,15 @@ class PaymentMethods extends AbstractHelper
         self::ADYEN_BOLETO
     ];
 
-    /**
-     * @var CartRepositoryInterface
-     */
-    protected CartRepositoryInterface $quoteRepository;
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    protected ScopeConfigInterface $config;
-
-    /**
-     * @var Data
-     */
-    protected Data $adyenHelper;
-
-    /**
-     * @var MagentoDataHelper
-     */
-    private MagentoDataHelper $dataHelper;
-
-    /**
-     * @var ResolverInterface
-     */
-    protected ResolverInterface $localeResolver;
-
-    /**
-     * @var AdyenLogger
-     */
-    protected AdyenLogger $adyenLogger;
-
-    /**
-     * @var Repository
-     */
-    protected Repository $assetRepo;
-
-    /**
-     * @var RequestInterface
-     */
-    protected RequestInterface $request;
-
-    /**
-     * @var Source
-     */
-    protected Source $assetSource;
-
-    /**
-     * @var DesignInterface
-     */
-    protected DesignInterface $design;
-
-    /**
-     * @var ThemeProviderInterface
-     */
-    protected ThemeProviderInterface $themeProvider;
-
-    /**
-     * @var CartInterface
-     */
     protected CartInterface $quote;
 
-    /**
-     * @var ChargedCurrency
-     */
-    private ChargedCurrency $chargedCurrency;
-
-    /**
-     * @var Config
-     */
-    private Config $configHelper;
-
-    /**
-     * @var SerializerInterface
-     */
-    private SerializerInterface $serializer;
-
-    /**
-     * @var PaymentTokenRepositoryInterface
-     */
-    private PaymentTokenRepositoryInterface $paymentTokenRepository;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private SearchCriteriaBuilder $searchCriteriaBuilder;
-
-    /**
-     * @var Locale
-     */
-    private Locale $localeHelper;
-
-    /**
-     * @var PlatformInfo
-     */
-    private PlatformInfo $platformInfo;
-
     /**
      * @param Context $context
      * @param CartRepositoryInterface $quoteRepository
      * @param ScopeConfigInterface $config
      * @param Data $adyenHelper
-     * @param ResolverInterface $localeResolver
      * @param AdyenLogger $adyenLogger
      * @param Repository $assetRepo
-     * @param RequestInterface $request
      * @param Source $assetSource
      * @param DesignInterface $design
      * @param ThemeProviderInterface $themeProvider
@@ -200,48 +102,26 @@ class PaymentMethods extends AbstractHelper
      * @param PaymentTokenRepositoryInterface $paymentTokenRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param Locale $localeHelper
-     * @param PlatformInfo $platformInfo
      */
     public function __construct(
         Context $context,
-        CartRepositoryInterface $quoteRepository,
-        ScopeConfigInterface $config,
-        Data $adyenHelper,
-        ResolverInterface $localeResolver,
-        AdyenLogger $adyenLogger,
-        Repository $assetRepo,
-        RequestInterface $request,
-        Source $assetSource,
-        DesignInterface $design,
-        ThemeProviderInterface $themeProvider,
-        ChargedCurrency $chargedCurrency,
-        Config $configHelper,
-        MagentoDataHelper $dataHelper,
-        SerializerInterface $serializer,
-        PaymentTokenRepositoryInterface $paymentTokenRepository,
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        Locale $localeHelper,
-        PlatformInfo $platformInfo
+        protected readonly CartRepositoryInterface $quoteRepository,
+        protected readonly ScopeConfigInterface $config,
+        protected readonly Data $adyenHelper,
+        protected readonly AdyenLogger $adyenLogger,
+        protected readonly Repository $assetRepo,
+        protected readonly Source $assetSource,
+        protected readonly DesignInterface $design,
+        protected readonly ThemeProviderInterface $themeProvider,
+        protected readonly ChargedCurrency $chargedCurrency,
+        protected readonly Config $configHelper,
+        protected readonly MagentoDataHelper $dataHelper,
+        protected readonly SerializerInterface $serializer,
+        protected readonly PaymentTokenRepositoryInterface $paymentTokenRepository,
+        protected readonly SearchCriteriaBuilder $searchCriteriaBuilder,
+        protected readonly Locale $localeHelper
     ) {
         parent::__construct($context);
-        $this->quoteRepository = $quoteRepository;
-        $this->config = $config;
-        $this->adyenHelper = $adyenHelper;
-        $this->localeResolver = $localeResolver;
-        $this->adyenLogger = $adyenLogger;
-        $this->assetRepo = $assetRepo;
-        $this->request = $request;
-        $this->assetSource = $assetSource;
-        $this->design = $design;
-        $this->themeProvider = $themeProvider;
-        $this->chargedCurrency = $chargedCurrency;
-        $this->configHelper = $configHelper;
-        $this->dataHelper = $dataHelper;
-        $this->serializer = $serializer;
-        $this->paymentTokenRepository = $paymentTokenRepository;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->localeHelper = $localeHelper;
-        $this->platformInfo = $platformInfo;
     }
 
     /**

Helper/Requests.php

@@ -17,9 +17,8 @@
 use Adyen\Payment\Model\Ui\AdyenPayByLinkConfigProvider;
 use Adyen\Util\Uuid;
 use Magento\Framework\App\Helper\AbstractHelper;
-use Magento\Framework\App\Request\Http as Http;
+use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Exception\LocalizedException;
-use Adyen\Payment\Helper\PlatformInfo;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class Requests extends AbstractHelper
@@ -35,39 +34,18 @@ class Requests extends AbstractHelper
         'applepay' => 'scheme'
     ];
 
-    private Data $adyenHelper;
-    private Config $adyenConfig;
-    private Address $addressHelper;
-    private StateData $stateData;
-    private Vault $vaultHelper;
-    private Http $request;
-    private ChargedCurrency $chargedCurrency;
-    private PaymentMethods $paymentMethodsHelper;
-    private PlatformInfo $platformInfo;
-    private Locale $localeHelper;
-
     public function __construct(
-        Data $adyenHelper,
-        Config $adyenConfig,
-        Address $addressHelper,
-        StateData $stateData,
-        Vault $vaultHelper,
-        Http $request,
-        ChargedCurrency $chargedCurrency,
-        PaymentMethods $paymentMethodsHelper,
-        PlatformInfo $platformInfo,
-        Locale $localeHelper
+        Context $context,
+        protected readonly Data $adyenHelper,
+        protected readonly Config $adyenConfig,
+        protected readonly Address $addressHelper,
+        protected readonly StateData $stateData,
+        protected readonly Vault $vaultHelper,
+        protected readonly ChargedCurrency $chargedCurrency,
+        protected readonly PaymentMethods $paymentMethodsHelper,
+        protected readonly Locale $localeHelper
     ) {
-        $this->adyenHelper = $adyenHelper;
-        $this->adyenConfig = $adyenConfig;
-        $this->addressHelper = $addressHelper;
-        $this->stateData = $stateData;
-        $this->vaultHelper = $vaultHelper;
-        $this->request = $request;
-        $this->chargedCurrency = $chargedCurrency;
-        $this->paymentMethodsHelper = $paymentMethodsHelper;
-        $this->platformInfo = $platformInfo;
-        $this->localeHelper = $localeHelper;
+        parent::__construct($context);
     }
 
     /**

Test/Unit/Helper/DataTest.php

@@ -22,6 +22,7 @@
 use Magento\Framework\Config\DataInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\View\Asset\File;
 use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\Asset\Source;
 use Magento\Store\Model\Store;
@@ -60,9 +61,8 @@ class DataTest extends AbstractAdyenTestCase
     private ConfigHelper $configHelper;
     private PlatformInfo $platformInfo;
     private Client $clientMock;
-    private AdyenConfig $adyenConfig;
     private Store $store;
-    private RequestInterface $request;
+    private RequestInterface $mockRequest;
 
     /**
      * @throws Exception
@@ -100,7 +100,8 @@ protected function setUp(): void
         $this->configHelper = $this->createMock(ConfigHelper::class);
         $this->platformInfo = $this->createMock(PlatformInfo::class);
         $this->store = $this->createMock(Store::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->mockRequest = $this->createMock(RequestInterface::class);
+        $this->context->method('getRequest')->willReturn($this->mockRequest);
 
         $this->dataHelper = new Data(
             $this->context,
@@ -118,8 +119,7 @@ protected function setUp(): void
             $this->cache,
             $this->scopeConfig,
             $this->configHelper,
-            $this->platformInfo,
-            $this->request
+            $this->platformInfo
         );
     }
 
@@ -796,16 +796,7 @@ public function testGetCheckoutEnvironmentDefault()
     public function testCreateAsset(): void
     {
         $fileId = 'Adyen_Payment::images/logos/adyen_vi.png';
-        $mockAsset = $this->createMock(\Magento\Framework\View\Asset\File::class);
-
-        // Mock request
-        $mockRequest = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-        $mockRequest->method('isSecure')->willReturn(true);
-
-        // Context returns mocked request
-        $this->context
-            ->method('getRequest')
-            ->willReturn($mockRequest);
+        $mockAsset = $this->createMock(File::class);
 
         $this->assetRepo
             ->expects(self::once())

Test/Unit/Helper/PaymentMethodsTest.php

@@ -35,6 +35,7 @@
 class PaymentMethodsTest extends AbstractAdyenTestCase
 {
     private PaymentMethods $helper;
+
     private MockObject $dataHelper;
     private MockObject $configHelper;
     private MockObject $magentoDataHelper;
@@ -89,10 +90,8 @@ protected function setUp(): void
             $this->createMock(CartRepositoryInterface::class),
             $this->config,
             $this->dataHelper,
-            $this->createMock(ResolverInterface::class),
             $this->createMock(AdyenLogger::class),
             $this->repositoryMock,
-            $this->createMock(RequestInterface::class),
             $this->sourceMock,
             $this->createMock(DesignInterface::class),
             $this->createMock(ThemeProviderInterface::class),
@@ -102,8 +101,7 @@ protected function setUp(): void
             $this->serializer,
             $this->paymentTokenRepositoryInterface,
             $this->searchCriteriaBuilder,
-            $this->localeHelper,
-            $this->platformInfo
+            $this->localeHelper
         );
     }
 
@@ -509,23 +507,20 @@ public function testFilterStoredPaymentMethodsWithFiltering(): void
         $helper = new PaymentMethods(
             $this->createMock(Context::class),
             $this->createMock(CartRepositoryInterface::class),
-            $this->createMock(ScopeConfigInterface::class),
+            $this->config,
             $this->dataHelper,
-            $this->createMock(ResolverInterface::class),
             $this->createMock(AdyenLogger::class),
             $this->repositoryMock,
-            $this->createMock(RequestInterface::class),
             $this->sourceMock,
             $this->createMock(DesignInterface::class),
             $this->createMock(ThemeProviderInterface::class),
-            $this->createMock(ChargedCurrency::class),
+            $this->chargedCurrencyMock,
             $this->configHelper,
             $this->magentoDataHelper,
             $this->serializer,
             $this->paymentTokenRepositoryInterface,
             $this->searchCriteriaBuilder,
-            $this->createMock(Locale::class),
-            $this->createMock(PlatformInfo::class)
+            $this->localeHelper
         );
 
         $responseData = [