Merge remote-tracking branch 'origin/MC-31292' into 2.4-develop-pr16

Author: serhii-balko

app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php

@@ -11,6 +11,8 @@
 
 /**
  * Plugin to convert shopping cart from persistent cart to guest cart before order save when customer not logged in
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class GuestPaymentInformationManagementPlugin
 {
@@ -93,7 +95,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSavePaymentInformationAndPlaceOrder(
+    public function beforeSavePaymentInformation(
         GuestPaymentInformationManagement $subject,
         $cartId,
         $email,

app/code/Magento/Persistent/Observer/PreventExpressCheckoutObserver.php

@@ -111,7 +111,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCartConvertsToGuest
         $collectionMock->expects($this->once())->method('walk')->with($walkMethod, $walkArgs);
         $this->cartRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
 
-        $this->plugin->beforeSavePaymentInformationAndPlaceOrder(
+        $this->plugin->beforeSavePaymentInformation(
             $this->subjectMock,
             $cartId,
             $email,
@@ -134,7 +134,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderShoppingCartNotPers
         $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false);
 
-        $this->plugin->beforeSavePaymentInformationAndPlaceOrder(
+        $this->plugin->beforeSavePaymentInformation(
             $this->subjectMock,
             $cartId,
             $email,
@@ -155,7 +155,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderPersistentSessionNo
 
         $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
 
-        $this->plugin->beforeSavePaymentInformationAndPlaceOrder(
+        $this->plugin->beforeSavePaymentInformation(
             $this->subjectMock,
             $cartId,
             $email,
@@ -177,7 +177,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCustomerSessionInLo
         $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(true);
 
-        $this->plugin->beforeSavePaymentInformationAndPlaceOrder(
+        $this->plugin->beforeSavePaymentInformation(
             $this->subjectMock,
             $cartId,
             $email,
@@ -201,7 +201,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderQuoteManagerNotInPe
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false);
         $this->quoteManagerMock->expects($this->once())->method('isPersistent')->willReturn(false);
 
-        $this->plugin->beforeSavePaymentInformationAndPlaceOrder(
+        $this->plugin->beforeSavePaymentInformation(
             $this->subjectMock,
             $cartId,
             $email,

app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php

@@ -34,7 +34,6 @@
         <observer name="persistent_session" instance="Magento\Persistent\Observer\RenewCookieObserver" />
         <observer name="persistent_quote" instance="Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver" />
         <observer name="persistent_customer" instance="Magento\Persistent\Observer\EmulateCustomerObserver" />
-        <observer name="persistent_checkout" instance="Magento\Persistent\Observer\PreventExpressCheckoutObserver" />
     </event>
     <event name="customer_customer_authenticated">
         <observer name="persistent" instance="Magento\Persistent\Observer\CustomerAuthenticatedEventObserver" />