Merge branch 'develop-10' into ECP-9719

Author: candemiralp

AdminMessage/VersionMessage.php

@@ -13,43 +13,32 @@
 namespace Adyen\Payment\AdminMessage;
 
 use Adyen\Payment\Helper\Data;
+use Adyen\Payment\Helper\PlatformInfo;
 use Magento\AdminNotification\Model\InboxFactory;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Notification\MessageInterface;
 
 class VersionMessage implements MessageInterface
 {
-    /**
-     * @var Session
-     */
-    protected $_authSession;
-
-    /**
-     * @var Data
-     */
-    protected $_adyenHelper;
-
-    /**
-     * @var InboxFactory
-     */
-    protected $_inboxFactory;
-
-    /**
-     * @var RequestInterface
-     */
-    protected $request;
+    protected Session $_authSession;
+    protected Data $_adyenHelper;
+    protected InboxFactory $_inboxFactory;
+    protected RequestInterface $request;
+    protected PlatformInfo $_platformInfo;
 
     public function __construct(
         Session $authSession,
         Data $adyenHelper,
         InboxFactory $inboxFactory,
-        RequestInterface $request
+        RequestInterface $request,
+        PlatformInfo $platformInfo
     ) {
         $this->_authSession = $authSession;
         $this->_adyenHelper = $adyenHelper;
         $this->_inboxFactory = $inboxFactory;
         $this->request = $request;
+        $this->_platformInfo = $platformInfo;
     }
 
     const MESSAGE_IDENTITY = 'Adyen Version Control message';
@@ -96,7 +85,7 @@ public function isDisplayed()
                  * This will compare the currently installed version with the latest available one.
                  * A message will appear after the login if the two are not matching.
                  */
-                if ($this->_adyenHelper->getModuleVersion() != $githubContent['tag_name']) {
+                if ($this->_platformInfo->getModuleVersion() != $githubContent['tag_name']) {
                     return true;
                 }
             } elseif ($this->request->getModuleName() === 'mui' && $this->isNewVersionAvailable()) {
@@ -127,7 +116,7 @@ public function getText()
             "<a href= \"" . $githubContent['html_url'] . "\" target='_blank'> " . $githubContent['tag_name'] . "!</a>"
         );
         $message .= __(
-            " You are running the " . $this->_adyenHelper->getModuleVersion(
+            " You are running the " . $this->_platformInfo->getModuleVersion(
             ) . " version. We advise to update your extension."
         );
         return __($message);
@@ -177,7 +166,7 @@ private function isNewVersionAvailable()
         $githubContent = $this->getSessionData("AdyenGithubVersion");
 
         if (isset($githubContent)) {
-            return $this->_adyenHelper->getModuleVersion() !== $githubContent['tag_name'];
+            return $this->_platformInfo->getModuleVersion() !== $githubContent['tag_name'];
         }
     }
 }

Block/Adminhtml/System/Config/Field/Version.php

@@ -15,6 +15,9 @@
 
 namespace Adyen\Payment\Block\Adminhtml\System\Config\Field;
 
+use Adyen\Payment\Helper\PlatformInfo;
+use Magento\Backend\Block\Template\Context;
+
 class Version extends \Magento\Config\Block\System\Config\Form\Field
 {
 
@@ -23,20 +26,25 @@ class Version extends \Magento\Config\Block\System\Config\Form\Field
      */
     protected $_adyenHelper;
 
+    /**
+     * @var PlatformInfo
+     */
+    protected $_platformInfo;
+
     /**
      * Version constructor.
      *
-     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @param \Magento\Backend\Block\Template\Context $context
+     * @param PlatformInfo $platformInfo
+     * @param Context $context
      * @param array $data
      */
     public function __construct(
-        \Adyen\Payment\Helper\Data $adyenHelper,
+        PlatformInfo $platformInfo,
         \Magento\Backend\Block\Template\Context $context,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->_adyenHelper = $adyenHelper;
+        $this->_platformInfo = $platformInfo;
     }
 
     /**
@@ -47,6 +55,6 @@ public function __construct(
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
-        return $this->_adyenHelper->getModuleVersion();
+        return $this->_platformInfo->getModuleVersion();
     }
 }

Block/Checkout/Multishipping/Success.php

@@ -14,6 +14,7 @@
 
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\Config;
+use Adyen\Payment\Helper\Locale;
 use Adyen\Payment\Helper\PaymentMethods;
 use Adyen\Payment\Helper\PaymentResponseHandler;
 use Adyen\Payment\Model\ResourceModel\PaymentResponse\Collection;
@@ -38,6 +39,7 @@ class Success extends \Magento\Multishipping\Block\Checkout\Success
     private SearchCriteriaBuilder $searchCriteriaBuilder;
     private Config $configHelper;
     private PaymentMethods $paymentMethodsHelper;
+    private Locale $localeHelper;
 
     /**
      * @var
@@ -56,6 +58,7 @@ public function __construct(
         OrderRepositoryInterface $orderRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         Config $configHelper,
+        Locale $localeHelper,
         array $data = []
     ) {
         $this->adyenHelper = $adyenHelper;
@@ -66,6 +69,7 @@ public function __construct(
         $this->orderRepository = $orderRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->configHelper = $configHelper;
+        $this->localeHelper = $localeHelper;
         parent::__construct($context, $multishipping, $data);
 
         $orderIds = $this->getOrderIds();
@@ -97,7 +101,7 @@ public function getPaymentResponseEntities()
 
     public function getLocale()
     {
-        return $this->adyenHelper->getCurrentLocaleCode(
+        return $this->localeHelper->getCurrentLocaleCode(
             $this->storeManager->getStore()->getId()
         );
     }

Block/Checkout/Success.php

@@ -13,6 +13,7 @@
 
 use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Helper\Data;
+use Adyen\Payment\Helper\Locale;
 use Adyen\Payment\Helper\PaymentResponseHandler;
 use Adyen\Payment\Model\Ui\AdyenCheckoutSuccessConfigProvider;
 use Magento\Checkout\Model\Session as CheckoutSession;
@@ -40,7 +41,7 @@ class Success extends Template
     private AdyenCheckoutSuccessConfigProvider $configProvider;
     private QuoteIdToMaskedQuoteId $quoteIdToMaskedQuoteId;
     private OrderRepositoryInterface $orderRepository;
-    /** @deprecated This property has been deprecated and will be removed on V10. */
+    private Locale $localeHelper;
     protected OrderFactory $orderFactory;
 
     public function __construct(
@@ -55,6 +56,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         SerializerInterface $serializerInterface,
         OrderRepositoryInterface $orderRepository,
+        Locale $localeHelper,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -69,6 +71,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->serializerInterface = $serializerInterface;
         $this->orderRepository = $orderRepository;
+        $this->localeHelper = $localeHelper;
     }
 
     /**
@@ -128,7 +131,7 @@ public function getSerializedCheckoutConfig()
 
     public function getLocale()
     {
-        return $this->adyenHelper->getCurrentLocaleCode(
+        return $this->localeHelper->getCurrentLocaleCode(
             $this->storeManager->getStore()->getId()
         );
     }

Block/Form/Moto.php

@@ -14,9 +14,12 @@
 use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\Installments;
+use Adyen\Payment\Helper\Locale;
 use Adyen\Payment\Logger\AdyenLogger;
 use Magento\Backend\Model\Session\Quote;
 use Magento\Checkout\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\Template\Context;
 
 class Moto extends \Magento\Payment\Block\Form\Cc
@@ -31,6 +34,11 @@ class Moto extends \Magento\Payment\Block\Form\Cc
      */
     protected $adyenHelper;
 
+    /**
+     * @var Locale
+     */
+    protected $localeHelper;
+
     /**
      * @var \Magento\Framework\App\State
      */
@@ -65,10 +73,12 @@ class Moto extends \Magento\Payment\Block\Form\Cc
      * @param Context $context
      * @param \Magento\Payment\Model\Config $paymentConfig
      * @param Data $adyenHelper
-     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param Session $checkoutSession
      * @param Installments $installmentsHelper
      * @param AdyenLogger $adyenLogger
      * @param Config $configHelper
+     * @param Quote $backendSession
+     * @param Locale $localeHelper
      */
     public function __construct(
         Context $context,
@@ -78,7 +88,8 @@ public function __construct(
         Installments $installmentsHelper,
         AdyenLogger $adyenLogger,
         Config $configHelper,
-        Quote $backendSession
+        Quote $backendSession,
+        Locale $localeHelper
     ) {
         parent::__construct($context, $paymentConfig);
         $this->adyenHelper = $adyenHelper;
@@ -88,10 +99,13 @@ public function __construct(
         $this->adyenLogger = $adyenLogger;
         $this->configHelper = $configHelper;
         $this->backendSession = $backendSession;
+        $this->localeHelper = $localeHelper;
     }
 
     /**
      * @return string
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function getCheckoutEnvironment()
     {
@@ -103,7 +117,7 @@ public function getCheckoutEnvironment()
      */
     public function getLocale()
     {
-        return $this->adyenHelper->getStoreLocale($this->checkoutSession->getQuote()->getStore()->getId());
+        return $this->localeHelper->getStoreLocale($this->checkoutSession->getQuote()->getStore()->getId());
     }
 
     /**

Gateway/Data/Order/OrderAdapter.php

@@ -32,14 +32,4 @@ public function __construct(
         $this->order = $order;
         parent::__construct($order, $addressAdapterFactory);
     }
-
-    /**
-     * @deprecated Use Magento\Sales\Api\Data\OrderInterface::getQuoteId() instead
-     *
-     * @return float|int|null
-     */
-    public function getQuoteId()
-    {
-        return $this->order->getQuoteId();
-    }
 }

Gateway/Http/Client/TransactionCancel.php

@@ -16,6 +16,7 @@
 use Adyen\Model\Checkout\PaymentCancelRequest;
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\Idempotency;
+use Adyen\Payment\Helper\PlatformInfo;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\TransferInterface;
@@ -32,16 +33,24 @@ class TransactionCancel implements ClientInterface
      */
     private Idempotency $idempotencyHelper;
 
+    /**
+     * @var PlatformInfo
+     */
+    private PlatformInfo $platformInfo;
+
     /**
      * @param Data $adyenHelper
      * @param Idempotency $idempotencyHelper
+     * @param PlatformInfo $platformInfo
      */
     public function __construct(
         Data        $adyenHelper,
-        Idempotency $idempotencyHelper
+        Idempotency $idempotencyHelper,
+        PlatformInfo  $platformInfo
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->idempotencyHelper = $idempotencyHelper;
+        $this->platformInfo = $platformInfo;
     }
 
     /**
@@ -68,7 +77,7 @@ public function placeRequest(TransferInterface $transferObject): array
             $requestOptions['idempotencyKey'] = $idempotencyKey;
             $requestOptions['headers'] = $headers;
             $this->adyenHelper->logRequest($request, Client::API_CHECKOUT_VERSION, '/cancels');
-            $request['applicationInfo'] = $this->adyenHelper->buildApplicationInfo($client);
+            $request['applicationInfo'] = $this->platformInfo->buildApplicationInfo($client);
             $paymentCancelRequest = new PaymentCancelRequest($request);
 
             try {

Gateway/Http/Client/TransactionCapture.php

@@ -20,6 +20,7 @@
 use Adyen\Payment\Helper\Requests;
 use Adyen\Payment\Logger\AdyenLogger;
 use Adyen\Service\Checkout\ModificationsApi;
+use Adyen\Payment\Helper\PlatformInfo;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\TransferInterface;
@@ -47,19 +48,27 @@ class TransactionCapture implements ClientInterface
      */
     private Idempotency $idempotencyHelper;
 
+    /**
+     * @var PlatformInfo
+     */
+    private PlatformInfo $platformInfo;
+
     /**
      * @param Data $adyenHelper
      * @param AdyenLogger $adyenLogger
      * @param Idempotency $idempotencyHelper
+     * @param PlatformInfo $platformInfo
      */
     public function __construct(
         Data $adyenHelper,
         AdyenLogger $adyenLogger,
-        Idempotency $idempotencyHelper
+        Idempotency $idempotencyHelper,
+        PlatformInfo $platformInfo
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->adyenLogger = $adyenLogger;
         $this->idempotencyHelper = $idempotencyHelper;
+        $this->platformInfo = $platformInfo;
     }
 
     /**
@@ -78,7 +87,7 @@ public function placeRequest(TransferInterface $transferObject): array
         $service = $this->adyenHelper->initializeModificationsApi($client);
 
         $requestOptions['headers'] = $headers;
-        $request['applicationInfo'] = $this->adyenHelper->buildApplicationInfo($client);
+        $request['applicationInfo'] = $this->platformInfo->buildApplicationInfo($client);
 
         if (array_key_exists(self::MULTIPLE_AUTHORIZATIONS, $request)) {
             return $this->placeMultipleCaptureRequests($service, $request, $requestOptions);