ENGCOM-1066: magento/magento2: Updating deprecated message manager methods #14341

Stanislav Idolov · web-flow · commit 488a94e2ce2f · 2018-03-27T15:49:29.000+03:00
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
@@ -28,11 +28,11 @@ public function execute()
                 )->markAsRead(
                     $notificationId
                 );
-                $this->messageManager->addSuccess(__('The message has been marked as Read.'));
+                $this->messageManager->addSuccessMessage(__('The message has been marked as Read.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,13 +32,13 @@ public function execute()
                         $model->setIsRead(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been marked as Read.', count($ids))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,11 +32,14 @@ public function execute()
                         $model->setIsRemove(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
+                $this->messageManager->addSuccessMessage(__('Total of %1 record(s) have been removed.', count($ids)));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __("We couldn't remove the messages because of an error.")
+                );
             }
         }
         $this->_redirect('adminhtml/*/');
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
@@ -31,11 +31,14 @@ public function execute()
 
             try {
                 $model->setIsRemove(1)->save();
-                $this->messageManager->addSuccess(__('The message has been removed.'));
+                $this->messageManager->addSuccessMessage(__('The message has been removed.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __("We couldn't remove the messages because of an error.")
+                );
             }
 
             $this->_redirect('adminhtml/*/');

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function execute()`
`23`	`23`	`{`
`24`	`24`	`$ids = $this->getRequest()->getParam('notification');`
`25`	`25`	`if (!is_array($ids)) {`
`26`		`- $this->messageManager->addError(__('Please select messages.'));`
	`26`	`+ $this->messageManager->addErrorMessage(__('Please select messages.'));`
`27`	`27`	`} else {`
`28`	`28`	`try {`
`29`	`29`	`foreach ($ids as $id) {`
`@@ -32,11 +32,14 @@ public function execute()`
`32`	`32`	`$model->setIsRemove(1)->save();`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`- $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));`
	`35`	`+ $this->messageManager->addSuccessMessage(__('Total of %1 record(s) have been removed.', count($ids)));`
`36`	`36`	`} catch (\Magento\Framework\Exception\LocalizedException $e) {`
`37`		`- $this->messageManager->addError($e->getMessage());`
	`37`	`+ $this->messageManager->addErrorMessage($e->getMessage());`
`38`	`38`	`} catch (\Exception $e) {`
`39`		`- $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));`
	`39`	`+ $this->messageManager->addExceptionMessage(`
	`40`	`+ $e,`
	`41`	`+ __("We couldn't remove the messages because of an error.")`
	`42`	`+ );`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`	`$this->_redirect('adminhtml/*/');`