Skip to content

Commit 040c30f

Browse files
serhii-balkoserhii-balko
committed
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr2
2 parents 5d91400 + d394949 commit 040c30f

File tree

78 files changed

+452
-243
lines changed

Some content is hidden

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

78 files changed

+452
-243
lines changed

‎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);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
foreach ($this->_cacheFrontendPool as $cacheFrontend) {
2828
$cacheFrontend->getBackend()->clean();
2929
}
30-
$this->messageManager->addSuccess(__("You flushed the cache storage."));
30+
$this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultRedirectFactory->create();
3333
return $resultRedirect->setPath('adminhtml/*');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
$cacheFrontend->clean();
2828
}
2929
$this->_eventManager->dispatch('adminhtml_cache_flush_system');
30-
$this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
30+
$this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultRedirectFactory->create();
3333
return $resultRedirect->setPath('adminhtml/*');

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ private function disableCache()
6767
}
6868
if ($updatedTypes > 0) {
6969
$this->_cacheState->persist();
70-
$this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
70+
$this->messageManager->addSuccessMessage(__("%1 cache type(s) disabled.", $updatedTypes));
7171
}
7272
} catch (LocalizedException $e) {
73-
$this->messageManager->addError($e->getMessage());
73+
$this->messageManager->addErrorMessage($e->getMessage());
7474
} catch (\Exception $e) {
75-
$this->messageManager->addException($e, __('An error occurred while disabling cache.'));
75+
$this->messageManager->addExceptionMessage($e, __('An error occurred while disabling cache.'));
7676
}
7777
}
7878

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ private function enableCache()
6666
}
6767
if ($updatedTypes > 0) {
6868
$this->_cacheState->persist();
69-
$this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
69+
$this->messageManager->addSuccessMessage(__("%1 cache type(s) enabled.", $updatedTypes));
7070
}
7171
} catch (LocalizedException $e) {
72-
$this->messageManager->addError($e->getMessage());
72+
$this->messageManager->addErrorMessage($e->getMessage());
7373
} catch (\Exception $e) {
74-
$this->messageManager->addException($e, __('An error occurred while enabling cache.'));
74+
$this->messageManager->addExceptionMessage($e, __('An error occurred while enabling cache.'));
7575
}
7676
}
7777

0 commit comments

Comments
 (0)