Skip to content

Commit 02e977b

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-6360: Fixed the usage of deprecated methods of Messagemanager #25782
- Merge Pull Request #25782 from subash-natarajan/magento2:codefix/customer - Merged commits: 1. 4697d93 2. 21445a9 3. c71d695 4. 0b09b5e 5. f15a220 6. 50be43c 7. c22df93 8. 91584fc 9. e5bcfcd 10. 6f35328
2 parents c7ca62e + 6f35328 commit 02e977b

File tree

20 files changed

+48
-56
lines changed

20 files changed

+48
-56
lines changed

‎app/code/Magento/Customer/Controller/Account/Confirm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function execute()
168168
$metadata->setPath('/');
169169
$this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
170170
}
171-
$this->messageManager->addSuccess($this->getSuccessMessage());
171+
$this->messageManager->addSuccessMessage($this->getSuccessMessage());
172172
$resultRedirect->setUrl($this->getSuccessRedirect());
173173
return $resultRedirect;
174174
} catch (StateException $e) {

‎app/code/Magento/Customer/Controller/Account/CreatePost.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,7 @@ public function execute()
381381
$resultRedirect->setUrl($this->_redirect->success($url));
382382
} else {
383383
$this->session->setCustomerDataAsLoggedIn($customer);
384-
385384
$this->messageManager->addMessage($this->getMessageManagerSuccessMessage());
386-
387385
$requestedRedirect = $this->accountRedirect->getRedirectCookie();
388386
if (!$this->scopeConfig->getValue('customer/startup/redirect_dashboard') && $requestedRedirect) {
389387
$resultRedirect->setUrl($this->_redirect->success($requestedRedirect));

‎app/code/Magento/Customer/Controller/Account/EditPost.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public function execute()
216216
$isPasswordChanged
217217
);
218218
$this->dispatchSuccessEvent($customerCandidateDataObject);
219-
$this->messageManager->addSuccess(__('You saved the account information.'));
219+
$this->messageManager->addSuccessMessage(__('You saved the account information.'));
220220
return $resultRedirect->setPath('customer/account');
221221
} catch (InvalidEmailOrPasswordException $e) {
222222
$this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
@@ -227,15 +227,15 @@ public function execute()
227227
);
228228
$this->session->logout();
229229
$this->session->start();
230-
$this->messageManager->addError($message);
230+
$this->messageManager->addErrorMessage($message);
231231
return $resultRedirect->setPath('customer/account/login');
232232
} catch (InputException $e) {
233233
$this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
234234
foreach ($e->getErrors() as $error) {
235235
$this->messageManager->addErrorMessage($this->escaper->escapeHtml($error->getMessage()));
236236
}
237237
} catch (\Magento\Framework\Exception\LocalizedException $e) {
238-
$this->messageManager->addError($e->getMessage());
238+
$this->messageManager->addErrorMessage($e->getMessage());
239239
} catch (\Exception $e) {
240240
$this->messageManager->addException($e, __('We can\'t save the customer.'));
241241
}

‎app/code/Magento/Customer/Controller/Account/LoginPost.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,17 @@ public function execute()
213213
$message = $e->getMessage();
214214
} catch (\Exception $e) {
215215
// PA DSS violation: throwing or logging an exception here can disclose customer password
216-
$this->messageManager->addError(
216+
$this->messageManager->addErrorMessage(
217217
__('An unspecified error occurred. Please contact us for assistance.')
218218
);
219219
} finally {
220220
if (isset($message)) {
221-
$this->messageManager->addError($message);
221+
$this->messageManager->addErrorMessage($message);
222222
$this->session->setUsername($login['username']);
223223
}
224224
}
225225
} else {
226-
$this->messageManager->addError(__('A login and a password are required.'));
226+
$this->messageManager->addErrorMessage(__('A login and a password are required.'));
227227
}
228228
}
229229

‎app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public function execute()
7373
$passwordConfirmation = (string)$this->getRequest()->getPost('password_confirmation');
7474

7575
if ($password !== $passwordConfirmation) {
76-
$this->messageManager->addError(__("New Password and Confirm New Password values didn't match."));
76+
$this->messageManager->addErrorMessage(__("New Password and Confirm New Password values didn't match."));
7777
$resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
7878

7979
return $resultRedirect;
8080
}
8181
if (iconv_strlen($password) <= 0) {
82-
$this->messageManager->addError(__('Please enter a new password.'));
82+
$this->messageManager->addErrorMessage(__('Please enter a new password.'));
8383
$resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
8484

8585
return $resultRedirect;
@@ -92,17 +92,17 @@ public function execute()
9292
$password
9393
);
9494
$this->session->unsRpToken();
95-
$this->messageManager->addSuccess(__('You updated your password.'));
95+
$this->messageManager->addSuccessMessage(__('You updated your password.'));
9696
$resultRedirect->setPath('*/*/login');
9797

9898
return $resultRedirect;
9999
} catch (InputException $e) {
100-
$this->messageManager->addError($e->getMessage());
100+
$this->messageManager->addErrorMessage($e->getMessage());
101101
foreach ($e->getErrors() as $error) {
102-
$this->messageManager->addError($error->getMessage());
102+
$this->messageManager->addErrorMessage($error->getMessage());
103103
}
104104
} catch (\Exception $exception) {
105-
$this->messageManager->addError(__('Something went wrong while saving the new password.'));
105+
$this->messageManager->addErrorMessage(__('Something went wrong while saving the new password.'));
106106
}
107107
$resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
108108

‎app/code/Magento/Customer/Controller/Address/Delete.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public function execute()
2727
$address = $this->_addressRepository->getById($addressId);
2828
if ($address->getCustomerId() === $this->_getSession()->getCustomerId()) {
2929
$this->_addressRepository->deleteById($addressId);
30-
$this->messageManager->addSuccess(__('You deleted the address.'));
30+
$this->messageManager->addSuccessMessage(__('You deleted the address.'));
3131
} else {
32-
$this->messageManager->addError(__('We can\'t delete the address right now.'));
32+
$this->messageManager->addErrorMessage(__('We can\'t delete the address right now.'));
3333
}
3434
} catch (\Exception $other) {
3535
$this->messageManager->addException($other, __('We can\'t delete the address right now.'));

‎app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ public function execute()
139139
if ($customerId = $this->getRequest()->getParam('customer_id')) {
140140
try {
141141
$this->tokenService->revokeCustomerAccessToken($customerId);
142-
$this->messageManager->addSuccess(__('You have revoked the customer\'s tokens.'));
142+
$this->messageManager->addSuccessMessage(__('You have revoked the customer\'s tokens.'));
143143
$resultRedirect->setPath('customer/index/edit', ['id' => $customerId, '_current' => true]);
144144
} catch (\Exception $e) {
145-
$this->messageManager->addError($e->getMessage());
145+
$this->messageManager->addErrorMessage($e->getMessage());
146146
$resultRedirect->setPath('customer/index/edit', ['id' => $customerId, '_current' => true]);
147147
}
148148
} else {
149-
$this->messageManager->addError(__('We can\'t find a customer to revoke.'));
149+
$this->messageManager->addErrorMessage(__('We can\'t find a customer to revoke.'));
150150
$resultRedirect->setPath('customer/index/index');
151151
}
152152
return $resultRedirect;

‎app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
@@ -9,6 +8,9 @@
98
use Magento\Framework\App\Action\HttpPostActionInterface;
109
use Magento\Framework\Exception\NoSuchEntityException;
1110

11+
/**
12+
* Class Delete
13+
*/
1214
class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
1315
{
1416
/**
@@ -24,12 +26,12 @@ public function execute()
2426
if ($id) {
2527
try {
2628
$this->groupRepository->deleteById($id);
27-
$this->messageManager->addSuccess(__('You deleted the customer group.'));
29+
$this->messageManager->addSuccessMessage(__('You deleted the customer group.'));
2830
} catch (NoSuchEntityException $e) {
29-
$this->messageManager->addError(__('The customer group no longer exists.'));
31+
$this->messageManager->addErrorMessage(__('The customer group no longer exists.'));
3032
return $resultRedirect->setPath('customer/*/');
3133
} catch (\Exception $e) {
32-
$this->messageManager->addError($e->getMessage());
34+
$this->messageManager->addErrorMessage($e->getMessage());
3335
return $resultRedirect->setPath('customer/group/edit', ['id' => $id]);
3436
}
3537
}

‎app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ public function execute()
9393

9494
$this->groupRepository->save($customerGroup);
9595

96-
$this->messageManager->addSuccess(__('You saved the customer group.'));
96+
$this->messageManager->addSuccessMessage(__('You saved the customer group.'));
9797
$resultRedirect->setPath('customer/group');
9898
} catch (\Exception $e) {
99-
$this->messageManager->addError($e->getMessage());
99+
$this->messageManager->addErrorMessage($e->getMessage());
100100
if ($customerGroup != null) {
101101
$this->storeCustomerGroupDataToSession(
102102
$this->dataObjectProcessor->buildOutputDataArray(

‎app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function execute()
6464
$collection = $this->filter->getCollection($this->collectionFactory->create());
6565
return $this->massAction($collection);
6666
} catch (\Exception $e) {
67-
$this->messageManager->addError($e->getMessage());
67+
$this->messageManager->addErrorMessage($e->getMessage());
6868
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
6969
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
7070
return $resultRedirect->setPath($this->redirectUrl);
@@ -73,6 +73,7 @@ public function execute()
7373

7474
/**
7575
* Return component referer url
76+
*
7677
* TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way
7778
*
7879
* @return null|string

0 commit comments

Comments
 (0)