Skip to content

Replacing deprecated methods for Magento_Sitemap module. #17555

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
tiagosampaio wants to merge 1 commit into from
Closed

Replacing deprecated methods for Magento_Sitemap module. #17555

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
6 changes: 3 additions & 3 deletions app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ public function execute()
}
$sitemap->delete();
// display success message
$this->messageManager->addSuccess(__('You deleted the sitemap.'));
$this->messageManager->addSuccessMessage(__('You deleted the sitemap.'));
// go to grid
$this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
// display error message
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
// go back to edit form
$this->_redirect('adminhtml/*/edit', ['sitemap_id' => $id]);
return;
}
}
// display error message
$this->messageManager->addError(__('We can\'t find a sitemap to delete.'));
$this->messageManager->addErrorMessage(__('We can\'t find a sitemap to delete.'));
// go to grid
$this->_redirect('adminhtml/*/');
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function execute()
if ($id) {
$model->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This sitemap no longer exists.'));
$this->messageManager->addErrorMessage(__('This sitemap no longer exists.'));
$this->_redirect('adminhtml/*/');
return;
}
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ public function execute()
);
$sitemap->generateXml();

$this->messageManager->addSuccess(
$this->messageManager->addSuccessMessage(
__('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
);
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We can\'t generate the sitemap right now.'));
$this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
} finally {
$this->appEmulation->stopEnvironmentEmulation();
}
} else {
$this->messageManager->addError(__('We can\'t find a sitemap to generate.'));
$this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));
}

// go to grid
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function validatePath(array $data)
$validator->setPaths($helper->getValidPaths());
if (!$validator->isValid($path)) {
foreach ($validator->getMessages() as $message) {
$this->messageManager->addError($message);
$this->messageManager->addErrorMessage($message);
}
// save data in session
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
Expand Down Expand Up @@ -83,13 +83,13 @@ protected function saveData($data)
// save the data
$model->save();
// display success message
$this->messageManager->addSuccess(__('You saved the sitemap.'));
$this->messageManager->addSuccessMessage(__('You saved the sitemap.'));
// clear previously saved data from session
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData(false);
return $model->getId();
} catch (\Exception $e) {
// display error message
$this->messageManager->addError($e->getMessage());
$this->messageManager->addErrorMessage($e->getMessage());
// save data in session
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setFormData($data);
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function testTryToSaveInvalidDataShouldFailWithErrors()
->willReturnMap([[$helperClass, $helper], [$sessionClass, $session]]);

$this->messageManagerMock->expects($this->at(0))
->method('addError')
->method('addErrorMessage')
->withConsecutive(
[$messages[0]],
[$messages[1]]
Expand Down