ENGCOM-6175: Fixed deprecated method usages of MessageManager #25264

VladimirZaets · web-flow · commit 2baad7a2f45c · 2019-10-30T10:04:00.000-05:00
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
@@ -33,17 +33,17 @@ public function execute()
         try {
             $this->getModel()->aggregate()->delete();
 
-            $this->messageManager->addSuccess(__('The review has been deleted.'));
+            $this->messageManager->addSuccessMessage(__('The review has been deleted.'));
             if ($this->getRequest()->getParam('ret') == 'pending') {
                 $resultRedirect->setPath('review/*/pending');
             } else {
                 $resultRedirect->setPath('review/*/');
             }
             return $resultRedirect;
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong  deleting this review.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong  deleting this review.'));
         }
 
         return $resultRedirect->setPath('review/*/edit/', ['id' => $reviewId]);
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -59,19 +59,19 @@ public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 foreach ($this->getCollection() as $model) {
                     $model->delete();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been deleted.', count($reviewsIds))
                 );
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while deleting these records.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while deleting these records.'));
             }
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -59,20 +59,20 @@ public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 $status = $this->getRequest()->getParam('status');
                 foreach ($this->getCollection() as $model) {
                     $model->setStatusId($status)->save()->aggregate();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been updated.', count($reviewsIds))
                 );
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while updating these review(s).')
                 );
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
@@ -5,20 +5,27 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
 
-class MassVisibleIn extends ProductController
+/**
+ * Class MassVisibleIn
+ */
+class MassVisibleIn extends ProductController implements HttpPostActionInterface
 {
+
     /**
+     * Execute action
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 $stores = $this->getRequest()->getParam('stores');
@@ -27,13 +34,13 @@ public function execute()
                     $model->setSelectStores($stores);
                     $model->save();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been updated.', count($reviewsIds))
                 );
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while updating these review(s).')
                 );
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -56,17 +56,17 @@ public function execute()
 
                 $review->aggregate();
 
-                $this->messageManager->addSuccess(__('You saved the review.'));
+                $this->messageManager->addSuccessMessage(__('You saved the review.'));
                 if ($this->getRequest()->getParam('ret') == 'pending') {
                     $resultRedirect->setPath('review/*/pending');
                 } else {
                     $resultRedirect->setPath('review/*/');
                 }
                 return $resultRedirect;
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while saving this review.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving this review.'));
             }
         }
         $resultRedirect->setPath('review/*/');
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -34,7 +34,7 @@ public function execute()
         if (($data = $this->getRequest()->getPostValue()) && ($reviewId = $this->getRequest()->getParam('id'))) {
             $review = $this->getModel();
             if (!$review->getId()) {
-                $this->messageManager->addError(__('The review was removed by another user or does not exist.'));
+                $this->messageManager->addErrorMessage(__('The review was removed by another user or does not exist.'));
             } else {
                 try {
                     $review->addData($data)->save();
@@ -63,11 +63,11 @@ public function execute()
 
                     $review->aggregate();
 
-                    $this->messageManager->addSuccess(__('You saved the review.'));
+                    $this->messageManager->addSuccessMessage(__('You saved the review.'));
                 } catch (LocalizedException $e) {
-                    $this->messageManager->addError($e->getMessage());
+                    $this->messageManager->addErrorMessage($e->getMessage());
                 } catch (\Exception $e) {
-                    $this->messageManager->addException($e, __('Something went wrong while saving this review.'));
+                    $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving this review.'));
                 }
             }
 
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -9,9 +9,14 @@
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Class Delete
+ */
 class Delete extends RatingController implements HttpPostActionInterface
 {
     /**
+     * Delete action
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -23,9 +28,9 @@ public function execute()
                 /** @var \Magento\Review\Model\Rating $model */
                 $model = $this->_objectManager->create(\Magento\Review\Model\Rating::class);
                 $model->load($this->getRequest()->getParam('id'))->delete();
-                $this->messageManager->addSuccess(__('You deleted the rating.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rating.'));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $resultRedirect->setPath('review/rating/edit', ['id' => $this->getRequest()->getParam('id')]);
                 return $resultRedirect;
             }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -9,6 +9,9 @@
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Class Save
+ */
 class Save extends RatingController implements HttpPostActionInterface
 {
     /**
@@ -58,10 +61,10 @@ public function execute()
                     }
                 }
 
-                $this->messageManager->addSuccess(__('You saved the rating.'));
+                $this->messageManager->addSuccessMessage(__('You saved the rating.'));
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setRatingData(false);
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)
                     ->setRatingData($this->getRequest()->getPostValue());
                 $resultRedirect->setPath('review/rating/edit', ['id' => $this->getRequest()->getParam('id')]);
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Review\Model\Review;
 
+/**
+ * Class Post
+ */
 class Post extends ProductController implements HttpPostActionInterface
 {
     /**
@@ -63,19 +66,19 @@ public function execute()
                     }
 
                     $review->aggregate();
-                    $this->messageManager->addSuccess(__('You submitted your review for moderation.'));
+                    $this->messageManager->addSuccessMessage(__('You submitted your review for moderation.'));
                 } catch (\Exception $e) {
                     $this->reviewSession->setFormData($data);
-                    $this->messageManager->addError(__('We can\'t post your review right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));
                 }
             } else {
                 $this->reviewSession->setFormData($data);
                 if (is_array($validate)) {
                     foreach ($validate as $errorMessage) {
-                        $this->messageManager->addError($errorMessage);
+                        $this->messageManager->addErrorMessage($errorMessage);
                     }
                 } else {
-                    $this->messageManager->addError(__('We can\'t post your review right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));
                 }
             }
         }
diff --git a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
@@ -299,7 +299,7 @@ public function testExecute()
             ->willReturnSelf();
         $this->review->expects($this->once())->method('aggregate')
             ->willReturnSelf();
-        $this->messageManager->expects($this->once())->method('addSuccess')
+        $this->messageManager->expects($this->once())->method('addSuccessMessage')
             ->with(__('You submitted your review for moderation.'))
             ->willReturnSelf();
         $this->reviewSession->expects($this->once())->method('getRedirectUrl')

Original file line number	Diff line number	Diff line change
`@@ -59,19 +59,19 @@ public function execute()`
`59`	`59`	`{`
`60`	`60`	`$reviewsIds = $this->getRequest()->getParam('reviews');`
`61`	`61`	`if (!is_array($reviewsIds)) {`
`62`		`- $this->messageManager->addError(__('Please select review(s).'));`
	`62`	`+ $this->messageManager->addErrorMessage(__('Please select review(s).'));`
`63`	`63`	`} else {`
`64`	`64`	`try {`
`65`	`65`	`foreach ($this->getCollection() as $model) {`
`66`	`66`	`$model->delete();`
`67`	`67`	`}`
`68`		`- $this->messageManager->addSuccess(`
	`68`	`+ $this->messageManager->addSuccessMessage(`
`69`	`69`	`__('A total of %1 record(s) have been deleted.', count($reviewsIds))`
`70`	`70`	`);`
`71`	`71`	`} catch (LocalizedException $e) {`
`72`		`- $this->messageManager->addError($e->getMessage());`
	`72`	`+ $this->messageManager->addErrorMessage($e->getMessage());`
`73`	`73`	`} catch (\Exception $e) {`
`74`		`- $this->messageManager->addException($e, __('Something went wrong while deleting these records.'));`
	`74`	`+ $this->messageManager->addExceptionMessage($e, __('Something went wrong while deleting these records.'));`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */`
Original file line number	Diff line number	Diff line change
`@@ -56,17 +56,17 @@ public function execute()`
`56`	`56`
`57`	`57`	`$review->aggregate();`
`58`	`58`
`59`		`- $this->messageManager->addSuccess(__('You saved the review.'));`
	`59`	`+ $this->messageManager->addSuccessMessage(__('You saved the review.'));`
`60`	`60`	`if ($this->getRequest()->getParam('ret') == 'pending') {`
`61`	`61`	`$resultRedirect->setPath('review/*/pending');`
`62`	`62`	`} else {`
`63`	`63`	`$resultRedirect->setPath('review/*/');`
`64`	`64`	`}`
`65`	`65`	`return $resultRedirect;`
`66`	`66`	`} catch (LocalizedException $e) {`
`67`		`- $this->messageManager->addError($e->getMessage());`
	`67`	`+ $this->messageManager->addErrorMessage($e->getMessage());`
`68`	`68`	`} catch (\Exception $e) {`
`69`		`- $this->messageManager->addException($e, __('Something went wrong while saving this review.'));`
	`69`	`+ $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving this review.'));`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`$resultRedirect->setPath('review/*/');`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`use Magento\Framework\Controller\ResultFactory;`
`11`	`11`	`use Magento\Review\Model\Review;`
`12`	`12`
	`13`	`+/**`
	`14`	`+ * Class Post`
	`15`	`+ */`
`13`	`16`	`class Post extends ProductController implements HttpPostActionInterface`
`14`	`17`	`{`
`15`	`18`	`/**`
`@@ -63,19 +66,19 @@ public function execute()`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`$review->aggregate();`
`66`		`- $this->messageManager->addSuccess(__('You submitted your review for moderation.'));`
	`69`	`+ $this->messageManager->addSuccessMessage(__('You submitted your review for moderation.'));`
`67`	`70`	`} catch (\Exception $e) {`
`68`	`71`	`$this->reviewSession->setFormData($data);`
`69`		`- $this->messageManager->addError(__('We can\'t post your review right now.'));`
	`72`	`+ $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));`
`70`	`73`	`}`
`71`	`74`	`} else {`
`72`	`75`	`$this->reviewSession->setFormData($data);`
`73`	`76`	`if (is_array($validate)) {`
`74`	`77`	`foreach ($validate as $errorMessage) {`
`75`		`- $this->messageManager->addError($errorMessage);`
	`78`	`+ $this->messageManager->addErrorMessage($errorMessage);`
`76`	`79`	`}`
`77`	`80`	`} else {`
`78`		`- $this->messageManager->addError(__('We can\'t post your review right now.'));`
	`81`	`+ $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));`
`79`	`82`	`}`
`80`	`83`	`}`
`81`	`84`	`}`