ENGCOM-1067: Checkout module: Removing deprecated Message Manager method calls #14343

Stanislav Idolov · web-flow · commit 1b0bccc9c9ae · 2018-03-27T15:49:24.000+03:00
diff --git a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
@@ -84,7 +84,7 @@ protected function _prepareLayout()
     protected function validateMinimumAmount()
     {
         if (!$this->cartHelper->getQuote()->validateMinimumAmount()) {
-            $this->messageManager->addNotice($this->getMinimumAmountErrorMessage()->getMessage());
+            $this->messageManager->addNoticeMessage($this->getMinimumAmountErrorMessage()->getMessage());
         }
     }
 
diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
@@ -70,7 +70,7 @@ protected function _preDispatchValidateCustomer($redirect = true, $addErrors = t
             if (!$validationResult->isValid()) {
                 if ($addErrors) {
                     foreach ($validationResult->getMessages() as $error) {
-                        $this->messageManager->addError($error);
+                        $this->messageManager->addErrorMessage($error);
                     }
                 }
                 if ($redirect) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -132,13 +132,13 @@ public function execute()
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
-                $this->messageManager->addNotice(
+                $this->messageManager->addNoticeMessage(
                     $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($e->getMessage())
                 );
             } else {
                 $messages = array_unique(explode("\n", $e->getMessage()));
                 foreach ($messages as $message) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($message)
                     );
                 }
@@ -153,7 +153,10 @@ public function execute()
 
             return $this->goBack($url);
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t add this item to your shopping cart right now.'));
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('We can\'t add this item to your shopping cart right now.')
+            );
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -60,12 +60,12 @@ public function execute()
                     $this->addOrderItem($item);
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
                     if ($this->_checkoutSession->getUseNotice(true)) {
-                        $this->messageManager->addNotice($e->getMessage());
+                        $this->messageManager->addNoticeMessage($e->getMessage());
                     } else {
-                        $this->messageManager->addError($e->getMessage());
+                        $this->messageManager->addErrorMessage($e->getMessage());
                     }
                 } catch (\Exception $e) {
-                    $this->messageManager->addException(
+                    $this->messageManager->addExceptionMessage(
                         $e,
                         __('We can\'t add this item to your shopping cart right now.')
                     );
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -64,7 +64,9 @@ public function execute()
 
         try {
             if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
-                $this->messageManager->addError(__("The quote item isn't found. Verify the item and try again."));
+                $this->messageManager->addErrorMessage(
+                    __("The quote item isn't found. Verify the item and try again.")
+                );
                 return $this->resultFactory->create(ResultFactory::TYPE_REDIRECT)->setPath('checkout/cart');
             }
 
@@ -83,7 +85,7 @@ public function execute()
                 );
             return $resultPage;
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We cannot configure the product.'));
+            $this->messageManager->addErrorMessage(__('We cannot configure the product.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->_goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -95,14 +95,14 @@ public function execute()
                 if (!$itemsCount) {
                     if ($isCodeLengthValid && $coupon->getId()) {
                         $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -111,14 +111,14 @@ public function execute()
                     }
                 } else {
                     if ($isCodeLengthValid && $coupon->getId() && $couponCode == $cartQuote->getCouponCode()) {
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -127,12 +127,12 @@ public function execute()
                     }
                 }
             } else {
-                $this->messageManager->addSuccess(__('You canceled the coupon code.'));
+                $this->messageManager->addSuccessMessage(__('You canceled the coupon code.'));
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We cannot apply the coupon code.'));
+            $this->messageManager->addErrorMessage(__('We cannot apply the coupon code.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -24,7 +24,7 @@ public function execute()
             try {
                 $this->cart->removeItem($id)->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t remove the item.'));
+                $this->messageManager->addErrorMessage(__('We can\'t remove the item.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             }
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -67,17 +67,17 @@ public function execute()
                         $this->_objectManager->get(\Magento\Framework\Escaper::class)
                             ->escapeHtml($item->getProduct()->getName())
                     );
-                    $this->messageManager->addSuccess($message);
+                    $this->messageManager->addSuccessMessage($message);
                 }
                 return $this->_goBack($this->_url->getUrl('checkout/cart'));
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
-                $this->messageManager->addNotice($e->getMessage());
+                $this->messageManager->addNoticeMessage($e->getMessage());
             } else {
                 $messages = array_unique(explode("\n", $e->getMessage()));
                 foreach ($messages as $message) {
-                    $this->messageManager->addError($message);
+                    $this->messageManager->addErrorMessage($message);
                 }
             }
 
@@ -89,7 +89,7 @@ public function execute()
                 return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
             }
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the item right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t update the item right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->_goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -18,9 +18,9 @@ protected function _emptyShoppingCart()
         try {
             $this->cart->truncate()->save();
         } catch (\Magento\Framework\Exception\LocalizedException $exception) {
-            $this->messageManager->addError($exception->getMessage());
+            $this->messageManager->addErrorMessage($exception->getMessage());
         } catch (\Exception $exception) {
-            $this->messageManager->addException($exception, __('We can\'t update the shopping cart.'));
+            $this->messageManager->addExceptionMessage($exception, __('We can\'t update the shopping cart.'));
         }
     }
 
@@ -52,11 +52,11 @@ protected function _updateShoppingCart()
                 $this->cart->updateItems($cartData)->save();
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($e->getMessage())
             );
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the shopping cart.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t update the shopping cart.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
     }
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -18,7 +18,7 @@ public function execute()
         /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
         $checkoutHelper = $this->_objectManager->get(\Magento\Checkout\Helper\Data::class);
         if (!$checkoutHelper->canOnepageCheckout()) {
-            $this->messageManager->addError(__('One-page checkout is turned off.'));
+            $this->messageManager->addErrorMessage(__('One-page checkout is turned off.'));
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
@@ -28,7 +28,7 @@ public function execute()
         }
 
         if (!$this->_customerSession->isLoggedIn() && !$checkoutHelper->isAllowedGuestCheckout($quote)) {
-            $this->messageManager->addError(__('Guest checkout is disabled.'));
+            $this->messageManager->addErrorMessage(__('Guest checkout is disabled.'));
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
@@ -445,10 +445,10 @@ public function addProductsByIds($productIds)
             }
 
             if (!$allAvailable) {
-                $this->messageManager->addError(__("We don't have some of the products you want."));
+                $this->messageManager->addErrorMessage(__("We don't have some of the products you want."));
             }
             if (!$allAdded) {
-                $this->messageManager->addError(__("We don't have as many of some products as you want."));
+                $this->messageManager->addErrorMessage(__("We don't have as many of some products as you want."));
             }
         }
         return $this;
@@ -534,7 +534,7 @@ public function updateItems($data)
 
                 if (isset($itemInfo['before_suggest_qty']) && $itemInfo['before_suggest_qty'] != $qty) {
                     $qtyRecalculatedFlag = true;
-                    $this->messageManager->addNotice(
+                    $this->messageManager->addNoticeMessage(
                         __('Quantity was recalculated from %1 to %2', $itemInfo['before_suggest_qty'], $qty),
                         'quote_item' . $item->getId()
                     );
@@ -543,7 +543,7 @@ public function updateItems($data)
         }
 
         if ($qtyRecalculatedFlag) {
-            $this->messageManager->addNotice(
+            $this->messageManager->addNoticeMessage(
                 __('We adjusted product quantities to fit the required increments.')
             );
         }
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -666,7 +666,7 @@ protected function _involveNewCustomer()
         $confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
         if ($confirmationStatus === \Magento\Customer\Model\AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED) {
             $url = $this->_customerUrl->getEmailConfirmationUrl($customer->getEmail());
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 // @codingStandardsIgnoreStart
                 __(
                     'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',
diff --git a/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php b/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
@@ -42,9 +42,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         try {
             $this->checkoutSession->loadCustomerQuote();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Load customer quote error'));
+            $this->messageManager->addExceptionMessage($e, __('Load customer quote error'));
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php
@@ -198,7 +198,7 @@ public function testRedirectWithWrongProductId()
         $quoteItemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
         $productMock->expects($this->once())->method('getId')->willReturn($productIdInQuota);
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->willReturn('');
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
@@ -236,7 +236,7 @@ public function testExecuteWithGoodCouponAndItems()
             ->willReturn('CODE');
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -290,7 +290,7 @@ public function testExecuteWithGoodCouponAndNoItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -344,7 +344,7 @@ public function testExecuteWithBadCouponAndItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You canceled the coupon code.')
             ->willReturnSelf();
 
@@ -386,7 +386,7 @@ public function testExecuteWithBadCouponAndNoItems()
             ->willReturn($coupon);
 
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
diff --git a/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php
@@ -40,7 +40,7 @@ public function testLoadCustomerQuoteThrowingCoreException()
         $this->checkoutSession->expects($this->once())->method('loadCustomerQuote')->willThrowException(
             new \Magento\Framework\Exception\LocalizedException(__('Message'))
         );
-        $this->messageManager->expects($this->once())->method('addError')->with('Message');
+        $this->messageManager->expects($this->once())->method('addErrorMessage')->with('Message');
 
         $observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
             ->disableOriginalConstructor()
@@ -55,7 +55,7 @@ public function testLoadCustomerQuoteThrowingException()
         $this->checkoutSession->expects($this->once())->method('loadCustomerQuote')->will(
             $this->throwException($exception)
         );
-        $this->messageManager->expects($this->once())->method('addException')
+        $this->messageManager->expects($this->once())->method('addExceptionMessage')
             ->with($exception, 'Load customer quote error');
 
         $observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
@@ -32,7 +32,7 @@ public function testExecute()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
@@ -91,7 +91,7 @@ public function testExecuteForConfigurableLastOption()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function _prepareLayout()`
`84`	`84`	`protected function validateMinimumAmount()`
`85`	`85`	`{`
`86`	`86`	`if (!$this->cartHelper->getQuote()->validateMinimumAmount()) {`
`87`		`- $this->messageManager->addNotice($this->getMinimumAmountErrorMessage()->getMessage());`
	`87`	`+ $this->messageManager->addNoticeMessage($this->getMinimumAmountErrorMessage()->getMessage());`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function _preDispatchValidateCustomer($redirect = true, $addErrors = t`
`70`	`70`	`if (!$validationResult->isValid()) {`
`71`	`71`	`if ($addErrors) {`
`72`	`72`	`foreach ($validationResult->getMessages() as $error) {`
`73`		`- $this->messageManager->addError($error);`
	`73`	`+ $this->messageManager->addErrorMessage($error);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`if ($redirect) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function execute()`
`24`	`24`	`try {`
`25`	`25`	`$this->cart->removeItem($id)->save();`
`26`	`26`	`} catch (\Exception $e) {`
`27`		`- $this->messageManager->addError(__('We can\'t remove the item.'));`
	`27`	`+ $this->messageManager->addErrorMessage(__('We can\'t remove the item.'));`
`28`	`28`	`$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,17 +67,17 @@ public function execute()`
`67`	`67`	`$this->_objectManager->get(\Magento\Framework\Escaper::class)`
`68`	`68`	`->escapeHtml($item->getProduct()->getName())`
`69`	`69`	`);`
`70`		`- $this->messageManager->addSuccess($message);`
	`70`	`+ $this->messageManager->addSuccessMessage($message);`
`71`	`71`	`}`
`72`	`72`	`return $this->_goBack($this->_url->getUrl('checkout/cart'));`
`73`	`73`	`}`
`74`	`74`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`75`	`75`	`if ($this->_checkoutSession->getUseNotice(true)) {`
`76`		`- $this->messageManager->addNotice($e->getMessage());`
	`76`	`+ $this->messageManager->addNoticeMessage($e->getMessage());`
`77`	`77`	`} else {`
`78`	`78`	`$messages = array_unique(explode("\n", $e->getMessage()));`
`79`	`79`	`foreach ($messages as $message) {`
`80`		`- $this->messageManager->addError($message);`
	`80`	`+ $this->messageManager->addErrorMessage($message);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -89,7 +89,7 @@ public function execute()`
`89`	`89`	`return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));`
`90`	`90`	`}`
`91`	`91`	`} catch (\Exception $e) {`
`92`		`- $this->messageManager->addException($e, __('We can\'t update the item right now.'));`
	`92`	`+ $this->messageManager->addExceptionMessage($e, __('We can\'t update the item right now.'));`
`93`	`93`	`$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);`
`94`	`94`	`return $this->_goBack();`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ protected function _emptyShoppingCart()`
`18`	`18`	`try {`
`19`	`19`	`$this->cart->truncate()->save();`
`20`	`20`	`} catch (\Magento\Framework\Exception\LocalizedException $exception) {`
`21`		`- $this->messageManager->addError($exception->getMessage());`
	`21`	`+ $this->messageManager->addErrorMessage($exception->getMessage());`
`22`	`22`	`} catch (\Exception $exception) {`
`23`		`- $this->messageManager->addException($exception, __('We can\'t update the shopping cart.'));`
	`23`	`+ $this->messageManager->addExceptionMessage($exception, __('We can\'t update the shopping cart.'));`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`@@ -52,11 +52,11 @@ protected function _updateShoppingCart()`
`52`	`52`	`$this->cart->updateItems($cartData)->save();`
`53`	`53`	`}`
`54`	`54`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`55`		`- $this->messageManager->addError(`
	`55`	`+ $this->messageManager->addErrorMessage(`
`56`	`56`	`$this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($e->getMessage())`
`57`	`57`	`);`
`58`	`58`	`} catch (\Exception $e) {`
`59`		`- $this->messageManager->addException($e, __('We can\'t update the shopping cart.'));`
	`59`	`+ $this->messageManager->addExceptionMessage($e, __('We can\'t update the shopping cart.'));`
`60`	`60`	`$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function execute()`
`18`	`18`	`/** @var \Magento\Checkout\Helper\Data $checkoutHelper */`
`19`	`19`	`$checkoutHelper = $this->_objectManager->get(\Magento\Checkout\Helper\Data::class);`
`20`	`20`	`if (!$checkoutHelper->canOnepageCheckout()) {`
`21`		`- $this->messageManager->addError(__('One-page checkout is turned off.'));`
	`21`	`+ $this->messageManager->addErrorMessage(__('One-page checkout is turned off.'));`
`22`	`22`	`return $this->resultRedirectFactory->create()->setPath('checkout/cart');`
`23`	`23`	`}`
`24`	`24`
`@@ -28,7 +28,7 @@ public function execute()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (!$this->_customerSession->isLoggedIn() && !$checkoutHelper->isAllowedGuestCheckout($quote)) {`
`31`		`- $this->messageManager->addError(__('Guest checkout is disabled.'));`
	`31`	`+ $this->messageManager->addErrorMessage(__('Guest checkout is disabled.'));`
`32`	`32`	`return $this->resultRedirectFactory->create()->setPath('checkout/cart');`
`33`	`33`	`}`
`34`	`34`