Merge remote-tracking branch 'origin/MC-34152' into 2.4-develop-pr28

Author: serhii-balko

app/code/Magento/Paypal/Model/Payflowpro.php

@@ -8,6 +8,8 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\State\InvalidTransitionException;
+use Magento\Payment\Gateway\Command\CommandException;
 use Magento\Payment\Helper\Formatter;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
@@ -85,6 +87,8 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
 
     const RESPONSE_CODE_VOID_ERROR = 108;
 
+    private const RESPONSE_CODE_AUTHORIZATION_EXPIRED = 10601;
+
     const PNREF = 'pnref';
 
     /**#@-*/
@@ -376,7 +380,7 @@ public function getConfigPaymentAction()
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
+     * @throws InvalidTransitionException
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -410,7 +414,7 @@ protected function _getCaptureAmount($amount)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
+     * @throws InvalidTransitionException
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -448,7 +452,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param InfoInterface|Payment|Object $payment
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
+     * @throws InvalidTransitionException
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -491,14 +495,23 @@ public function canVoid()
      *
      * @param InfoInterface|Object $payment
      * @return $this
+     * @throws CommandException
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
         if (!$payment->getOrder()->getInvoiceCollection()->count()) {
-            return $this->void($payment);
+            try {
+                $this->void($payment);
+            } catch (CommandException $e) {
+                // Ignore error about expiration of authorization transaction.
+                if (strpos($e->getMessage(), (string)self::RESPONSE_CODE_AUTHORIZATION_EXPIRED) === false) {
+                    throw $e;
+                }
+            }
+
         }
 
-        return false;
+        return $this;
     }
 
     /**
@@ -508,7 +521,7 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      * @param float $amount
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
+     * @throws InvalidTransitionException
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -558,7 +571,7 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
      * @return bool
      * phpcs:disable Magento2.Functions.StaticFunction
      */
-    protected static function _isTransactionUnderReview($status)
+    protected function _isTransactionUnderReview($status)
     {
         if (in_array($status, [self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_DECLINED_BY_MERCHANT])) {
             return false;
@@ -650,21 +663,22 @@ public function buildBasicRequest()
      *
      * @param DataObject $response
      * @return void
-     * @throws \Magento\Payment\Gateway\Command\CommandException
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
+     * @throws CommandException
+     * @throws InvalidTransitionException
      */
     public function processErrors(DataObject $response)
     {
-        if ($response->getResultCode() == self::RESPONSE_CODE_VOID_ERROR) {
-            throw new \Magento\Framework\Exception\State\InvalidTransitionException(
+        $resultCode = (int)$response->getResultCode();
+        if ($resultCode === self::RESPONSE_CODE_VOID_ERROR) {
+            throw new InvalidTransitionException(
                 __("The verification transaction can't be voided. ")
             );
-        } elseif ($response->getResultCode() != self::RESPONSE_CODE_APPROVED &&
-            $response->getResultCode() != self::RESPONSE_CODE_FRAUDSERVICE_FILTER
-        ) {
-            throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg()));
-        } elseif ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_FILTER) {
-            throw new \Magento\Payment\Gateway\Command\CommandException(__($response->getRespmsg()));
+        }
+        if (!in_array($resultCode, [self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_FRAUDSERVICE_FILTER])) {
+            throw new CommandException(__($response->getRespmsg()));
+        }
+        if ((int)$response->getOrigresult() === self::RESPONSE_CODE_DECLINED_BY_FILTER) {
+            throw new CommandException(__($response->getRespmsg()));
         }
     }
 

dev/tests/integration/testsuite/Magento/Paypal/Model/Payflow/TransparentTest.php

@@ -47,14 +47,14 @@ protected function setUp(): void
     }
 
     /**
-     * Checks a case when order should be placed in "Suspected Fraud" status based on after account verification.
+     * Checks a case when order should be placed in "Suspected Fraud" status based on account verification.
      *
      * @magentoDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
      * @magentoConfigFixture current_store payment/payflowpro/active 1
      * @magentoConfigFixture current_store payment/payflowpro/payment_action Authorization
      * @magentoConfigFixture current_store payment/payflowpro/fmf 1
      */
-    public function testPlaceOrderSuspectedFraud()
+    public function testPlaceOrderSuspectedFraud(): void
     {
         $quote = $this->getQuote('test_order_1');
         $this->addFraudPayment($quote);
@@ -114,7 +114,7 @@ private function getQuote(string $reservedOrderId): CartInterface
      *
      * @return void
      */
-    private function addFraudPayment(CartInterface $quote)
+    private function addFraudPayment(CartInterface $quote): void
     {
         $payment = $quote->getPayment();
         $payment->setMethod(Config::METHOD_PAYFLOWPRO);