Merge remote-tracking branch 'origin/MC-32546' into 2.4-develop-pr20

Author: serhii-balko

app/code/Magento/Paypal/Controller/Hostedpro/Cancel.php

@@ -1,15 +1,24 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Controller\Hostedpro;
 
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
 use Magento\Paypal\Helper\Checkout;
 
-class Cancel extends \Magento\Framework\App\Action\Action
+/**
+ * PayPal Hostedpro cancel controller.
+ */
+class Cancel extends Action implements CsrfAwareActionInterface, HttpGetActionInterface
 {
     /**
      * @var Checkout
@@ -40,4 +49,20 @@ public function execute()
 
         $this->_redirect('checkout', ['_fragment' => 'payment']);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(RequestInterface $request): ?InvalidRequestException
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
 }

app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php

@@ -1,12 +1,23 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Controller\Hostedpro;
 
-class ReturnAction extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * PayPal Hostedpro return controller.
+ */
+class ReturnAction extends Action implements CsrfAwareActionInterface, HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * When a customer return to website from gateway.
@@ -21,4 +32,20 @@ public function execute()
             $this->_redirect('checkout/onepage/success');
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(RequestInterface $request): ?InvalidRequestException
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
 }

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

@@ -8,6 +8,7 @@
 
 use Exception;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
@@ -301,6 +302,9 @@ protected function _registerPaymentCapture($skipFraudDetection = false)
         $payment->setParentTransactionId($parentTransactionId);
         $payment->setShouldCloseParentTransaction('Completed' === $this->getRequestData('auth_status'));
         $payment->setIsTransactionClosed(0);
+        if ($this->_order->getState() === Order::STATE_PENDING_PAYMENT) {
+            $this->_order->setState(Order::STATE_PROCESSING);
+        }
         $payment->registerCaptureNotification(
             $this->getRequestData('mc_gross'),
             $skipFraudDetection && $parentTransactionId

app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php

@@ -53,6 +53,7 @@ protected function setUp()
             'getEmailSent',
             'save',
             'getState',
+            'setState',
         ];
         $this->_orderMock = $this->createPartialMock(\Magento\Sales\Model\OrderFactory::class, $methods);
         $this->_orderMock->expects($this->any())->method('create')->will($this->returnSelf());
@@ -149,9 +150,12 @@ public function testPaymentReviewRegisterPaymentFraud()
             ->will($this->returnValue(true));
         $this->_orderMock->expects($this->any())->method('getPayment')->will($this->returnValue($paymentMock));
         $this->_orderMock->expects($this->any())->method('canFetchPaymentReviewUpdate')->will($this->returnValue(true));
-        $this->_orderMock->expects($this->once())->method('getState')->will(
+        $this->_orderMock->expects($this->any())->method('getState')->will(
             $this->returnValue(Order::STATE_PENDING_PAYMENT)
         );
+        $this->_orderMock->expects($this->once())
+            ->method('setState')
+            ->with(Order::STATE_PROCESSING);
         $this->_paypalInfo->expects($this->once())
             ->method('importToPayment')
             ->with(