magento2-login-as-customer/issues/90: Static tests fix.

engcom-Foxtrot · engcom-Foxtrot · commit 4bcb14e8bdba · 2020-04-23T16:32:14.000+03:00
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php
@@ -9,6 +9,8 @@
 
 /**
  * Login as customer log
+ *
+ * @api
  */
 class Login extends \Magento\Backend\Block\Widget\Grid\Container
 {
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php
@@ -7,14 +7,12 @@
 
 namespace Magento\LoginAsCustomer\Plugin\Button;
 
-use \Magento\LoginAsCustomerAdvanced\Controller\Adminhtml\Order\Login as LoginController;
-use \Magento\Backend\Block\Widget\Button\Toolbar\Interceptor;
-use \Magento\Framework\View\Element\AbstractBlock;
-use \Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\Toolbar;
+use Magento\Framework\View\Element\AbstractBlock;
 
 /**
- * Class ToolbarPlugin
- * @package Magento\LoginAsCustomerAdvanced\Plugin\Button
+ * Plugin for \Magento\Backend\Block\Widget\Button\Toolbar.
  */
 class ToolbarPlugin
 {
@@ -42,12 +40,15 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Backend\Block\Widget\Button\Toolbar\Interceptor $subject
+     * Add Login As Customer button.
+     *
+     * @param \Magento\Backend\Block\Widget\Button\Toolbar $subject
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforePushButtons(
-        Interceptor $subject,
+        Toolbar $subject,
         AbstractBlock $context,
         ButtonList $buttonList
     ):void {
@@ -71,7 +72,11 @@ public function beforePushButtons(
                     ]);
                     $buttonList->add(
                         'guest_to_customer',
-                        ['label' => __('Login As Customer'), 'onclick' => 'window.open(\'' . $buttonUrl . '\')', 'class' => 'reset'],
+                        [
+                            'label' => __('Login As Customer'),
+                            'onclick' => 'window.open(\'' . $buttonUrl . '\')',
+                            'class' => 'reset'
+                        ],
                         -1
                     );
                 }
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
@@ -4,11 +4,21 @@
     "require": {
         "magento/framework": "*",
         "magento/module-backend": "*",
-        "magento/module-sales": "*",
+        "magento/module-checkout": "*",
         "magento/module-customer": "*",
-        "magento/module-checkout": "*"
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
+    },
+    "suggest": {
+        "magento/module-page-cache": "*"
     },
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "version": "2.2.1",
     "autoload": {
         "files": [ "registration.php" ],
diff --git a/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml
@@ -13,7 +13,7 @@
     <type name="Magento\Customer\CustomerData\SectionPoolInterface">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">
-                <item name="logged_as_customer" xsi:type="string">Magento\LoginAsCustomer\CustomerData\LoginAsCustomer</item>
+                <item name="loggedAsCustomer" xsi:type="string">Magento\LoginAsCustomer\CustomerData\LoginAsCustomer</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etclayout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <update handle="loginascustomer_login_grid_block"/>
     <container name="root">
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml
@@ -18,47 +18,47 @@
                 </arguments>
 
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="loginascustomer.grid.columnSet" as="grid.columnSet">
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="login_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.loginId" as="login_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">ID</argument>
                             <argument name="index" xsi:type="string">login_id</argument>
                             <argument name="header_css_class" xsi:type="string">col-id</argument>
                             <argument name="column_css_class" xsi:type="string">col-id</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="customer_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.customerId" as="customer_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer ID</argument>
                             <argument name="index" xsi:type="string">customer_id</argument>
                             <argument name="header_css_class" xsi:type="string">col-title</argument>
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="email">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.email" as="email">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer Email</argument>
                             <argument name="index" xsi:type="string">email</argument>
                             <argument name="header_css_class" xsi:type="string">col-title</argument>
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="admin_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.adminId" as="admin_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Admin ID</argument>
                             <argument name="index" xsi:type="string">admin_id</argument>
                             <argument name="header_css_class" xsi:type="string">col-title</argument>
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="username">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.username" as="username">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Admin Name</argument>
                             <argument name="index" xsi:type="string">username</argument>
                             <argument name="header_css_class" xsi:type="string">col-title</argument>
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="created_at">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.createdAt" as="created_at">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Logged In</argument>
                             <argument name="index" xsi:type="string">created_at</argument>
diff --git a/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js
@@ -22,7 +22,7 @@ define([
             this._super();
 
             this.customer = customerData.get('customer');
-            this.loginAsCustomer = customerData.get('logged_as_customer');
+            this.loginAsCustomer = customerData.get('loggedAsCustomer');
             this.isVisible(this.loginAsCustomer().admin_user_id);
 
             this.notificationText = $.mage.__('You are connected as <strong>%1</strong> on %2')

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Login as customer log`
	`12`	`+ *`
	`13`	`+ * @api`
`12`	`14`	`*/`
`13`	`15`	`class Login extends \Magento\Backend\Block\Widget\Grid\Container`
`14`	`16`	`{`