Skip to content

Commit c7d22db

Browse files
committed
Replacing deprecated methods for Magento_Security module.
1 parent 1cb9235 commit c7d22db

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

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;

app/code/Magento/Security/Model/Plugin/LoginController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function beforeExecute(Login $login)
5353
{
5454
$logoutReasonCode = $this->securityCookie->getLogoutReasonCookie();
5555
if ($this->isLoginForm($login) && $logoutReasonCode >= 0) {
56-
$this->messageManager->addError(
56+
$this->messageManager->addErrorMessage(
5757
$this->sessionsManager->getLogoutReasonMessageByStatus($logoutReasonCode)
5858
);
5959
$this->securityCookie->deleteLogoutReasonCookie();

app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/LogoutAllTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function setUp()
7474

7575
$this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
7676
->disableOriginalConstructor()
77-
->setMethods(['addSuccess', 'addError', 'addException'])
77+
->setMethods(['addSuccessMessage', 'addErrorMessage', 'addExceptionMessage'])
7878
->getMockForAbstractClass();
7979
$this->contextMock->expects($this->any())
8080
->method('getMessageManager')
@@ -132,12 +132,12 @@ public function testExecute()
132132
$this->sessionsManager->expects($this->once())
133133
->method('logoutOtherUserSessions');
134134
$this->messageManager->expects($this->once())
135-
->method('addSuccess')
135+
->method('addSuccessMessage')
136136
->with($successMessage);
137137
$this->messageManager->expects($this->never())
138-
->method('addError');
138+
->method('addErrorMessage');
139139
$this->messageManager->expects($this->never())
140-
->method('addException');
140+
->method('addExceptionMessage');
141141
$this->responseMock->expects($this->once())
142142
->method('setRedirect');
143143
$this->actionFlagMock->expects($this->once())
@@ -158,7 +158,7 @@ public function testExecuteLocalizedException()
158158
->method('logoutOtherUserSessions')
159159
->willThrowException(new LocalizedException($phrase));
160160
$this->messageManager->expects($this->once())
161-
->method('addError')
161+
->method('addErrorMessage')
162162
->with($phrase);
163163
$this->controller->execute();
164164
}
@@ -173,7 +173,7 @@ public function testExecuteException()
173173
->method('logoutOtherUserSessions')
174174
->willThrowException(new \Exception());
175175
$this->messageManager->expects($this->once())
176-
->method('addException')
176+
->method('addSuccessMessageptionMessage')
177177
->with(new \Exception(), $phrase);
178178
$this->controller->execute();
179179
}

app/code/Magento/Security/Test/Unit/Model/Plugin/AuthSessionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function testAroundProlongSessionIsNotActiveAndIsNotAjaxRequest()
112112
->willReturn($errorMessage);
113113

114114
$this->messageManagerMock->expects($this->once())
115-
->method('addError')
115+
->method('addErrorMessage')
116116
->with($errorMessage);
117117

118118
$this->model->aroundProlong($this->authSessionMock, $proceed);

app/code/Magento/Security/Test/Unit/Model/Plugin/LoginControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function testBeforeExecute()
103103
->willReturn($errorMessage);
104104

105105
$this->messageManagerMock->expects($this->once())
106-
->method('addError')
106+
->method('addErrorMessage')
107107
->with($errorMessage);
108108

109109
$this->securityCookieMock->expects($this->once())

0 commit comments

Comments
 (0)