Merge remote-tracking branch 'origin/2.4-develop' into bugfix/rest-ap…

…i-pagination
magento · Feb 29, 2020 · 6c171ce · 6c171ce
2 parents e8d3b78 + a3c2af0
commit 6c171ce
Show file tree

Hide file tree

Showing 808 changed files with 2,281 additions and 1,516 deletions.
diff --git a/...f/ActionGroup/LoginAsAdminActionGroup.xml → ...ftf/ActionGroup/AdminLoginActionGroup.xml b/...f/ActionGroup/LoginAsAdminActionGroup.xml → ...ftf/ActionGroup/AdminLoginActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="LoginAsAdmin">
+    <actionGroup name="AdminLoginActionGroup">
         <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
     </actionGroup>
 </actionGroups>
diff --git a/.../LoginAdminWithCredentialsActionGroup.xml → ...f/ActionGroup/_Deprecated_ActionGroup.xml b/.../LoginAdminWithCredentialsActionGroup.xml → ...f/ActionGroup/_Deprecated_ActionGroup.xml
@@ -8,7 +8,10 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="LoginAdminWithCredentialsActionGroup">
+    <actionGroup name="LoginAdminWithCredentialsActionGroup" deprecated="Use AdminLoginActionGroup instead">
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
+    </actionGroup>
+    <actionGroup name="LoginAsAdmin" deprecated="Use AdminLoginActionGroup instead">
         <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
     </actionGroup>
 </actionGroups>
diff --git a/...code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml b/...code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
@@ -23,7 +23,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
             <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
@@ -25,7 +25,7 @@
             <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
@@ -35,4 +35,4 @@
         <switchToNextTab stepKey="switchToNewTab"/>
         <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
     </test>
-</tests>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
@@ -23,7 +23,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
             <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -18,9 +18,9 @@
             <group value="analytics"/>
         </annotations>
         <after>
-            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -18,9 +18,9 @@
             <group value="analytics"/>
         </annotations>
         <after>
-            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -19,7 +19,7 @@
             <group value="analytics"/>
         </annotations>
 
-        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
@@ -21,10 +21,10 @@
         <before>
             <createData entity="adminNoReportRole" stepKey="noReportUserRole"/>
             <createData entity="adminNoReport" stepKey="noReportUser"/>
-            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
         <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameSearch"/>
@@ -51,7 +51,7 @@
         <scrollTo selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="scrollToMenuItem"/>
         <!--<see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>-->
         <seeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="seeAdvancedReportingConfigMenuItem"/>
-        <actionGroup ref="logout" stepKey="logoutOfAdmin2"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin2"/>
 
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
         <fillField selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameNoReport"/>

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -19,9 +19,9 @@
             <group value="analytics"/>
         </annotations>
         <after>
-            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>

diff --git a/app/code/Magento/Authorization/Model/Acl/Loader/Role.php b/app/code/Magento/Authorization/Model/Acl/Loader/Role.php
@@ -3,37 +3,46 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Authorization\Model\Acl\Loader;
 
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
+use Magento\Authorization\Model\Acl\Role\GroupFactory;
 use Magento\Authorization\Model\Acl\Role\User as RoleUser;
-use Magento\Framework\App\ObjectManager;
+use Magento\Authorization\Model\Acl\Role\UserFactory;
+use Magento\Framework\Acl\Data\CacheInterface;
+use Magento\Framework\Acl\LoaderInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Serialize\Serializer\Json;
 
-class Role implements \Magento\Framework\Acl\LoaderInterface
+/**
+ * Acl Role Loader
+ */
+class Role implements LoaderInterface
 {
     /**
      * Cache key for ACL roles cache
      */
     const ACL_ROLES_CACHE_KEY = 'authorization_role_cached_data';
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     protected $_resource;
 
     /**
-     * @var \Magento\Authorization\Model\Acl\Role\GroupFactory
+     * @var GroupFactory
      */
     protected $_groupFactory;
 
     /**
-     * @var \Magento\Authorization\Model\Acl\Role\UserFactory
+     * @var UserFactory
      */
     protected $_roleFactory;
 
     /**
-     * @var \Magento\Framework\Acl\Data\CacheInterface
+     * @var CacheInterface
      */
     private $aclDataCache;
 
@@ -48,28 +57,26 @@ class Role implements \Magento\Framework\Acl\LoaderInterface
     private $cacheKey;
 
     /**
-     * @param \Magento\Authorization\Model\Acl\Role\GroupFactory $groupFactory
-     * @param \Magento\Authorization\Model\Acl\Role\UserFactory $roleFactory
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
+     * @param GroupFactory $groupFactory
+     * @param UserFactory $roleFactory
+     * @param ResourceConnection $resource
+     * @param CacheInterface $aclDataCache
      * @param Json $serializer
      * @param string $cacheKey
      */
     public function __construct(
-        \Magento\Authorization\Model\Acl\Role\GroupFactory $groupFactory,
-        \Magento\Authorization\Model\Acl\Role\UserFactory $roleFactory,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null,
-        Json $serializer = null,
+        GroupFactory $groupFactory,
+        UserFactory $roleFactory,
+        ResourceConnection $resource,
+        CacheInterface $aclDataCache,
+        Json $serializer,
         $cacheKey = self::ACL_ROLES_CACHE_KEY
     ) {
-        $this->_resource = $resource;
         $this->_groupFactory = $groupFactory;
         $this->_roleFactory = $roleFactory;
-        $this->aclDataCache = $aclDataCache ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\Acl\Data\CacheInterface::class
-        );
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->_resource = $resource;
+        $this->aclDataCache = $aclDataCache;
+        $this->serializer = $serializer;
         $this->cacheKey = $cacheKey;
     }
 

diff --git a/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php b/app/code/Magento/Authorization/Model/Acl/Loader/Rule.php
@@ -3,30 +3,38 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Authorization\Model\Acl\Loader;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Acl\Data\CacheInterface;
+use Magento\Framework\Acl\LoaderInterface;
+use Magento\Framework\Acl\RootResource;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Serialize\Serializer\Json;
 
-class Rule implements \Magento\Framework\Acl\LoaderInterface
+/**
+ * Acl Rule Loader
+ */
+class Rule implements LoaderInterface
 {
     /**
      * Rules array cache key
      */
     const ACL_RULE_CACHE_KEY = 'authorization_rule_cached_data';
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     protected $_resource;
 
     /**
-     * @var \Magento\Framework\Acl\RootResource
+     * @var RootResource
      */
     private $_rootResource;
 
     /**
-     * @var \Magento\Framework\Acl\Data\CacheInterface
+     * @var CacheInterface
      */
     private $aclDataCache;
 
@@ -41,28 +49,26 @@ class Rule implements \Magento\Framework\Acl\LoaderInterface
     private $cacheKey;
 
     /**
-     * @param \Magento\Framework\Acl\RootResource $rootResource
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param array $data
-     * @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
+     * @param RootResource $rootResource
+     * @param ResourceConnection $resource
+     * @param CacheInterface $aclDataCache
      * @param Json $serializer
+     * @param array $data
      * @param string $cacheKey
      * @SuppressWarnings(PHPMD.UnusedFormalParameter):
      */
     public function __construct(
-        \Magento\Framework\Acl\RootResource $rootResource,
-        \Magento\Framework\App\ResourceConnection $resource,
+        RootResource $rootResource,
+        ResourceConnection $resource,
+        CacheInterface $aclDataCache,
+        Json $serializer,
         array $data = [],
-        \Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null,
-        Json $serializer = null,
         $cacheKey = self::ACL_RULE_CACHE_KEY
     ) {
-        $this->_resource = $resource;
         $this->_rootResource = $rootResource;
-        $this->aclDataCache = $aclDataCache ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\Acl\Data\CacheInterface::class
-        );
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->_resource = $resource;
+        $this->aclDataCache = $aclDataCache;
+        $this->serializer = $serializer;
         $this->cacheKey = $cacheKey;
     }
 
@@ -104,7 +110,7 @@ private function getRulesArray()
             return $this->serializer->unserialize($rulesCachedData);
         }
 
-        $ruleTable = $this->_resource->getTableName("authorization_rule");
+        $ruleTable = $this->_resource->getTableName('authorization_rule');
         $connection = $this->_resource->getConnection();
         $select = $connection->select()
             ->from(['r' => $ruleTable]);