Skip to content

Replacing deprecated methods for Magento_Search module. #17558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Replacing deprecated methods for Magento_Search module. #17558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,18 @@ public function execute()
/** @var \Magento\Search\Model\SynonymGroup $synGroupModel */
$synGroupModel = $this->synGroupRepository->get($id);
$this->synGroupRepository->delete($synGroupModel);
$this->messageManager->addSuccess(__('The synonym group has been deleted.'));
$this->messageManager->addSuccessMessage(__('The synonym group has been deleted.'));
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
$this->logger->error($e);
} catch (\Exception $e) {
$this->messageManager->addError(__('An error was encountered while performing delete operation.'));
$this->messageManager->addErrorMessage(
__('An error was encountered while performing delete operation.')
);
$this->logger->error($e);
}
} else {
$this->messageManager->addError(__('We can\'t find a synonym group to delete.'));
$this->messageManager->addErrorMessage(__('We can\'t find a synonym group to delete.'));
}

return $resultRedirect->setPath('*/*/');
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function execute()

// 2. Initial checking
if ($groupId && (!$synGroup->getGroupId())) {
$this->messageManager->addError(__('This synonyms group no longer exists.'));
$this->messageManager->addErrorMessage(__('This synonyms group no longer exists.'));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
return $resultRedirect->setPath('*/*/');
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ public function execute()
$this->synGroupRepository->delete($synonymGroup);
$deletedItems++;
} catch (\Exception $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
}
}
if ($deletedItems != 0) {
if ($collectionSize != $deletedItems) {
$this->messageManager->addError(
$this->messageManager->addErrorMessage(
__('Failed to delete %1 synonym group(s).', $collectionSize - $deletedItems)
);
}

$this->messageManager->addSuccess(
$this->messageManager->addSuccessMessage(
__('A total of %1 synonym group(s) have been deleted.', $deletedItems)
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function execute()
$synGroup = $this->synGroupRepository->get($synGroupId);

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

Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ public function execute()
$model = $this->_objectManager->create(\Magento\Search\Model\Query::class);
$model->setId($id);
$model->delete();
$this->messageManager->addSuccess(__('You deleted the search.'));
$this->messageManager->addSuccessMessage(__('You deleted the search.'));
$resultRedirect->setPath('search/*/');
return $resultRedirect;
} catch (\Exception $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
$resultRedirect->setPath('search/*/edit', ['id' => $this->getRequest()->getParam('id')]);
return $resultRedirect;
}
}
$this->messageManager->addError(__('We can\'t find a search term to delete.'));
$this->messageManager->addErrorMessage(__('We can\'t find a search term to delete.'));
$resultRedirect->setPath('search/*/');
return $resultRedirect;
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function execute()
if ($id) {
$model->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This search no longer exists.'));
$this->messageManager->addErrorMessage(__('This search no longer exists.'));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
$resultRedirect->setPath('search/*');
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ public function execute()
{
$searchIds = $this->getRequest()->getParam('search');
if (!is_array($searchIds)) {
$this->messageManager->addError(__('Please select searches.'));
$this->messageManager->addErrorMessage(__('Please select searches.'));
} else {
try {
foreach ($searchIds as $searchId) {
$model = $this->_objectManager->create(\Magento\Search\Model\Query::class)->load($searchId);
$model->delete();
}
$this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($searchIds)));
$this->messageManager->addSuccessMessage(__('Total of %1 record(s) were deleted.', count($searchIds)));
} catch (\Exception $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
}
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
Expand Down
9 changes: 6 additions & 3 deletions app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@ public function execute()
$model->addData($data);
$model->setIsProcessed(0);
$model->save();
$this->messageManager->addSuccess(__('You saved the search term.'));
$this->messageManager->addSuccessMessage(__('You saved the search term.'));
} catch (LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
return $this->proceedToEdit($data);
} catch (\Exception $e) {
$this->messageManager->addException($e, __('Something went wrong while saving the search query.'));
$this->messageManager->addExceptionMessage(
$e,
__('Something went wrong while saving the search query.')
);
return $this->proceedToEdit($data);
}
}
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ public function testDeleteAction()
$this->repository->expects($this->once())->method('get')->with(10)->willReturn($this->synonymGroupMock);

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

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

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

Expand All @@ -124,10 +124,10 @@ public function testDeleteActionNoId()
->willReturn(null);

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

$this->resultRedirectMock->expects($this->once())
->method('setPath')
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected function setUp()
->getMockForAbstractClass();
$this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
->disableOriginalConstructor()
->setMethods(['addSuccess', 'addError'])
->setMethods(['addSuccessMessage', 'addErrorMessage'])
->getMockForAbstractClass();
$this->pageFactory = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
->setMethods([])
Expand Down Expand Up @@ -107,7 +107,7 @@ public function testExecute()
$this->createQuery(0, 1);
$this->createQuery(1, 2);
$this->messageManager->expects($this->once())
->method('addSuccess')
->method('addSuccessMessage')
->will($this->returnSelf());
$this->resultRedirectMock->expects($this->once())
->method('setPath')
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected function setUp()

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

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

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

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

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

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

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

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

$this->messageManager->expects($this->once())->method('addException');
$this->messageManager->expects($this->once())->method('addExceptionMessage');
$this->session->expects($this->once())->method('setPageData');
$this->redirect->expects($this->once())->method('setPath')->willReturnSelf();
$this->assertSame($this->redirect, $this->controller->execute());
Expand Down