Merge pull request #28 from yuriyhamulevych/master

2032-objectManager move classes to constructor [Implemented]

Author: magefan

Controller/Adminhtml/Login/Index.php

@@ -13,6 +13,24 @@
  */
 class Index extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magefan\LoginAsCustomer\Model\Login
+     */
+    protected $login = null;
+
+    /**
+     * Index constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magefan\LoginAsCustomer\Model\Login|null $login
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magefan\LoginAsCustomer\Model\Login $login = null
+    ) {
+        parent::__construct($context);
+        $objectManager = $this->_objectManager;
+        $this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
+    }
     /**
      * Login as customer log
      *
@@ -25,9 +43,7 @@ public function execute()
             return;
         }
 
-        $this->_objectManager
-            ->create(\Magefan\LoginAsCustomer\Model\Login::class)
-            ->deleteNotUsed();
+        $this->login->deleteNotUsed();
 
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magefan_LoginAsCustomer::login_log');

Controller/Adminhtml/Login/Login.php

@@ -9,10 +9,46 @@
 namespace Magefan\LoginAsCustomer\Controller\Adminhtml\Login;
 
 /**
- * LoginAsCustomer login action
+ * Class Login
+ * @package Magefan\LoginAsCustomer\Controller\Adminhtml\Login
  */
 class Login extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magefan\LoginAsCustomer\Model\Login
+     */
+    protected $login;
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $session  = null;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager  = null;
+    /**
+     * @var \Magento\Framework\Url
+     */
+    protected $url = null;
+    /**
+     * Login constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magefan\LoginAsCustomer\Model\Login $login
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magefan\LoginAsCustomer\Model\Login $login = null,
+        \Magento\Backend\Model\Auth\Session $session = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null,
+        \Magento\Framework\Url $url = null
+    ) {
+        parent::__construct($context);
+        $objectManager = $this->_objectManager;
+        $this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
+        $this->session = $session ?: $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+        $this->storeManager = $storeManager ?: $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->url = $url ?: $objectManager->get(\Magento\Framework\Url::class);
+    }
     /**
      * Login as customer action
      *
@@ -22,9 +58,7 @@ public function execute()
     {
         $customerId = (int) $this->getRequest()->getParam('customer_id');
 
-        $login = $this->_objectManager
-            ->create(\Magefan\LoginAsCustomer\Model\Login::class)
-            ->setCustomerId($customerId);
+        $login = $this->login->setCustomerId($customerId);
 
         $login->deleteNotUsed();
 
@@ -36,22 +70,18 @@ public function execute()
             return;
         }
 
-        $user = $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->getUser();
+        $user = $this->session->getUser();
         $login->generate($user->getId());
         $customerStoreId = $this->getCustomerStoreId($customer);
 
-        $storeManager = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-
         if ($customerStoreId) {
-            $store = $storeManager->getStore($customerStoreId);    
+            $store = $this->storeManager->getStore($customerStoreId);
         } else {
-            $store = $storeManager->getDefaultStoreView();    
+            $store = $this->storeManager->getDefaultStoreView();
         }
 
-        $url = $this->_objectManager->get(\Magento\Framework\Url::class)
-            ->setScope($store);
-
-        $redirectUrl = $url->getUrl('loginascustomer/login/index', ['secret' => $login->getSecret(), '_nosid' => true]);
+        $redirectUrl = $this->url->setScope($store)
+            ->getUrl('loginascustomer/login/index', ['secret' => $login->getSecret(), '_nosid' => true]);
 
         $this->getResponse()->setRedirect($redirectUrl);
     }

Controller/Login/Index.php

@@ -12,6 +12,24 @@
  */
 class Index extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magefan\LoginAsCustomer\Model\Login
+     */
+    protected $login = null;
+
+    /**
+     * Index constructor.
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magefan\LoginAsCustomer\Model\Login|null $login
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magefan\LoginAsCustomer\Model\Login $login = null
+    ) {
+        parent::__construct($context);
+        $objectManager = $this->_objectManager;
+        $this->login = $login ?: $objectManager->get(\Magefan\LoginAsCustomer\Model\Login::class);
+    }
     /**
      * Login as customer action
      *
@@ -50,9 +68,7 @@ protected function _initLogin()
             return false;
         }
 
-        $login = $this->_objectManager
-            ->create(\Magefan\LoginAsCustomer\Model\Login::class)
-            ->loadNotUsed($secret);
+        $login = $this->login->loadNotUsed($secret);
 
         if ($login->getId()) {
             return $login;