Skip to content

Commit 25d2ffb

Browse files
author
Stanislav Idolov
authored
ENGCOM-2504: [Up Port] Replacing Usage of Deprecated Methods for Message Manager. #16925 
2 parents bfe7fe6 + 9663e8d commit 25d2ffb

File tree

15 files changed

+34
-31
lines changed

15 files changed

+34
-31
lines changed

‎app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public function execute()
4444
$this->_eventManager->dispatch('catalog_controller_category_delete', ['category' => $category]);
4545
$this->_auth->getAuthStorage()->setDeletedPath($category->getPath());
4646
$this->categoryRepository->delete($category);
47-
$this->messageManager->addSuccess(__('You deleted the category.'));
47+
$this->messageManager->addSuccessMessage(__('You deleted the category.'));
4848
} catch (\Magento\Framework\Exception\LocalizedException $e) {
49-
$this->messageManager->addError($e->getMessage());
49+
$this->messageManager->addErrorMessage($e->getMessage());
5050
return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
5151
} catch (\Exception $e) {
52-
$this->messageManager->addError(__('Something went wrong while trying to delete the category.'));
52+
$this->messageManager->addErrorMessage(__('Something went wrong while trying to delete the category.'));
5353
return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
5454
}
5555
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function _validateProducts()
5454
}
5555

5656
if ($error) {
57-
$this->messageManager->addError($error);
57+
$this->messageManager->addErrorMessage($error);
5858
}
5959

6060
return !$error;

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function execute()
192192
$this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
193193
}
194194

195-
$this->messageManager->addSuccess(
195+
$this->messageManager->addSuccessMessage(
196196
__('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
197197
);
198198

@@ -205,9 +205,9 @@ public function execute()
205205
$this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
206206
}
207207
} catch (\Magento\Framework\Exception\LocalizedException $e) {
208-
$this->messageManager->addError($e->getMessage());
208+
$this->messageManager->addErrorMessage($e->getMessage());
209209
} catch (\Exception $e) {
210-
$this->messageManager->addException(
210+
$this->messageManager->addExceptionMessage(
211211
$e,
212212
__('Something went wrong while updating the product(s) attributes.')
213213
);

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Validate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function execute()
6868
$response->setError(true);
6969
$response->setMessage($e->getMessage());
7070
} catch (\Exception $e) {
71-
$this->messageManager->addException(
71+
$this->messageManager->addExceptionMessage(
7272
$e,
7373
__('Something went wrong while updating the product(s) attributes.')
7474
);

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ public function execute()
2121
// entity type check
2222
$model->load($id);
2323
if ($model->getEntityTypeId() != $this->_entityTypeId) {
24-
$this->messageManager->addError(__('We can\'t delete the attribute.'));
24+
$this->messageManager->addErrorMessage(__('We can\'t delete the attribute.'));
2525
return $resultRedirect->setPath('catalog/*/');
2626
}
2727

2828
try {
2929
$model->delete();
30-
$this->messageManager->addSuccess(__('You deleted the product attribute.'));
30+
$this->messageManager->addSuccessMessage(__('You deleted the product attribute.'));
3131
return $resultRedirect->setPath('catalog/*/');
3232
} catch (\Exception $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
return $resultRedirect->setPath(
3535
'catalog/*/edit',
3636
['attribute_id' => $this->getRequest()->getParam('attribute_id')]
3737
);
3838
}
3939
}
40-
$this->messageManager->addError(__('We can\'t find an attribute to delete.'));
40+
$this->messageManager->addErrorMessage(__('We can\'t find an attribute to delete.'));
4141
return $resultRedirect->setPath('catalog/*/');
4242
}
4343
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ public function execute()
2525
$model->load($id);
2626

2727
if (!$model->getId()) {
28-
$this->messageManager->addError(__('This attribute no longer exists.'));
28+
$this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
2929
$resultRedirect = $this->resultRedirectFactory->create();
3030
return $resultRedirect->setPath('catalog/*/');
3131
}
3232

3333
// entity type check
3434
if ($model->getEntityTypeId() != $this->_entityTypeId) {
35-
$this->messageManager->addError(__('This attribute cannot be edited.'));
35+
$this->messageManager->addErrorMessage(__('This attribute cannot be edited.'));
3636
$resultRedirect = $this->resultRedirectFactory->create();
3737
return $resultRedirect->setPath('catalog/*/');
3838
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public function execute()
4343
$product = $this->productBuilder->build($this->getRequest());
4444
try {
4545
$newProduct = $this->productCopier->copy($product);
46-
$this->messageManager->addSuccess(__('You duplicated the product.'));
46+
$this->messageManager->addSuccessMessage(__('You duplicated the product.'));
4747
$resultRedirect->setPath('catalog/*/edit', ['_current' => true, 'id' => $newProduct->getId()]);
4848
} catch (\Exception $e) {
4949
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
50-
$this->messageManager->addError($e->getMessage());
50+
$this->messageManager->addErrorMessage($e->getMessage());
5151
$resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
5252
}
5353
return $resultRedirect;

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public function execute()
5252
if (($productId && !$product->getEntityId())) {
5353
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
5454
$resultRedirect = $this->resultRedirectFactory->create();
55-
$this->messageManager->addError(__('This product doesn\'t exist.'));
55+
$this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));
5656
return $resultRedirect->setPath('catalog/*/');
5757
} elseif ($productId === 0) {
5858
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
5959
$resultRedirect = $this->resultRedirectFactory->create();
60-
$this->messageManager->addError(__('Invalid product id. Should be numeric value greater than 0'));
60+
$this->messageManager->addErrorMessage(__('Invalid product id. Should be numeric value greater than 0'));
6161
return $resultRedirect->setPath('catalog/*/');
6262
}
6363

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Group/Save.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public function execute()
2929
);
3030

3131
if ($model->itemExists()) {
32-
$this->messageManager->addError(__('A group with the same name already exists.'));
32+
$this->messageManager->addErrorMessage(__('A group with the same name already exists.'));
3333
} else {
3434
try {
3535
$model->save();
3636
} catch (\Exception $e) {
37-
$this->messageManager->addError(__('Something went wrong while saving this group.'));
37+
$this->messageManager->addErrorMessage(__('Something went wrong while saving this group.'));
3838
}
3939
}
4040
}

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public function execute()
3636
$resultRedirect = $this->resultRedirectFactory->create();
3737
try {
3838
$this->attributeSetRepository->deleteById($setId);
39-
$this->messageManager->addSuccess(__('The attribute set has been removed.'));
39+
$this->messageManager->addSuccessMessage(__('The attribute set has been removed.'));
4040
$resultRedirect->setPath('catalog/*/');
4141
} catch (\Exception $e) {
42-
$this->messageManager->addError(__('We can\'t delete this set right now.'));
42+
$this->messageManager->addErrorMessage(__('We can\'t delete this set right now.'));
4343
$resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
4444
}
4545
return $resultRedirect;

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ public function execute()
127127
$model->initFromSkeleton($this->getRequest()->getParam('skeleton_set'));
128128
}
129129
$model->save();
130-
$this->messageManager->addSuccess(__('You saved the attribute set.'));
130+
$this->messageManager->addSuccessMessage(__('You saved the attribute set.'));
131131
} catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
132132
$this->messageManager->addErrorMessage($e->getMessage());
133133
$hasError = true;
134134
} catch (\Magento\Framework\Exception\LocalizedException $e) {
135-
$this->messageManager->addError($e->getMessage());
135+
$this->messageManager->addErrorMessage($e->getMessage());
136136
$hasError = true;
137137
} catch (\Exception $e) {
138-
$this->messageManager->addException($e, __('Something went wrong while saving the attribute set.'));
138+
$this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the attribute set.'));
139139
$hasError = true;
140140
}
141141

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function execute()
137137
$response->setError(true);
138138
$response->setMessages([$e->getMessage()]);
139139
} catch (\Exception $e) {
140-
$this->messageManager->addError($e->getMessage());
140+
$this->messageManager->addErrorMessage($e->getMessage());
141141
$layout = $this->layoutFactory->create();
142142
$layout->initMessages();
143143
$response->setError(true);

‎app/code/Magento/Catalog/Controller/Product/Compare/Clear.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public function execute()
3030

3131
try {
3232
$items->clear();
33-
$this->messageManager->addSuccess(__('You cleared the comparison list.'));
33+
$this->messageManager->addSuccessMessage(__('You cleared the comparison list.'));
3434
$this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class)->calculate();
3535
} catch (\Magento\Framework\Exception\LocalizedException $e) {
36-
$this->messageManager->addError($e->getMessage());
36+
$this->messageManager->addErrorMessage($e->getMessage());
3737
} catch (\Exception $e) {
38-
$this->messageManager->addException($e, __('Something went wrong clearing the comparison list.'));
38+
$this->messageManager->addExceptionMessage($e, __('Something went wrong clearing the comparison list.'));
3939
}
4040

4141
/** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */

‎app/code/Magento/Catalog/Controller/Product/Compare/Remove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function execute()
4444
$item->delete();
4545
$productName = $this->_objectManager->get(\Magento\Framework\Escaper::class)
4646
->escapeHtml($product->getName());
47-
$this->messageManager->addSuccess(
47+
$this->messageManager->addSuccessMessage(
4848
__('You removed product %1 from the comparison list.', $productName)
4949
);
5050
$this->_eventManager->dispatch(

‎app/code/Magento/Catalog/Controller/Product/View.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,16 @@ public function execute()
7878

7979
if ($this->getRequest()->isPost() && $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) {
8080
$product = $this->_initProduct();
81+
8182
if (!$product) {
8283
return $this->noProductRedirect();
8384
}
85+
8486
if ($specifyOptions) {
8587
$notice = $product->getTypeInstance()->getSpecifyOptionMessage();
86-
$this->messageManager->addNotice($notice);
88+
$this->messageManager->addNoticeMessage($notice);
8789
}
90+
8891
if ($this->getRequest()->isAjax()) {
8992
$this->getResponse()->representJson(
9093
$this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([

0 commit comments

Comments
 (0)