Skip to content

Commit 4eff71b

Browse files
author
olysenko
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-92036
2 parents 2f1254f + 7baea60 commit 4eff71b

File tree

125 files changed

+1563
-503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1563
-503
lines changed

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public function execute()
2828
)->markAsRead(
2929
$notificationId
3030
);
31-
$this->messageManager->addSuccess(__('The message has been marked as Read.'));
31+
$this->messageManager->addSuccessMessage(__('The message has been marked as Read.'));
3232
} catch (\Magento\Framework\Exception\LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException(
35+
$this->messageManager->addExceptionMessage(
3636
$e,
3737
__("We couldn't mark the notification as Read because of an error.")
3838
);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function execute()
2323
{
2424
$ids = $this->getRequest()->getParam('notification');
2525
if (!is_array($ids)) {
26-
$this->messageManager->addError(__('Please select messages.'));
26+
$this->messageManager->addErrorMessage(__('Please select messages.'));
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
@@ -32,13 +32,13 @@ public function execute()
3232
$model->setIsRead(1)->save();
3333
}
3434
}
35-
$this->messageManager->addSuccess(
35+
$this->messageManager->addSuccessMessage(
3636
__('A total of %1 record(s) have been marked as Read.', count($ids))
3737
);
3838
} catch (\Magento\Framework\Exception\LocalizedException $e) {
39-
$this->messageManager->addError($e->getMessage());
39+
$this->messageManager->addErrorMessage($e->getMessage());
4040
} catch (\Exception $e) {
41-
$this->messageManager->addException(
41+
$this->messageManager->addExceptionMessage(
4242
$e,
4343
__("We couldn't mark the notification as Read because of an error.")
4444
);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function execute()
2323
{
2424
$ids = $this->getRequest()->getParam('notification');
2525
if (!is_array($ids)) {
26-
$this->messageManager->addError(__('Please select messages.'));
26+
$this->messageManager->addErrorMessage(__('Please select messages.'));
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
@@ -32,11 +32,12 @@ public function execute()
3232
$model->setIsRemove(1)->save();
3333
}
3434
}
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)));
3636
} catch (\Magento\Framework\Exception\LocalizedException $e) {
37-
$this->messageManager->addError($e->getMessage());
37+
$this->messageManager->addErrorMessage($e->getMessage());
3838
} catch (\Exception $e) {
39-
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
39+
$this->messageManager
40+
->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
4041
}
4142
}
4243
$this->_redirect('adminhtml/*/');

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ public function execute()
3131

3232
try {
3333
$model->setIsRemove(1)->save();
34-
$this->messageManager->addSuccess(__('The message has been removed.'));
34+
$this->messageManager->addSuccessMessage(__('The message has been removed.'));
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, __("We couldn't remove the messages because of an error."));
38+
$this->messageManager
39+
->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
3940
}
4041

4142
$this->_redirect('adminhtml/*/');

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public function execute()
3737
);
3838
return $resultLayout;
3939
} catch (\Exception $e) {
40-
$this->messageManager->addError($e->getMessage());
40+
$this->messageManager->addErrorMessage($e->getMessage());
4141
}
4242
} else {
43-
$this->messageManager->addError(__('Please correct the data sent.'));
43+
$this->messageManager->addErrorMessage(__('Please correct the data sent.'));
4444
}
4545
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4646
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

‎app/code/Magento/Backend/App/Action/Plugin/Authentication.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
160160
} else {
161161
$this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
162162
$this->_response->setRedirect($this->_url->getCurrentUrl());
163-
$this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
163+
$this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
164164
$isRedirectNeeded = true;
165165
}
166166
}
@@ -205,7 +205,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
205205
$this->_auth->login($username, $password);
206206
} catch (AuthenticationException $e) {
207207
if (!$request->getParam('messageSent')) {
208-
$this->messageManager->addError($e->getMessage());
208+
$this->messageManager->addErrorMessage($e->getMessage());
209209
$request->setParam('messageSent', true);
210210
$outputValue = false;
211211
}

‎app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
1616
public function execute()
1717
{
1818
$this->_auth->logout();
19-
$this->messageManager->addSuccess(__('You have logged out.'));
19+
$this->messageManager->addSuccessMessage(__('You have logged out.'));
2020

2121
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
2222
$resultRedirect = $this->resultRedirectFactory->create();

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public function execute()
2828
try {
2929
$this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
3030
$this->_eventManager->dispatch('clean_catalog_images_cache_after');
31-
$this->messageManager->addSuccess(__('The image cache was cleaned.'));
31+
$this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
3232
} catch (LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
35+
$this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
3636
}
3737

3838
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ public function execute()
2828
try {
2929
$this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
3030
$this->_eventManager->dispatch('clean_media_cache_after');
31-
$this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
31+
$this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
3232
} catch (LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
35+
$this->messageManager
36+
->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
3637
}
3738

3839
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function execute()
2626
{
2727
$this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
2828
$this->_eventManager->dispatch('clean_static_files_cache_after');
29-
$this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
29+
$this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
3030

3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

0 commit comments

Comments
 (0)