Fixed deprecated method usages of MessageManager

drpayyne · drpayyne · commit c11c47609294 · 2019-10-25T06:11:43.000+05:30
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -186,7 +186,7 @@ public function execute()
                     'You added %1 to your shopping cart.',
                     $this->escaper->escapeHtml($item->getProduct()->getName())
                 );
-                $this->messageManager->addSuccess($message);
+                $this->messageManager->addSuccessMessage($message);
             }
 
             if ($this->cartHelper->getShouldRedirectToCart()) {
@@ -214,7 +214,7 @@ public function execute()
             $resultJson->setData(['backUrl' => $redirectUrl]);
             return $resultJson;
         }
-        
+
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;
     }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -102,11 +102,11 @@ public function execute()
 
             return $resultPage;
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('*');
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t configure the product right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t configure the product right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             $resultRedirect->setPath('*');
             return $resultRedirect;
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -88,11 +88,11 @@ public function execute()
                 ]
             );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 __('We can\'t delete the item from Wish List right now because of an error: %1.', $e->getMessage())
             );
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t delete the item from the Wish List right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t delete the item from the Wish List right now.'));
         }
 
         $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -219,7 +219,7 @@ public function execute()
         }
 
         if ($error) {
-            $this->messageManager->addError($error);
+            $this->messageManager->addErrorMessage($error);
             $this->wishlistSession->setSharingForm($this->getRequest()->getPostValue());
             $resultRedirect->setPath('*/*/share');
             return $resultRedirect;
@@ -285,12 +285,12 @@ public function execute()
             $this->inlineTranslation->resume();
 
             $this->_eventManager->dispatch('wishlist_share', ['wishlist' => $wishlist]);
-            $this->messageManager->addSuccess(__('Your wish list has been shared.'));
+            $this->messageManager->addSuccessMessage(__('Your wish list has been shared.'));
             $resultRedirect->setPath('*/*', ['wishlist_id' => $wishlist->getId()]);
             return $resultRedirect;
         } catch (\Exception $e) {
             $this->inlineTranslation->resume();
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->wishlistSession->setSharingForm($this->getRequest()->getPostValue());
             $resultRedirect->setPath('*/*/share');
             return $resultRedirect;
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -103,7 +103,7 @@ public function execute()
                         $item->delete();
                     } catch (\Exception $e) {
                         $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                        $this->messageManager->addError(__('We can\'t delete item from Wish List right now.'));
+                        $this->messageManager->addErrorMessage(__('We can\'t delete item from Wish List right now.'));
                     }
                 }
 
@@ -118,7 +118,7 @@ public function execute()
                     );
                     $updatedItems++;
                 } catch (\Exception $e) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         __(
                             'Can\'t save description %1',
                             $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($description)
@@ -133,7 +133,7 @@ public function execute()
                     $wishlist->save();
                     $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
                 } catch (\Exception $e) {
-                    $this->messageManager->addError(__('Can\'t update wish list'));
+                    $this->messageManager->addErrorMessage(__('Can\'t update wish list'));
                 }
             }
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -85,7 +85,7 @@ public function execute()
         }
 
         if (!$product || !$product->isVisibleInCatalog()) {
-            $this->messageManager->addError(__('We can\'t specify a product.'));
+            $this->messageManager->addErrorMessage(__('We can\'t specify a product.'));
             $resultRedirect->setPath('*/');
             return $resultRedirect;
         }
@@ -114,11 +114,11 @@ public function execute()
             $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
 
             $message = __('%1 has been updated in your Wish List.', $product->getName());
-            $this->messageManager->addSuccess($message);
+            $this->messageManager->addSuccessMessage($message);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t update your Wish List right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t update your Wish List right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
         $resultRedirect->setPath('*/*', ['wishlist_id' => $wishlist->getId()]);
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -103,19 +103,19 @@ public function execute()
                     'You added %1 to your shopping cart.',
                     $this->escaper->escapeHtml($item->getProduct()->getName())
                 );
-                $this->messageManager->addSuccess($message);
+                $this->messageManager->addSuccessMessage($message);
             }
 
             if ($this->cartHelper->getShouldRedirectToCart()) {
                 $redirectUrl = $this->cartHelper->getCartUrl();
             }
         } catch (ProductException $e) {
-            $this->messageManager->addError(__('This product(s) is out of stock.'));
+            $this->messageManager->addErrorMessage(__('This product(s) is out of stock.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addNotice($e->getMessage());
+            $this->messageManager->addNoticeMessage($e->getMessage());
             $redirectUrl = $item->getProductUrl();
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t add the item to the cart right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
         }
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Wishlist/Controller/WishlistProvider.php b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
@@ -85,10 +85,10 @@ public function getWishlist($wishlistId = null)
                 );
             }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             return false;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t create the Wish List right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t create the Wish List right now.'));
             return false;
         }
         $this->wishlist = $wishlist;
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -182,7 +182,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
 
         if ($messages) {
             foreach ($messages as $message) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
             $redirectUrl = $indexUrl;
         }
@@ -192,7 +192,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
             try {
                 $wishlist->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t update the Wish List right now.'));
+                $this->messageManager->addErrorMessage(__('We can\'t update the Wish List right now.'));
                 $redirectUrl = $indexUrl;
             }
 
@@ -202,7 +202,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
                 $products[] = '"' . $product->getName() . '"';
             }
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('%1 product(s) have been added to shopping cart: %2.', count($addedProducts), join(', ', $products))
             );
 
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -105,7 +105,7 @@ public function execute(Observer $observer)
             $this->checkoutSession->setWishlistPendingUrls($urls);
             $this->checkoutSession->setWishlistPendingMessages($messages);
 
-            $this->messageManager->addError($message);
+            $this->messageManager->addErrorMessage($message);
 
             $observer->getEvent()->getResponse()->setRedirect($url);
             $this->checkoutSession->setNoCartRedirect(true);
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
@@ -172,7 +172,7 @@ protected function setUp()
 
         $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->getMockForAbstractClass();
 
         $this->urlMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
@@ -566,7 +566,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
             ->willReturn($productName);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You added '  . $productName . ' to your shopping cart.', null)
             ->willReturnSelf();
 
@@ -581,7 +581,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
         $this->helperMock->expects($this->once())
             ->method('calculate')
             ->willReturnSelf();
-        
+
         return $refererUrl;
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -244,7 +244,7 @@ public function testExecuteWithoutWishlist()
             ->method('create')
             ->with(\Magento\Wishlist\Model\Item::class)
             ->willReturn($item);
-        
+
         $this->wishlistProvider
             ->expects($this->once())
             ->method('getWishlist')
@@ -273,7 +273,7 @@ public function testExecuteCanNotSaveWishlist()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t delete the item from Wish List right now because of an error: Message.')
             ->willReturn(true);
 
@@ -356,7 +356,7 @@ public function testExecuteCanNotSaveWishlistAndWithRedirect()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t delete the item from the Wish List right now.')
             ->willReturn(true);
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
@@ -249,7 +249,7 @@ public function testExecuteWithoutProduct()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t specify a product.')
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
@@ -294,7 +294,7 @@ public function testExecuteWithoutWishList()
 
         $this->messageManager
             ->expects($this->never())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t specify a product.')
             ->willReturn(true);
 
@@ -433,12 +433,12 @@ public function testExecuteAddSuccessException()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('Test name has been updated in your Wish List.', null)
             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('error-message')));
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('error-message', null)
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
@@ -572,12 +572,12 @@ public function testExecuteAddSuccessCriticalException()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('Test name has been updated in your Wish List.', null)
             ->willThrowException($exception);
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t update your Wish List right now.', null)
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -266,7 +266,7 @@ public function testExecute(
 
         $successMessage = __('You added %1 to your shopping cart.', $productName);
         $this->messageManager->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($successMessage)
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php
@@ -228,7 +228,7 @@ public function testMoveAllToCart()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('%1 product(s) have been added to shopping cart: %2.', 1, '"' . $productTwoName . '"'), null)
             ->willReturnSelf();
 
@@ -431,12 +431,12 @@ public function testMoveAllToCartWithNotSalableAndOptions()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->at(0))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('%1 for "%2".', 'Localized Exception', $productTwoName), null)
             ->willReturnSelf();
 
         $this->managerMock->expects($this->at(1))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(
                 __(
                     'We couldn\'t add the following product(s) to the shopping cart: %1.',
@@ -580,7 +580,7 @@ public function testMoveAllToCartWithException()
             ->with($exception, []);
 
         $this->managerMock->expects($this->at(0))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t add this item to your shopping cart right now.'), null)
             ->willReturnSelf();
 
@@ -603,7 +603,7 @@ public function testMoveAllToCartWithException()
             ->willThrowException(new \Exception());
 
         $this->managerMock->expects($this->at(1))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t update the Wish List right now.'), null)
             ->willReturnSelf();
 
@@ -615,7 +615,7 @@ public function testMoveAllToCartWithException()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('%1 product(s) have been added to shopping cart: %2.', 1, '"' . $productOneName . '"'), null)
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
@@ -167,7 +167,7 @@ public function testExecute()
             ->with([])
             ->willReturnSelf();
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with($message)
             ->willReturnSelf();
         $event->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public function execute()`
`186`	`186`	`'You added %1 to your shopping cart.',`
`187`	`187`	`$this->escaper->escapeHtml($item->getProduct()->getName())`
`188`	`188`	`);`
`189`		`- $this->messageManager->addSuccess($message);`
	`189`	`+ $this->messageManager->addSuccessMessage($message);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`if ($this->cartHelper->getShouldRedirectToCart()) {`
`@@ -214,7 +214,7 @@ public function execute()`
`214`	`214`	`$resultJson->setData(['backUrl' => $redirectUrl]);`
`215`	`215`	`return $resultJson;`
`216`	`216`	`}`
`217`		`-`
	`217`	`+`
`218`	`218`	`$resultRedirect->setUrl($redirectUrl);`
`219`	`219`	`return $resultRedirect;`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ public function execute()`
`88`	`88`	`]`
`89`	`89`	`);`
`90`	`90`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`91`		`- $this->messageManager->addError(`
	`91`	`+ $this->messageManager->addErrorMessage(`
`92`	`92`	`__('We can\'t delete the item from Wish List right now because of an error: %1.', $e->getMessage())`
`93`	`93`	`);`
`94`	`94`	`} catch (\Exception $e) {`
`95`		`- $this->messageManager->addError(__('We can\'t delete the item from the Wish List right now.'));`
	`95`	`+ $this->messageManager->addErrorMessage(__('We can\'t delete the item from the Wish List right now.'));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`$this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function execute()`
`103`	`103`	`$item->delete();`
`104`	`104`	`} catch (\Exception $e) {`
`105`	`105`	`$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);`
`106`		`- $this->messageManager->addError(__('We can\'t delete item from Wish List right now.'));`
	`106`	`+ $this->messageManager->addErrorMessage(__('We can\'t delete item from Wish List right now.'));`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -118,7 +118,7 @@ public function execute()`
`118`	`118`	`);`
`119`	`119`	`$updatedItems++;`
`120`	`120`	`} catch (\Exception $e) {`
`121`		`- $this->messageManager->addError(`
	`121`	`+ $this->messageManager->addErrorMessage(`
`122`	`122`	`__(`
`123`	`123`	`'Can\'t save description %1',`
`124`	`124`	`$this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($description)`
`@@ -133,7 +133,7 @@ public function execute()`
`133`	`133`	`$wishlist->save();`
`134`	`134`	`$this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();`
`135`	`135`	`} catch (\Exception $e) {`
`136`		`- $this->messageManager->addError(__('Can\'t update wish list'));`
	`136`	`+ $this->messageManager->addErrorMessage(__('Can\'t update wish list'));`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ public function getWishlist($wishlistId = null)`
`85`	`85`	`);`
`86`	`86`	`}`
`87`	`87`	`} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {`
`88`		`- $this->messageManager->addError($e->getMessage());`
	`88`	`+ $this->messageManager->addErrorMessage($e->getMessage());`
`89`	`89`	`return false;`
`90`	`90`	`} catch (\Exception $e) {`
`91`		`- $this->messageManager->addException($e, __('We can\'t create the Wish List right now.'));`
	`91`	`+ $this->messageManager->addExceptionMessage($e, __('We can\'t create the Wish List right now.'));`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`	`$this->wishlist = $wishlist;`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)`
`182`	`182`
`183`	`183`	`if ($messages) {`
`184`	`184`	`foreach ($messages as $message) {`
`185`		`- $this->messageManager->addError($message);`
	`185`	`+ $this->messageManager->addErrorMessage($message);`
`186`	`186`	`}`
`187`	`187`	`$redirectUrl = $indexUrl;`
`188`	`188`	`}`
`@@ -192,7 +192,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)`
`192`	`192`	`try {`
`193`	`193`	`$wishlist->save();`
`194`	`194`	`} catch (\Exception $e) {`
`195`		`- $this->messageManager->addError(__('We can\'t update the Wish List right now.'));`
	`195`	`+ $this->messageManager->addErrorMessage(__('We can\'t update the Wish List right now.'));`
`196`	`196`	`$redirectUrl = $indexUrl;`
`197`	`197`	`}`
`198`	`198`
`@@ -202,7 +202,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)`
`202`	`202`	`$products[] = '"' . $product->getName() . '"';`
`203`	`203`	`}`
`204`	`204`
`205`		`- $this->messageManager->addSuccess(`
	`205`	`+ $this->messageManager->addSuccessMessage(`
`206`	`206`	`__('%1 product(s) have been added to shopping cart: %2.', count($addedProducts), join(', ', $products))`
`207`	`207`	`);`
`208`	`208`