Merge remote-tracking branch 'origin/MAGETWO-96862' into 2.2-develop-pr17

Author: serhii-balko

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

@@ -108,8 +108,8 @@ public function beforeSavePaymentInformationAndPlaceOrder(
             $this->customerSession->setCustomerId(null);
             $this->customerSession->setCustomerGroupId(null);
             $this->quoteManager->convertCustomerCartToGuest();
-            /** @var \Magento\Quote\Api\Data\CartInterface $quote */
-            $quote = $this->cartRepository->get($this->checkoutSession->getQuote()->getId());
+            $quoteId = $this->checkoutSession->getQuoteId();
+            $quote = $this->cartRepository->get($quoteId);
             $quote->setCustomerEmail($email);
             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
             $this->cartRepository->save($quote);

app/code/Magento/Persistent/Model/QuoteManager.php

@@ -108,8 +108,9 @@ public function setGuest($checkQuote = false)
      */
     public function convertCustomerCartToGuest()
     {
+        $quoteId = $this->checkoutSession->getQuoteId();
         /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->quoteRepository->get($this->checkoutSession->getQuote()->getId());
+        $quote = $this->quoteRepository->get($quoteId);
         if ($quote && $quote->getId()) {
             $this->_setQuotePersistent = false;
             $quote->setIsActive(true)

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

@@ -102,8 +102,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCartConvertsToGuest
             ['setCustomerEmail', 'getAddressesCollection'],
             false
         );
-        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
+        $this->checkoutSessionMock->method('getQuoteId')->willReturn($cartId);
         $this->cartRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email);
         /** @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */

app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php

@@ -247,8 +247,8 @@ public function testConvertCustomerCartToGuest()
         $emailArgs = ['email' => null];
 
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->exactly(2))->method('getId')->willReturn($quoteId);
+            ->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteMock->expects($this->once())->method('getId')->willReturn($quoteId);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($quoteId)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setIsActive')->with(true)->willReturn($this->quoteMock);
@@ -288,18 +288,15 @@ public function testConvertCustomerCartToGuest()
     public function testConvertCustomerCartToGuestWithEmptyQuote()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(null);
+            ->method('getQuoteId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(null)->willReturn(null);
-
         $this->model->convertCustomerCartToGuest();
     }
 
     public function testConvertCustomerCartToGuestWithEmptyQuoteId()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
+            ->method('getQuoteId')->willReturn(1);
         $quoteWithNoId = $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $quoteWithNoId->expects($this->once())->method('getId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(1)->willReturn($quoteWithNoId);