Skip to content

Commit b6e27ca

Browse files
author
Stanislav Idolov
authored
ENGCOM-2520: [Forwardport] Slight Changes to Code #17106 
2 parents 4494dde + ed20ab3 commit b6e27ca

21 files changed

+56
-41
lines changed

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ public function execute()
2626
$model->load($id);
2727
$model->delete();
2828
// display success message
29-
$this->messageManager->addSuccess(__('You deleted the block.'));
29+
$this->messageManager->addSuccessMessage(__('You deleted the block.'));
3030
// go to grid
3131
return $resultRedirect->setPath('*/*/');
3232
} catch (\Exception $e) {
3333
// display error message
34-
$this->messageManager->addError($e->getMessage());
34+
$this->messageManager->addErrorMessage($e->getMessage());
3535
// go back to edit form
3636
return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
3737
}
3838
}
3939
// display error message
40-
$this->messageManager->addError(__('We can\'t find a block to delete.'));
40+
$this->messageManager->addErrorMessage(__('We can\'t find a block to delete.'));
4141
// go to grid
4242
return $resultRedirect->setPath('*/*/');
4343
}

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function execute()
4242
if ($id) {
4343
$model->load($id);
4444
if (!$model->getId()) {
45-
$this->messageManager->addError(__('This block no longer exists.'));
45+
$this->messageManager->addErrorMessage(__('This block no longer exists.'));
4646
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4747
$resultRedirect = $this->resultRedirectFactory->create();
4848
return $resultRedirect->setPath('*/*/');

‎app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public function __construct(
4646

4747
/**
4848
* @return \Magento\Framework\Controller\ResultInterface
49+
* @throws \Magento\Framework\Exception\LocalizedException
4950
*/
5051
public function execute()
5152
{

‎app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function execute()
6060
$block->delete();
6161
}
6262

63-
$this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
63+
$this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
6464

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

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,42 @@ public function execute()
2626
$id = $this->getRequest()->getParam('page_id');
2727
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
2828
$resultRedirect = $this->resultRedirectFactory->create();
29+
2930
if ($id) {
3031
$title = "";
3132
try {
3233
// init model and delete
3334
$model = $this->_objectManager->create(\Magento\Cms\Model\Page::class);
3435
$model->load($id);
36+
3537
$title = $model->getTitle();
3638
$model->delete();
39+
3740
// display success message
38-
$this->messageManager->addSuccess(__('The page has been deleted.'));
41+
$this->messageManager->addSuccessMessage(__('The page has been deleted.'));
42+
3943
// go to grid
40-
$this->_eventManager->dispatch(
41-
'adminhtml_cmspage_on_delete',
42-
['title' => $title, 'status' => 'success']
43-
);
44+
$this->_eventManager->dispatch('adminhtml_cmspage_on_delete', [
45+
'title' => $title,
46+
'status' => 'success'
47+
]);
48+
4449
return $resultRedirect->setPath('*/*/');
4550
} catch (\Exception $e) {
4651
$this->_eventManager->dispatch(
4752
'adminhtml_cmspage_on_delete',
4853
['title' => $title, 'status' => 'fail']
4954
);
5055
// display error message
51-
$this->messageManager->addError($e->getMessage());
56+
$this->messageManager->addErrorMessage($e->getMessage());
5257
// go back to edit form
5358
return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
5459
}
5560
}
61+
5662
// display error message
57-
$this->messageManager->addError(__('We can\'t find a page to delete.'));
63+
$this->messageManager->addErrorMessage(__('We can\'t find a page to delete.'));
64+
5865
// go to grid
5966
return $resultRedirect->setPath('*/*/');
6067
}

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function execute()
7676
if ($id) {
7777
$model->load($id);
7878
if (!$model->getId()) {
79-
$this->messageManager->addError(__('This page no longer exists.'));
79+
$this->messageManager->addErrorMessage(__('This page no longer exists.'));
8080
/** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
8181
$resultRedirect = $this->resultRedirectFactory->create();
8282
return $resultRedirect->setPath('*/*/');

‎app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public function __construct(
5757

5858
/**
5959
* @return \Magento\Framework\Controller\ResultInterface
60+
* @throws \Magento\Framework\Exception\LocalizedException
6061
*/
6162
public function execute()
6263
{

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ public function execute()
5959
$page->delete();
6060
}
6161

62-
$this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
62+
$this->messageManager->addSuccessMessage(__('A total of %1 record(s) have been deleted.', $collectionSize));
6363

6464
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
6565
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
66+
6667
return $resultRedirect->setPath('*/*/');
6768
}
6869
}

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public function execute()
5959
$item->save();
6060
}
6161

62-
$this->messageManager->addSuccess(__('A total of %1 record(s) have been disabled.', $collection->getSize()));
62+
$this->messageManager->addSuccessMessage(
63+
__('A total of %1 record(s) have been disabled.', $collection->getSize())
64+
);
6365

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

‎app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public function execute()
5959
$item->save();
6060
}
6161

62-
$this->messageManager->addSuccess(__('A total of %1 record(s) have been enabled.', $collection->getSize()));
62+
$this->messageManager->addSuccessMessage(
63+
__('A total of %1 record(s) have been enabled.', $collection->getSize())
64+
);
6365

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

‎app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function validateRequireEntry(array $data)
119119
foreach ($data as $field => $value) {
120120
if (in_array($field, array_keys($requiredFields)) && $value == '') {
121121
$errorNo = false;
122-
$this->messageManager->addError(
122+
$this->messageManager->addErrorMessage(
123123
__('To apply changes you should fill in hidden required "%1" field', $requiredFields[$field])
124124
);
125125
}
@@ -140,6 +140,7 @@ private function validateData($data, $layoutXmlValidator)
140140
if (!empty($data['layout_update_xml']) && !$layoutXmlValidator->isValid($data['layout_update_xml'])) {
141141
return false;
142142
}
143+
143144
if (!empty($data['custom_layout_update_xml']) &&
144145
!$layoutXmlValidator->isValid($data['custom_layout_update_xml'])
145146
) {

‎app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function execute()
3939
try {
4040
$this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class)->getCurrentPath();
4141
} catch (\Exception $e) {
42-
$this->messageManager->addError($e->getMessage());
42+
$this->messageManager->addErrorMessage($e->getMessage());
4343
}
4444
$this->_initAction();
4545
/** @var \Magento\Framework\View\Result\Layout $resultLayout */

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ public function testDeleteAction()
134134
->with($this->blockId);
135135

136136
$this->messageManagerMock->expects($this->once())
137-
->method('addSuccess')
137+
->method('addSuccessMessage')
138138
->with(__('You deleted the block.'));
139139
$this->messageManagerMock->expects($this->never())
140-
->method('addError');
140+
->method('addErrorMessage');
141141

142142
$this->resultRedirectMock->expects($this->once())
143143
->method('setPath')
@@ -154,10 +154,10 @@ public function testDeleteActionNoId()
154154
->willReturn(null);
155155

156156
$this->messageManagerMock->expects($this->once())
157-
->method('addError')
157+
->method('addErrorMessage')
158158
->with(__('We can\'t find a block to delete.'));
159159
$this->messageManagerMock->expects($this->never())
160-
->method('addSuccess');
160+
->method('addSuccessMessage');
161161

162162
$this->resultRedirectMock->expects($this->once())
163163
->method('setPath')
@@ -181,10 +181,10 @@ public function testDeleteActionThrowsException()
181181
->willThrowException(new \Exception(__($errorMsg)));
182182

183183
$this->messageManagerMock->expects($this->once())
184-
->method('addError')
184+
->method('addErrorMessage')
185185
->with($errorMsg);
186186
$this->messageManagerMock->expects($this->never())
187-
->method('addSuccess');
187+
->method('addSuccessMessage');
188188

189189
$this->resultRedirectMock->expects($this->once())
190190
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/EditTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function testEditActionBlockNoExists()
139139
->willReturn(null);
140140

141141
$this->messageManagerMock->expects($this->once())
142-
->method('addError')
142+
->method('addErrorMessage')
143143
->with(__('This block no longer exists.'));
144144

145145
$this->resultRedirectFactoryMock->expects($this->atLeastOnce())

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
6868
->willReturn(new \ArrayIterator($collection));
6969

7070
$this->messageManagerMock->expects($this->once())
71-
->method('addSuccess')
71+
->method('addSuccessMessage')
7272
->with(__('A total of %1 record(s) have been deleted.', $deletedBlocksCount));
73-
$this->messageManagerMock->expects($this->never())->method('addError');
73+
$this->messageManagerMock->expects($this->never())->method('addErrorMessage');
7474

7575
$this->resultRedirectMock->expects($this->once())
7676
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ public function testDeleteAction()
124124
->method('delete');
125125

126126
$this->messageManagerMock->expects($this->once())
127-
->method('addSuccess')
127+
->method('addSuccessMessage')
128128
->with(__('The page has been deleted.'));
129129
$this->messageManagerMock->expects($this->never())
130-
->method('addError');
130+
->method('addErrorMessage');
131131

132132
$this->eventManagerMock->expects($this->once())
133133
->method('dispatch')
@@ -151,10 +151,10 @@ public function testDeleteActionNoId()
151151
->willReturn(null);
152152

153153
$this->messageManagerMock->expects($this->once())
154-
->method('addError')
154+
->method('addErrorMessage')
155155
->with(__('We can\'t find a page to delete.'));
156156
$this->messageManagerMock->expects($this->never())
157-
->method('addSuccess');
157+
->method('addSuccessMessage');
158158

159159
$this->resultRedirectMock->expects($this->once())
160160
->method('setPath')
@@ -195,10 +195,10 @@ public function testDeleteActionThrowsException()
195195
);
196196

197197
$this->messageManagerMock->expects($this->once())
198-
->method('addError')
198+
->method('addErrorMessage')
199199
->with($errorMsg);
200200
$this->messageManagerMock->expects($this->never())
201-
->method('addSuccess');
201+
->method('addSuccessMessage');
202202

203203
$this->resultRedirectMock->expects($this->once())
204204
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/EditTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function testEditActionPageNoExists()
139139
->willReturn(null);
140140

141141
$this->messageManagerMock->expects($this->once())
142-
->method('addError')
142+
->method('addErrorMessage')
143143
->with(__('This page no longer exists.'));
144144

145145
$this->resultRedirectFactoryMock->expects($this->atLeastOnce())

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function testMassDeleteAction()
6868
->willReturn(new \ArrayIterator($collection));
6969

7070
$this->messageManagerMock->expects($this->once())
71-
->method('addSuccess')
71+
->method('addSuccessMessage')
7272
->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
73-
$this->messageManagerMock->expects($this->never())->method('addError');
73+
$this->messageManagerMock->expects($this->never())->method('addErrorMessage');
7474

7575
$this->resultRedirectMock->expects($this->once())
7676
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public function testMassDisableAction()
6767
->willReturn(new \ArrayIterator($collection));
6868

6969
$this->messageManagerMock->expects($this->once())
70-
->method('addSuccess')
70+
->method('addSuccessMessage')
7171
->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
72-
$this->messageManagerMock->expects($this->never())->method('addError');
72+
$this->messageManagerMock->expects($this->never())->method('addErrorMessage');
7373

7474
$this->resultRedirectMock->expects($this->once())
7575
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public function testMassEnableAction()
6767
->willReturn(new \ArrayIterator($collection));
6868

6969
$this->messageManagerMock->expects($this->once())
70-
->method('addSuccess')
70+
->method('addSuccessMessage')
7171
->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
72-
$this->messageManagerMock->expects($this->never())->method('addError');
72+
$this->messageManagerMock->expects($this->never())->method('addErrorMessage');
7373

7474
$this->resultRedirectMock->expects($this->once())
7575
->method('setPath')

‎app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function testValidateRequireEntry()
6565
'title' => ''
6666
];
6767
$this->messageManagerMock->expects($this->once())
68-
->method('addError')
68+
->method('addErrorMessage')
6969
->with(__('To apply changes you should fill in hidden required "%1" field', 'Page Title'));
7070

7171
$this->assertFalse($this->postDataProcessor->validateRequireEntry($postData));

0 commit comments

Comments
 (0)