[Login As Customer] Addded declare strict_types=1

ihorvansach · naydav · commit 51a00b9d9fa2 · 2020-04-15T04:17:54.000-05:00
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Block\Adminhtml\Customer\Edit;
 
@@ -37,7 +38,7 @@ public function __construct(
     /**
      * @return array
      */
-    public function getButtonData()
+    public function getButtonData(): array
     {
         $customerId = $this->getCustomerId();
         $data = [];
@@ -57,7 +58,7 @@ public function getButtonData()
     /**
      * @return string
      */
-    public function getInvalidateTokenUrl()
+    public function getInvalidateTokenUrl(): string
     {
         return $this->getUrl('loginascustomer/login/login', ['customer_id' => $this->getCustomerId()]);
     }
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Block\Adminhtml;
 
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Store/SaveButton.php b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Store/SaveButton.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Block\Adminhtml\Store;
 
@@ -16,7 +17,7 @@ class SaveButton implements ButtonProviderInterface
     /**
      * @return array
      */
-    public function getButtonData()
+    public function getButtonData(): array
     {
         return [
             'label' => __('Login As Customer'),
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Grid.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Grid.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php b/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\LoginAsCustomer\Controller\Login;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * LoginAsCustomer login action
  */
@@ -34,18 +38,18 @@ public function __construct(
      */
     public function execute()
     {
-        $login = $this->_initLogin();
-        if (!$login) {
-            $this->_redirect('/');
-            return;
-        }
-
         try {
+            $login = $this->_initLogin();
+
             /* Log in */
             $login->authenticateCustomer();
             $this->messageManager->addSuccessMessage(
                 __('You are logged in as customer: %1', $login->getCustomer()->getName())
             );
+        } catch (LocalizedException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+            $this->_redirect('/');
+            return;
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         }
@@ -55,23 +59,21 @@ public function execute()
 
     /**
      * Init login info
-     * @return false || \Magento\LoginAsCustomer\Model\Login
+     * @return \Magento\LoginAsCustomer\Model\Login
      */
-    private function _initLogin()
+    private function _initLogin(): \Magento\LoginAsCustomer\Model\Login
     {
         $secret = $this->getRequest()->getParam('secret');
         if (!$secret) {
-            $this->messageManager->addErrorMessage(__('Cannot login to account. No secret key provided.'));
-            return false;
+            throw LocalizedException(__('Cannot login to account. No secret key provided.'));
         }
 
         $login = $this->loginModel->loadNotUsed($secret);
 
         if ($login->getId()) {
             return $login;
         } else {
-            $this->messageManager->addErrorMessage(__('Cannot login to account. Secret key is not valid.'));
-            return false;
+            throw LocalizedException(__('Cannot login to account. Secret key is not valid'));
         }
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php b/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 namespace Magento\LoginAsCustomer\Controller\Login;
 
 /**
diff --git a/app/code/Magento/LoginAsCustomer/Model/Config.php b/app/code/Magento/LoginAsCustomer/Model/Config.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model;
 
@@ -61,31 +62,31 @@ public function getConfig($path, $storeId = null)
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
-    public function isEnabled()
+    public function isEnabled():bool
     {
-        return $this->getConfig(
+        return (bool)$this->getConfig(
             self::XML_PATH_EXTENSION_ENABLED
         );
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
-    public function isKeyMissing()
+    public function isKeyMissing(): bool
     {
         return !$this->getConfig(
             self::XML_PATH_KEY
         ) && $this->metadata->getEdition() != 'C' . strrev('ytinummo');
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
-    public function getStoreViewLogin()
+    public function getStoreViewLogin(): bool
     {
-        return $this->getConfig(
+        return (bool)$this->getConfig(
             self::STORE_VIEW_TO_LOGIN_IN
         );
     }
diff --git a/app/code/Magento/LoginAsCustomer/Model/Config/Source/StoreViewLogin.php b/app/code/Magento/LoginAsCustomer/Model/Config/Source/StoreViewLogin.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model\Config\Source;
 
@@ -27,7 +28,7 @@ class StoreViewLogin implements \Magento\Framework\Data\OptionSourceInterface
      *
      * @return array
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return  [
             ['value' => self::AUTODETECT, 'label' => __('Auto-Detection (default)')],
diff --git a/app/code/Magento/LoginAsCustomer/Model/Login.php b/app/code/Magento/LoginAsCustomer/Model/Login.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model;
 
@@ -137,7 +138,7 @@ protected function _construct()
      * @param  string $secret
      * @return self
      */
-    public function loadNotUsed($secret)
+    public function loadNotUsed($secret): self
     {
         return $this->getCollection()
             ->addFieldToFilter('secret', $secret)
@@ -151,7 +152,7 @@ public function loadNotUsed($secret)
      * Delete not used credentials
      * @return void
      */
-    public function deleteNotUsed()
+    public function deleteNotUsed(): void
     {
         $resource = $this->getResource();
         $resource->getConnection()->delete(
@@ -165,9 +166,9 @@ public function deleteNotUsed()
 
     /**
      * Retrieve login datetime point
-     * @return [type] [description]
+     * @return string
      */
-    private function getDateTimePoint()
+    private function getDateTimePoint(): string
     {
         return date('Y-m-d H:i:s', $this->_dateTime->gmtTimestamp() - self::TIME_FRAME);
     }
@@ -176,7 +177,7 @@ private function getDateTimePoint()
      * Retrieve customer
      * @return \Magento\Customer\Model\Customer
      */
-    public function getCustomer()
+    public function getCustomer(): \Magento\Customer\Model\Customer
     {
         if (is_null($this->_customer)) {
             $this->_customer = $this->_customerFactory->create()
@@ -187,9 +188,9 @@ public function getCustomer()
 
     /**
      * Login Customer
-     * @return false || \Magento\Customer\Model\Customer
+     * @return \Magento\Customer\Model\Customer
      */
-    public function authenticateCustomer()
+    public function authenticateCustomer(): \Magento\Customer\Model\Customer
     {
         if ($this->_customerSession->getId()) {
             /* Logout if logged in */
@@ -244,7 +245,7 @@ public function authenticateCustomer()
      * @param  int $adminId
      * @return $this
      */
-    public function generate($adminId)
+    public function generate($adminId): self
     {
         return $this->setData([
             'customer_id' => $this->getCustomerId(),
diff --git a/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php b/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model\PageCache;
 
@@ -44,7 +45,7 @@ public function __construct(
      * @param bool $result
      * @return bool
      */
-    public function afterIsEnabled(\Magento\PageCache\Model\Config $subject, $result)
+    public function afterIsEnabled(\Magento\PageCache\Model\Config $subject, $result): bool
     {
         if ($result) {
             $disable = $this->_scopeConfig->getValue(
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login/Collection.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login/Collection.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model\ResourceModel\Login;
 
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login/Grid/Collection.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/Login/Grid/Collection.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Model\ResourceModel\Login\Grid;
 
@@ -28,7 +29,7 @@ protected function _construct()
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _initSelect(): self
     {
         parent::_initSelect();
         $this->getSelect()
diff --git a/app/code/Magento/LoginAsCustomer/Observer/WbsiterestrictionFrontendObserver.php b/app/code/Magento/LoginAsCustomer/Observer/WbsiterestrictionFrontendObserver.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Observer;
 
@@ -15,8 +16,10 @@ class WbsiterestrictionFrontendObserver implements ObserverInterface
 {
     /**
      * Disable website stub or private sales restriction for loginascustomer
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer): void
     {
         $controller = $observer->getController();
         if ($controller->getRequest()->getModuleName() == 'loginascustomer') {
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\LoginAsCustomer\Plugin\Button;
 
@@ -49,7 +50,7 @@ public function beforePushButtons(
         Interceptor $subject,
         AbstractBlock $context,
         ButtonList $buttonList
-    ) {
+    ):void {
         $order = false;
         $nameInLayout = $context->getNameInLayout();
 
@@ -83,8 +84,8 @@ public function beforePushButtons(
      *
      * @return bool
      */
-    private function isAllowed()
+    private function isAllowed(): bool
     {
-        return $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
+        return (bool)$this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Setup/InstallSchema.php b/app/code/Magento/LoginAsCustomer/Setup/InstallSchema.php
diff --git a/app/code/Magento/LoginAsCustomer/Ui/Component/Listing/Column/Login.php b/app/code/Magento/LoginAsCustomer/Ui/Component/Listing/Column/Login.php
diff --git a/app/code/Magento/LoginAsCustomer/Ui/DataProvider/Store/Form/StoreDataProvider.php b/app/code/Magento/LoginAsCustomer/Ui/DataProvider/Store/Form/StoreDataProvider.php
