[Login As Customer] get rid of the object manager

Author: ihorvansach

app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php

@@ -20,19 +20,19 @@ class Index extends \Magento\Backend\App\Action
     /**
      * @var \Magento\LoginAsCustomer\Model\Login
      */
-    private $loginModel = null;
+    private $loginModel;
 
     /**
      * Index constructor.
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\LoginAsCustomer\Model\Login|null $login
+     * @param \Magento\LoginAsCustomer\Model\Login $loginModel
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\LoginAsCustomer\Model\Login $loginModel = null
+        \Magento\LoginAsCustomer\Model\Login $loginModel
     ) {
         parent::__construct($context);
-        $this->loginModel = $loginModel ?: $this->_objectManager->get(\Magento\LoginAsCustomer\Model\Login::class);
+        $this->loginModel = $loginModel;
     }
     /**
      * Login as customer log

app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php

@@ -22,46 +22,50 @@ class Login extends \Magento\Backend\App\Action
      * @var \Magento\LoginAsCustomer\Model\Login
      */
     private $loginModel;
+
     /**
      * @var \Magento\Backend\Model\Auth\Session
      */
-    private $authSession  = null;
+    private $authSession;
+
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    private $storeManager  = null;
+    private $storeManager;
+
     /**
      * @var \Magento\Framework\Url
      */
-    private $url = null;
+    private $url;
+
     /**
      * @var \Magento\LoginAsCustomer\Model\Config
      */
-    private $config = null;
+    private $config;
 
     /**
      * Login constructor.
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\LoginAsCustomer\Model\Login|null $loginModel
-     * @param \Magento\Backend\Model\Auth\Session|null $authSession
-     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
-     * @param \Magento\Framework\Url|null $url
-     * @param \Magento\LoginAsCustomer\Model\Config|null $config
+     * @param \Magento\LoginAsCustomer\Model\Login $loginModel
+     * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Url $url
+     * @param \Magento\LoginAsCustomer\Model\Config $config
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\LoginAsCustomer\Model\Login $loginModel = null,
-        \Magento\Backend\Model\Auth\Session $authSession = null,
-        \Magento\Store\Model\StoreManagerInterface $storeManager = null,
-        \Magento\Framework\Url $url = null,
-        \Magento\LoginAsCustomer\Model\Config $config = null
+        \Magento\LoginAsCustomer\Model\Login $loginModel,
+        \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Url $url,
+        \Magento\LoginAsCustomer\Model\Config $config
     ) {
         parent::__construct($context);
-        $this->loginModel = $loginModel ?: $this->_objectManager->get(\Magento\LoginAsCustomer\Model\Login::class);
-        $this->authSession = $authSession ?: $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class);
-        $this->storeManager = $storeManager ?: $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->url = $url ?: $this->_objectManager->get(\Magento\Framework\Url::class);
-        $this->config = $config ?: $this->_objectManager->get(\Magento\LoginAsCustomer\Model\Config::class);
+        $this->loginModel = $loginModel;
+        $this->authSession = $authSession;
+        $this->storeManager = $storeManager;
+        $this->url = $url;
+        $this->config = $config;
     }
     /**
      * Login as customer action

app/code/Magento/LoginAsCustomer/Controller/Login/Index.php

@@ -17,19 +17,19 @@ class Index extends \Magento\Framework\App\Action\Action
     /**
      * @var \Magento\LoginAsCustomer\Model\Login
      */
-    private $loginModel = null;
+    private $loginModel;
 
     /**
      * Index constructor.
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\LoginAsCustomer\Model\Login|null $loginModel
+     * @param \Magento\LoginAsCustomer\Model\Login $loginModel
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\LoginAsCustomer\Model\Login $loginModel = null
+        \Magento\LoginAsCustomer\Model\Login $loginModel
     ) {
         parent::__construct($context);
-        $this->loginModel = $loginModel ?: $this->_objectManager->get(\Magento\LoginAsCustomer\Model\Login::class);
+        $this->loginModel = $loginModel;
     }
     /**
      * Login as customer action

app/code/Magento/LoginAsCustomer/Model/Login.php

@@ -77,19 +77,18 @@ class Login extends \Magento\Framework\Model\AbstractModel
 
     /**
      * Initialize dependencies.
-     *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Framework\Math\Random $random
      * @param \Magento\Checkout\Model\Cart $cart
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
-     * @param null|\Magento\Checkout\Model\Session $checkoutSession
-     * @param null|\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -99,26 +98,20 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Framework\Math\Random $random,
         \Magento\Checkout\Model\Cart $cart,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = [],
-        $checkoutSession = null,
-        $scopeConfig = null
+        array $data = []
     ) {
         $this->_customerFactory = $customerFactory;
         $this->_customerSession = $customerSession;
         $this->_checkoutSession = $checkoutSession;
         $this->_dateTime = $dateTime;
         $this->_random = $random;
         $this->cart = $cart;
-
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_checkoutSession = $checkoutSession ?: $objectManager->get(
-            \Magento\Checkout\Model\Session::class
-        );
-        $this->scopeConfig = $scopeConfig ?: $objectManager->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        );
+        $this->_checkoutSession = $checkoutSession;
+        $this->scopeConfig = $scopeConfig;
 
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }