Skip to content

Commit b9ca957

Browse files
ihorvansachihorvansach
committed
Code style improvements
1 parent 57bbbe7 commit b9ca957

File tree

5 files changed

+32
-31
lines changed

5 files changed

+32
-31
lines changed

‎Controller/Adminhtml/Login/Index.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Index extends \Magento\Backend\App\Action
1616
/**
1717
* @var \Magefan\LoginAsCustomer\Model\Login
1818
*/
19-
protected $login = null;
19+
protected $loginModel = null;
2020

2121
/**
2222
* Index constructor.
@@ -25,11 +25,10 @@ class Index extends \Magento\Backend\App\Action
2525
*/
2626
public function __construct(
2727
\Magento\Backend\App\Action\Context $context,
28-
\Magefan\LoginAsCustomer\Model\Login $login = null
28+
\Magefan\LoginAsCustomer\Model\Login $loginModel = null
2929
) {
3030
parent::__construct($context);
31-
$objectManager = $this->_objectManager;
32-
$this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
31+
$this->loginModel = $loginModel ?: $this->_objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
3332
}
3433
/**
3534
* Login as customer log
@@ -43,7 +42,7 @@ public function execute()
4342
return;
4443
}
4544

46-
$this->login->deleteNotUsed();
45+
$this->loginModel->deleteNotUsed();
4746

4847
$this->_view->loadLayout();
4948
$this->_setActiveMenu('Magefan_LoginAsCustomer::login_log');

‎Controller/Adminhtml/Login/Login.php

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ class Login extends \Magento\Backend\App\Action
1717
/**
1818
* @var \Magefan\LoginAsCustomer\Model\Login
1919
*/
20-
protected $login;
20+
protected $loginModel;
2121
/**
2222
* @var \Magento\Backend\Model\Auth\Session
2323
*/
24-
protected $session = null;
24+
protected $authSession = null;
2525
/**
2626
* @var \Magento\Store\Model\StoreManagerInterface
2727
*/
@@ -30,24 +30,27 @@ class Login extends \Magento\Backend\App\Action
3030
* @var \Magento\Framework\Url
3131
*/
3232
protected $url = null;
33+
3334
/**
3435
* Login constructor.
3536
* @param \Magento\Backend\App\Action\Context $context
36-
* @param \Magefan\LoginAsCustomer\Model\Login $login
37+
* @param \Magefan\LoginAsCustomer\Model\Login|null $loginModel
38+
* @param \Magento\Backend\Model\Auth\Session|null $authSession
39+
* @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
40+
* @param \Magento\Framework\Url|null $url
3741
*/
3842
public function __construct(
3943
\Magento\Backend\App\Action\Context $context,
40-
\Magefan\LoginAsCustomer\Model\Login $login = null,
41-
\Magento\Backend\Model\Auth\Session $session = null,
44+
\Magefan\LoginAsCustomer\Model\Login $loginModel = null,
45+
\Magento\Backend\Model\Auth\Session $authSession = null,
4246
\Magento\Store\Model\StoreManagerInterface $storeManager = null,
4347
\Magento\Framework\Url $url = null
4448
) {
4549
parent::__construct($context);
46-
$objectManager = $this->_objectManager;
47-
$this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
48-
$this->session = $session ?: $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
49-
$this->storeManager = $storeManager ?: $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
50-
$this->url = $url ?: $objectManager->get(\Magento\Framework\Url::class);
50+
$this->loginModel = $loginModel ?: $this->_objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
51+
$this->authSession = $authSession ?: $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class);
52+
$this->storeManager = $storeManager ?: $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
53+
$this->url = $url ?: $this->_objectManager->get(\Magento\Framework\Url::class);
5154
}
5255
/**
5356
* Login as customer action
@@ -58,7 +61,7 @@ public function execute()
5861
{
5962
$customerId = (int) $this->getRequest()->getParam('customer_id');
6063

61-
$login = $this->login->setCustomerId($customerId);
64+
$login = $this->loginModel->setCustomerId($customerId);
6265

6366
$login->deleteNotUsed();
6467

@@ -70,7 +73,7 @@ public function execute()
7073
return;
7174
}
7275

73-
$user = $this->session->getUser();
76+
$user = $this->authSession->getUser();
7477
$login->generate($user->getId());
7578
$customerStoreId = $this->getCustomerStoreId($customer);
7679

‎Controller/Login/Index.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@ class Index extends \Magento\Framework\App\Action\Action
1515
/**
1616
* @var \Magefan\LoginAsCustomer\Model\Login
1717
*/
18-
protected $login = null;
18+
protected $loginModel = null;
1919

2020
/**
2121
* Index constructor.
22-
* @param \Magento\Backend\App\Action\Context $context
23-
* @param \Magefan\LoginAsCustomer\Model\Login|null $login
22+
* @param \Magento\Framework\App\Action\Context $context
23+
* @param \Magefan\LoginAsCustomer\Model\Login|null $loginModel
2424
*/
2525
public function __construct(
26-
\Magento\Backend\App\Action\Context $context,
27-
\Magefan\LoginAsCustomer\Model\Login $login = null
26+
\Magento\Framework\App\Action\Context $context,
27+
\Magefan\LoginAsCustomer\Model\Login $loginModel = null
2828
) {
2929
parent::__construct($context);
30-
$objectManager = $this->_objectManager;
31-
$this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
30+
$this->loginModel = $loginModel ?: $this->_objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
3231
}
3332
/**
3433
* Login as customer action
@@ -46,11 +45,11 @@ public function execute()
4645
try {
4746
/* Log in */
4847
$login->authenticateCustomer();
49-
$this->messageManager->addSuccess(
48+
$this->messageManager->addSuccessMessage(
5049
__('You are logged in as customer: %1', $login->getCustomer()->getName())
5150
);
5251
} catch (\Exception $e) {
53-
$this->messageManager->addError($e->getMessage());
52+
$this->messageManager->addErrorMessage($e->getMessage());
5453
}
5554

5655
$this->_redirect('*/*/proceed');
@@ -64,16 +63,16 @@ protected function _initLogin()
6463
{
6564
$secret = $this->getRequest()->getParam('secret');
6665
if (!$secret) {
67-
$this->messageManager->addError(__('Cannot login to account. No secret key provided.'));
66+
$this->messageManager->addErrorMessage(__('Cannot login to account. No secret key provided.'));
6867
return false;
6968
}
7069

71-
$login = $this->login->loadNotUsed($secret);
70+
$login = $this->loginModel->loadNotUsed($secret);
7271

7372
if ($login->getId()) {
7473
return $login;
7574
} else {
76-
$this->messageManager->addError(__('Cannot login to account. Secret key is not valid.'));
75+
$this->messageManager->addErrorMessage(__('Cannot login to account. Secret key is not valid.'));
7776
return false;
7877
}
7978
}

‎Model/Login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function __construct(
131131
*/
132132
protected function _construct()
133133
{
134-
$this->_init('Magefan\LoginAsCustomer\Model\ResourceModel\Login');
134+
$this->_init(\Magefan\LoginAsCustomer\Model\ResourceModel\Login::class);
135135
}
136136

137137
/**

‎Model/ResourceModel/Login/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
2222
protected function _construct()
2323
{
2424
parent::_construct();
25-
$this->_init('Magefan\LoginAsCustomer\Model\Login', 'Magefan\LoginAsCustomer\Model\ResourceModel\Login');
25+
$this->_init(\Magefan\LoginAsCustomer\Model\Login::class, \Magefan\LoginAsCustomer\Model\ResourceModel\Login::class);
2626
}
2727
}

0 commit comments

Comments
 (0)