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('*/*/');

0 commit comments

Comments
 (0)