Merge branch 'magento2-login-as-customer#150V3' of github.com:magento/magento2-login-as-customer into login-as-customer-150

naydav · naydav · commit 92af26b63bc0 · 2020-08-06T20:55:34.000-05:00
diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -10,7 +10,6 @@
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
-use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
 
 /**
  * @inheritdoc
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
@@ -8,9 +8,7 @@
 namespace Magento\LoginAsCustomerAssistance\Api;
 
 /**
- * LoginAsCustomerAssistance config
- *
- * @api
+ * LoginAsCustomerAssistance config.
  */
 interface ConfigInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Get 'assistance_allowed' attribute from Customer.
- *
- * @api
  */
 interface IsAssistanceEnabledInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Set 'assistance_allowed' attribute to Customer.
- *
- * @api
  */
 interface SetAssistanceInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -10,12 +10,9 @@
 use Magento\Backend\Block\Template;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
 
 /**
  * Pop-up for Login as Customer button then Login as Customer is not allowed.
- *
- * @api
  */
 class NotAllowedPopup extends Template
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
@@ -10,7 +10,6 @@
 use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
-use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 
 /**
@@ -30,6 +29,7 @@ class IsLoginAsCustomerAllowedResolver implements IsLoginAsCustomerEnabledForCus
 
     /**
      * @param IsAssistanceEnabledInterface $isAssistanceEnabled
+     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
      */
     public function __construct(
         IsAssistanceEnabledInterface $isAssistanceEnabled,
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
@@ -8,7 +8,6 @@
 namespace Magento\LoginAsCustomerAssistance\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\LoginAsCustomerAssistance\Api\SaveLoginAsCustomerAssistanceAllowedInterface;
 
 /**
  * Save Login as Customer assistance allowed record.
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
@@ -46,6 +46,7 @@ class SetAssistance implements SetAssistanceInterface
     /**
      * @param CustomerExtensionFactory $customerExtensionFactory
      * @param CustomerRepositoryInterface $customerRepository
+     * @param DeleteLoginAsCustomerAssistanceAllowed $deleteLoginAsCustomerAssistanceAllowed
      * @param SaveLoginAsCustomerAssistanceAllowed $saveLoginAsCustomerAssistanceAllowed
      */
     public function __construct(
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -64,7 +64,9 @@ public function afterGetData(
 
         foreach ($result as $id => $entityData) {
             if ($id) {
-                $assistanceAllowedStatus = $this->resolveStatus($this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id']));
+                $assistanceAllowedStatus = $this->resolveStatus(
+                    $this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id'])
+                );
                 $isAssistanceAllowed[$id]['customer']['extension_attributes']['assistance_allowed'] =
                     (string)$assistanceAllowedStatus;
             }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
@@ -36,6 +36,7 @@ public function __construct(
      * @param array $result
      * @param int $customerId
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetData(DataProvider $subject, array $result, int $customerId): array
     {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -3,7 +3,15 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-store": "*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer-admin-ui": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,4 +24,4 @@
             "Magento\\LoginAsCustomerAssistance\\": ""
         }
     }
-}
+},
diff --git a/composer.json b/composer.json
@@ -194,6 +194,7 @@
         "magento/module-login-as-customer": "*",
         "magento/module-login-as-customer-admin-ui": "*",
         "magento/module-login-as-customer-api": "*",
+        "magento/module-login-as-customer-assistance": "*",
         "magento/module-login-as-customer-frontend-ui": "*",
         "magento/module-login-as-customer-log": "*",
         "magento/module-login-as-customer-quote": "*",

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Get 'assistance_allowed' attribute from Customer.`
`12`		`- *`
`13`		`- * @api`
`14`	`12`	`*/`
`15`	`13`	`interface IsAssistanceEnabledInterface`
`16`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function __construct(`
`36`	`36`	`* @param array $result`
`37`	`37`	`* @param int $customerId`
`38`	`38`	`* @return array`
	`39`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`39`	`40`	`*/`
`40`	`41`	`public function afterGetData(DataProvider $subject, array $result, int $customerId): array`
`41`	`42`	`{`