Skip to content

Commit 34ee561

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #16800: [2.2-dev] Move functions.php into Framework (by @fooman) - #17872: [Backport] Replacing deprecated methods for tests. (by @tiagosampaio)
2 parents b4b7538 + 732e6eb commit 34ee561

File tree

34 files changed

+118
-83
lines changed

34 files changed

+118
-83
lines changed

‎app/bootstrap.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
// Sets default autoload mappings, may be overridden in Bootstrap::create
3232
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
3333

34-
require_once BP . '/app/functions.php';
35-
3634
/* Custom umask value may be provided in optional mage_umask file in root */
3735
$umaskFile = BP . '/magento_umask';
3836
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;

‎app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected function setUp()
7171
false,
7272
true,
7373
true,
74-
['addSuccess']
74+
['addSuccessMessage']
7575
);
7676
$this->categoryRepository = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
7777
$context->expects($this->any())

‎app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ protected function setUp()
102102
false,
103103
true,
104104
true,
105-
['addSuccess', 'getMessages']
105+
['addSuccessMessage', 'getMessages']
106106
);
107107

108108
$this->save = $this->objectManager->getObject(
@@ -392,7 +392,7 @@ public function testExecute($categoryId, $storeId, $parentId)
392392
$categoryMock->expects($this->once())
393393
->method('save');
394394
$this->messageManagerMock->expects($this->once())
395-
->method('addSuccess')
395+
->method('addSuccessMessage')
396396
->with(__('You saved the category.'));
397397
$categoryMock->expects($this->at(1))
398398
->method('getId')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private function prepareContext()
9494
$messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
9595
->setMethods([])
9696
->disableOriginalConstructor()->getMock();
97-
$messageManager->expects($this->any())->method('addError')->willReturn(true);
97+
$messageManager->expects($this->any())->method('addErrorMessage')->willReturn(true);
9898
$this->context = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
9999
->setMethods(['getRequest', 'getObjectManager', 'getMessageManager', 'getResultRedirectFactory'])
100100
->disableOriginalConstructor()->getMock();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
250250
['inventory', [], [7]],
251251
]));
252252

253-
$this->messageManager->expects($this->never())->method('addError');
254-
$this->messageManager->expects($this->never())->method('addException');
253+
$this->messageManager->expects($this->never())->method('addErrorMessage');
254+
$this->messageManager->expects($this->never())->method('addExceptionMessage');
255255

256256
$this->object->execute();
257257
}

‎app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ public function execute()
2222
if (count($template->getSystemConfigPathsWhereCurrentlyUsed()) == 0) {
2323
$template->delete();
2424
// display success message
25-
$this->messageManager->addSuccess(__('You deleted the email template.'));
25+
$this->messageManager->addSuccessMessage(__('You deleted the email template.'));
2626
$this->_objectManager->get(\Magento\Framework\App\ReinitableConfig::class)->reinit();
2727
// go to grid
2828
$this->_redirect('adminhtml/*/');
2929
return;
3030
}
3131
// display error message
32-
$this->messageManager->addError(__('The email template is currently being used.'));
32+
$this->messageManager->addErrorMessage(__('The email template is currently being used.'));
3333
// redirect to edit form
3434
$this->_redirect('adminhtml/*/edit', ['id' => $template->getId()]);
3535
return;
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->addError(
39+
$this->messageManager->addErrorMessage(
4040
__('We can\'t delete email template data right now. Please review log and try again.')
4141
);
4242
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -52,7 +52,7 @@ public function execute()
5252
}
5353
}
5454
// display error message
55-
$this->messageManager->addError(__('We can\'t find an email template to delete.'));
55+
$this->messageManager->addErrorMessage(__('We can\'t find an email template to delete.'));
5656
// go to grid
5757
$this->_redirect('adminhtml/*/');
5858
}

‎app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ public function execute()
2121
$this->_view->renderLayout();
2222
$this->getResponse()->setHeader('Content-Security-Policy', "script-src 'none'");
2323
} catch (\Exception $e) {
24-
$this->messageManager->addError(__('An error occurred. The email template can not be opened for preview.'));
24+
$this->messageManager->addErrorMessage(
25+
__('An error occurred. The email template can not be opened for preview.')
26+
);
2527
$this->_redirect('adminhtml/*/');
2628
}
2729
}

‎app/code/Magento/Email/Controller/Adminhtml/Email/Template/Save.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function execute()
2222

2323
$template = $this->_initTemplate('id');
2424
if (!$template->getId() && $id) {
25-
$this->messageManager->addError(__('This email template no longer exists.'));
25+
$this->messageManager->addErrorMessage(__('This email template no longer exists.'));
2626
$this->_redirect('adminhtml/*/');
2727
return;
2828
}
@@ -55,7 +55,7 @@ public function execute()
5555

5656
$template->save();
5757
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
58-
$this->messageManager->addSuccess(__('You saved the email template.'));
58+
$this->messageManager->addSuccessMessage(__('You saved the email template.'));
5959
$this->_redirect('adminhtml/*');
6060
} catch (\Exception $e) {
6161
$this->_objectManager->get(
@@ -64,7 +64,7 @@ public function execute()
6464
'email_template_form_data',
6565
$request->getParams()
6666
);
67-
$this->messageManager->addError($e->getMessage());
67+
$this->messageManager->addErrorMessage($e->getMessage());
6868
$this->_forward('new');
6969
}
7070
}

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,18 @@ public function execute()
6060
/** @var \Magento\Search\Model\SynonymGroup $synGroupModel */
6161
$synGroupModel = $this->synGroupRepository->get($id);
6262
$this->synGroupRepository->delete($synGroupModel);
63-
$this->messageManager->addSuccess(__('The synonym group has been deleted.'));
63+
$this->messageManager->addSuccessMessage(__('The synonym group has been deleted.'));
6464
} catch (\Magento\Framework\Exception\LocalizedException $e) {
65-
$this->messageManager->addError($e->getMessage());
65+
$this->messageManager->addErrorMessage($e->getMessage());
6666
$this->logger->error($e);
6767
} catch (\Exception $e) {
68-
$this->messageManager->addError(__('An error was encountered while performing delete operation.'));
68+
$this->messageManager->addErrorMessage(
69+
__('An error was encountered while performing delete operation.')
70+
);
6971
$this->logger->error($e);
7072
}
7173
} else {
72-
$this->messageManager->addError(__('We can\'t find a synonym group to delete.'));
74+
$this->messageManager->addErrorMessage(__('We can\'t find a synonym group to delete.'));
7375
}
7476

7577
return $resultRedirect->setPath('*/*/');

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function execute()
6666

6767
// 2. Initial checking
6868
if ($groupId && (!$synGroup->getGroupId())) {
69-
$this->messageManager->addError(__('This synonyms group no longer exists.'));
69+
$this->messageManager->addErrorMessage(__('This synonyms group no longer exists.'));
7070
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
7171
$resultRedirect = $this->resultRedirectFactory->create();
7272
return $resultRedirect->setPath('*/*/');

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ public function execute()
7272
$this->synGroupRepository->delete($synonymGroup);
7373
$deletedItems++;
7474
} catch (\Exception $e) {
75-
$this->messageManager->addError($e->getMessage());
75+
$this->messageManager->addErrorMessage($e->getMessage());
7676
}
7777
}
7878
if ($deletedItems != 0) {
7979
if ($collectionSize != $deletedItems) {
80-
$this->messageManager->addError(
80+
$this->messageManager->addErrorMessage(
8181
__('Failed to delete %1 synonym group(s).', $collectionSize - $deletedItems)
8282
);
8383
}
8484

85-
$this->messageManager->addSuccess(
85+
$this->messageManager->addSuccessMessage(
8686
__('A total of %1 synonym group(s) have been deleted.', $deletedItems)
8787
);
8888
}

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function execute()
5959
$synGroup = $this->synGroupRepository->get($synGroupId);
6060

6161
if (!$synGroup->getGroupId() && $synGroupId) {
62-
$this->messageManager->addError(__('This synonym group no longer exists.'));
62+
$this->messageManager->addErrorMessage(__('This synonym group no longer exists.'));
6363
return $resultRedirect->setPath('*/*/');
6464
}
6565

‎app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public function execute()
2323
$model = $this->_objectManager->create(\Magento\Search\Model\Query::class);
2424
$model->setId($id);
2525
$model->delete();
26-
$this->messageManager->addSuccess(__('You deleted the search.'));
26+
$this->messageManager->addSuccessMessage(__('You deleted the search.'));
2727
$resultRedirect->setPath('search/*/');
2828
return $resultRedirect;
2929
} catch (\Exception $e) {
30-
$this->messageManager->addError($e->getMessage());
30+
$this->messageManager->addErrorMessage($e->getMessage());
3131
$resultRedirect->setPath('search/*/edit', ['id' => $this->getRequest()->getParam('id')]);
3232
return $resultRedirect;
3333
}
3434
}
35-
$this->messageManager->addError(__('We can\'t find a search term to delete.'));
35+
$this->messageManager->addErrorMessage(__('We can\'t find a search term to delete.'));
3636
$resultRedirect->setPath('search/*/');
3737
return $resultRedirect;
3838
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php

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

‎app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ public function execute()
1717
{
1818
$searchIds = $this->getRequest()->getParam('search');
1919
if (!is_array($searchIds)) {
20-
$this->messageManager->addError(__('Please select searches.'));
20+
$this->messageManager->addErrorMessage(__('Please select searches.'));
2121
} else {
2222
try {
2323
foreach ($searchIds as $searchId) {
2424
$model = $this->_objectManager->create(\Magento\Search\Model\Query::class)->load($searchId);
2525
$model->delete();
2626
}
27-
$this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($searchIds)));
27+
$this->messageManager->addSuccessMessage(__('Total of %1 record(s) were deleted.', count($searchIds)));
2828
} catch (\Exception $e) {
29-
$this->messageManager->addError($e->getMessage());
29+
$this->messageManager->addErrorMessage($e->getMessage());
3030
}
3131
}
3232
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Search/Controller/Adminhtml/Term/Save.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ public function execute()
4545
$model->addData($data);
4646
$model->setIsProcessed(0);
4747
$model->save();
48-
$this->messageManager->addSuccess(__('You saved the search term.'));
48+
$this->messageManager->addSuccessMessage(__('You saved the search term.'));
4949
} catch (LocalizedException $e) {
50-
$this->messageManager->addError($e->getMessage());
50+
$this->messageManager->addErrorMessage($e->getMessage());
5151
return $this->proceedToEdit($data);
5252
} catch (\Exception $e) {
53-
$this->messageManager->addException($e, __('Something went wrong while saving the search query.'));
53+
$this->messageManager->addExceptionMessage(
54+
$e,
55+
__('Something went wrong while saving the search query.')
56+
);
5457
return $this->proceedToEdit($data);
5558
}
5659
}

‎app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ public function testDeleteAction()
107107
$this->repository->expects($this->once())->method('get')->with(10)->willReturn($this->synonymGroupMock);
108108

109109
$this->messageManagerMock->expects($this->once())
110-
->method('addSuccess')
110+
->method('addSuccessMessage')
111111
->with(__('The synonym group has been deleted.'));
112112

113-
$this->messageManagerMock->expects($this->never())->method('addError');
113+
$this->messageManagerMock->expects($this->never())->method('addErrorMessage');
114114

115115
$this->resultRedirectMock->expects($this->once())->method('setPath')->with('*/*/')->willReturnSelf();
116116

@@ -124,10 +124,10 @@ public function testDeleteActionNoId()
124124
->willReturn(null);
125125

126126
$this->messageManagerMock->expects($this->once())
127-
->method('addError')
127+
->method('addErrorMessage')
128128
->with(__('We can\'t find a synonym group to delete.'));
129129
$this->messageManagerMock->expects($this->never())
130-
->method('addSuccess');
130+
->method('addSuccessMessage');
131131

132132
$this->resultRedirectMock->expects($this->once())
133133
->method('setPath')

‎app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function setUp()
5454
->getMockForAbstractClass();
5555
$this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
5656
->disableOriginalConstructor()
57-
->setMethods(['addSuccess', 'addError'])
57+
->setMethods(['addSuccessMessage', 'addErrorMessage'])
5858
->getMockForAbstractClass();
5959
$this->pageFactory = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
6060
->setMethods([])
@@ -107,7 +107,7 @@ public function testExecute()
107107
$this->createQuery(0, 1);
108108
$this->createQuery(1, 2);
109109
$this->messageManager->expects($this->once())
110-
->method('addSuccess')
110+
->method('addSuccessMessage')
111111
->will($this->returnSelf());
112112
$this->resultRedirectMock->expects($this->once())
113113
->method('setPath')

‎app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected function setUp()
7575

7676
$this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
7777
->disableOriginalConstructor()
78-
->setMethods(['addSuccess', 'addError', 'addException'])
78+
->setMethods(['addSuccessMessage', 'addErrorMessage', 'addExceptionMessage'])
7979
->getMockForAbstractClass();
8080
$this->context->expects($this->any())
8181
->method('getMessageManager')
@@ -143,7 +143,7 @@ public function testExecuteLoadQueryQueryId()
143143
$this->query->expects($this->once())->method('getId')->willReturn(false);
144144
$this->query->expects($this->once())->method('load')->with($queryId);
145145

146-
$this->messageManager->expects($this->once())->method('addSuccess');
146+
$this->messageManager->expects($this->once())->method('addSuccessMessage');
147147

148148
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
149149
$this->assertSame($this->redirect, $this->controller->execute());
@@ -161,7 +161,7 @@ public function testExecuteLoadQueryQueryIdQueryText()
161161
$this->query->expects($this->once())->method('loadByQueryText')->with($queryText);
162162
$this->query->expects($this->any())->method('getId')->willReturn($queryId);
163163

164-
$this->messageManager->expects($this->once())->method('addSuccess');
164+
$this->messageManager->expects($this->once())->method('addSuccessMessage');
165165

166166
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
167167
$this->assertSame($this->redirect, $this->controller->execute());
@@ -180,7 +180,7 @@ public function testExecuteLoadQueryQueryIdQueryText2()
180180
$this->query->expects($this->any())->method('getId')->willReturn(false);
181181
$this->query->expects($this->once())->method('load')->with($queryId);
182182

183-
$this->messageManager->expects($this->once())->method('addSuccess');
183+
$this->messageManager->expects($this->once())->method('addSuccessMessage');
184184

185185
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
186186
$this->assertSame($this->redirect, $this->controller->execute());
@@ -199,7 +199,7 @@ public function testExecuteLoadQueryQueryIdQueryTextException()
199199
$this->query->expects($this->once())->method('loadByQueryText')->with($queryText);
200200
$this->query->expects($this->any())->method('getId')->willReturn($anotherQueryId);
201201

202-
$this->messageManager->expects($this->once())->method('addError');
202+
$this->messageManager->expects($this->once())->method('addErrorMessage');
203203
$this->session->expects($this->once())->method('setPageData');
204204
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
205205
$this->assertSame($this->redirect, $this->controller->execute());
@@ -216,7 +216,7 @@ public function testExecuteException()
216216
$this->query->expects($this->once())->method('setStoreId');
217217
$this->query->expects($this->once())->method('loadByQueryText')->willThrowException(new \Exception());
218218

219-
$this->messageManager->expects($this->once())->method('addException');
219+
$this->messageManager->expects($this->once())->method('addExceptionMessage');
220220
$this->session->expects($this->once())->method('setPageData');
221221
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
222222
$this->assertSame($this->redirect, $this->controller->execute());

‎app/code/Magento/Security/Controller/Adminhtml/Session/LogoutAll.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public function execute()
3838
{
3939
try {
4040
$this->sessionsManager->logoutOtherUserSessions();
41-
$this->messageManager->addSuccess(__('All other open sessions for this account were terminated.'));
41+
$this->messageManager->addSuccessMessage(__('All other open sessions for this account were terminated.'));
4242
} catch (\Magento\Framework\Exception\LocalizedException $e) {
43-
$this->messageManager->addError($e->getMessage());
43+
$this->messageManager->addErrorMessage($e->getMessage());
4444
} catch (\Exception $e) {
45-
$this->messageManager->addException($e, __("We couldn't logout because of an error."));
45+
$this->messageManager->addExceptionMessage($e, __("We couldn't logout because of an error."));
4646
}
4747
$this->_redirect('*/*/activity');
4848
}

‎app/code/Magento/Security/Model/Plugin/AuthSession.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private function addUserLogoutNotification()
8282
$this->sessionsManager->getCurrentSession()->getStatus()
8383
);
8484
} elseif ($message = $this->sessionsManager->getLogoutReasonMessage()) {
85-
$this->messageManager->addError($message);
85+
$this->messageManager->addErrorMessage($message);
8686
}
8787

8888
return $this;

0 commit comments

Comments
 (0)