Skip to content

Commit 94eb10f

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch '2.2-develop' into 2.2.6-develop
2 parents 872155c + 03b9371 commit 94eb10f

File tree

119 files changed

+1993
-295
lines changed

Some content is hidden

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

119 files changed

+1993
-295
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/Block/Media/Uploader.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\Media;
77

8+
use Magento\Framework\App\ObjectManager;
9+
use Magento\Framework\Serialize\Serializer\Json;
10+
811
/**
912
* Adminhtml media library uploader
1013
* @api
@@ -27,17 +30,25 @@ class Uploader extends \Magento\Backend\Block\Widget
2730
*/
2831
protected $_fileSizeService;
2932

33+
/**
34+
* @var Json
35+
*/
36+
private $jsonEncoder;
37+
3038
/**
3139
* @param \Magento\Backend\Block\Template\Context $context
3240
* @param \Magento\Framework\File\Size $fileSize
3341
* @param array $data
42+
* @param Json $jsonEncoder
3443
*/
3544
public function __construct(
3645
\Magento\Backend\Block\Template\Context $context,
3746
\Magento\Framework\File\Size $fileSize,
38-
array $data = []
47+
array $data = [],
48+
Json $jsonEncoder = null
3949
) {
4050
$this->_fileSizeService = $fileSize;
51+
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
4152
parent::__construct($context, $data);
4253
}
4354

@@ -107,7 +118,7 @@ public function getJsObjectName()
107118
*/
108119
public function getConfigJson()
109120
{
110-
return $this->_coreData->jsonEncode($this->getConfig()->getData());
121+
return $this->jsonEncoder->encode($this->getConfig()->getData());
111122
}
112123

113124
/**

‎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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function execute()
3737
$updatedTypes++;
3838
}
3939
if ($updatedTypes > 0) {
40-
$this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
40+
$this->messageManager->addSuccessMessage(__("%1 cache type(s) refreshed.", $updatedTypes));
4141
}
4242
} catch (LocalizedException $e) {
43-
$this->messageManager->addError($e->getMessage());
43+
$this->messageManager->addErrorMessage($e->getMessage());
4444
} catch (\Exception $e) {
45-
$this->messageManager->addException($e, __('An error occurred while refreshing cache.'));
45+
$this->messageManager->addExceptionMessage($e, __('An error occurred while refreshing cache.'));
4646
}
4747

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

‎app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public function execute()
3434
foreach ($collectionsNames as $collectionName) {
3535
$this->_objectManager->create($collectionName)->aggregate();
3636
}
37-
$this->messageManager->addSuccess(__('We updated lifetime statistic.'));
37+
$this->messageManager->addSuccessMessage(__('We updated lifetime statistic.'));
3838
} catch (\Exception $e) {
39-
$this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
39+
$this->messageManager->addErrorMessage(__('We can\'t refresh lifetime statistics.'));
4040
$this->logger->critical($e);
4141
}
4242

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ public function execute()
7676
$errors = $user->validate();
7777
if ($errors !== true && !empty($errors)) {
7878
foreach ($errors as $error) {
79-
$this->messageManager->addError($error);
79+
$this->messageManager->addErrorMessage($error);
8080
}
8181
} else {
8282
$user->save();
8383
$user->sendNotificationEmailsIfRequired();
84-
$this->messageManager->addSuccess(__('You saved the account.'));
84+
$this->messageManager->addSuccessMessage(__('You saved the account.'));
8585
}
8686
} catch (UserLockedException $e) {
8787
$this->_auth->logout();
@@ -91,12 +91,12 @@ public function execute()
9191
} catch (ValidatorException $e) {
9292
$this->messageManager->addMessages($e->getMessages());
9393
if ($e->getMessage()) {
94-
$this->messageManager->addError($e->getMessage());
94+
$this->messageManager->addErrorMessage($e->getMessage());
9595
}
9696
} catch (LocalizedException $e) {
97-
$this->messageManager->addError($e->getMessage());
97+
$this->messageManager->addErrorMessage($e->getMessage());
9898
} catch (\Exception $e) {
99-
$this->messageManager->addError(__('An error occurred while saving account.'));
99+
$this->messageManager->addErrorMessage(__('An error occurred while saving account.'));
100100
}
101101

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

‎app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public function execute()
1919

2020
try {
2121
$design->delete();
22-
$this->messageManager->addSuccess(__('You deleted the design change.'));
22+
$this->messageManager->addSuccessMessage(__('You deleted the design change.'));
2323
} catch (\Magento\Framework\Exception\LocalizedException $e) {
24-
$this->messageManager->addError($e->getMessage());
24+
$this->messageManager->addErrorMessage($e->getMessage());
2525
} catch (\Exception $e) {
26-
$this->messageManager->addException($e, __("You can't delete the design change."));
26+
$this->messageManager->addExceptionMessage($e, __("You can't delete the design change."));
2727
}
2828
}
2929
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public function execute()
5050
try {
5151
$design->save();
5252
$this->_eventManager->dispatch('theme_save_after');
53-
$this->messageManager->addSuccess(__('You saved the design change.'));
53+
$this->messageManager->addSuccessMessage(__('You saved the design change.'));
5454
} catch (\Exception $e) {
55-
$this->messageManager->addError($e->getMessage());
55+
$this->messageManager->addErrorMessage($e->getMessage());
5656
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
5757
return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
5858
}

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ protected function _backupDatabase()
103103
->setType('db')
104104
->setPath($filesystem->getDirectoryRead(DirectoryList::VAR_DIR)->getAbsolutePath('backups'));
105105
$backupDb->createBackup($backup);
106-
$this->messageManager->addSuccess(__('The database was backed up.'));
106+
$this->messageManager->addSuccessMessage(__('The database was backed up.'));
107107
} catch (\Magento\Framework\Exception\LocalizedException $e) {
108-
$this->messageManager->addError($e->getMessage());
108+
$this->messageManager->addErrorMessage($e->getMessage());
109109
return false;
110110
} catch (\Exception $e) {
111-
$this->messageManager->addException(
111+
$this->messageManager->addExceptionMessage(
112112
$e,
113113
__('We can\'t create a backup right now. Please try again later.')
114114
);
@@ -125,7 +125,7 @@ protected function _backupDatabase()
125125
*/
126126
protected function _addDeletionNotice($typeTitle)
127127
{
128-
$this->messageManager->addNotice(
128+
$this->messageManager->addNoticeMessage(
129129
__(
130130
'Deleting a %1 will not delete the information associated with the %1 (e.g. categories, products, etc.)'
131131
. ', but the %1 will not be able to be restored. It is suggested that you create a database backup '

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public function execute()
1515
{
1616
$itemId = $this->getRequest()->getParam('item_id', null);
1717
if (!($model = $this->_objectManager->create(\Magento\Store\Model\Group::class)->load($itemId))) {
18-
$this->messageManager->addError(__('Something went wrong. Please try again.'));
18+
$this->messageManager->addErrorMessage(__('Something went wrong. Please try again.'));
1919
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
2020
$redirectResult = $this->resultRedirectFactory->create();
2121
return $redirectResult->setPath('adminhtml/*/');
2222
}
2323
if (!$model->isCanDelete()) {
24-
$this->messageManager->addError(__('This store cannot be deleted.'));
24+
$this->messageManager->addErrorMessage(__('This store cannot be deleted.'));
2525
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
2626
$redirectResult = $this->resultRedirectFactory->create();
2727
return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);

0 commit comments

Comments
 (0)