Skip to content

Commit 208f670

Browse files
mrtuvnmrtuvn
committed
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
2 parents 21f5487 + 45b624c commit 208f670

File tree

869 files changed

+6070
-1924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

869 files changed

+6070
-1924
lines changed

‎.htaccess

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,6 @@
3737

3838
DirectoryIndex index.php
3939

40-
<IfModule mod_php5.c>
41-
############################################
42-
## adjust memory limit
43-
44-
php_value memory_limit 756M
45-
php_value max_execution_time 18000
46-
47-
############################################
48-
## disable automatic session start
49-
## before autoload was initialized
50-
51-
php_flag session.auto_start off
52-
53-
############################################
54-
## enable resulting html compression
55-
56-
#php_flag zlib.output_compression on
57-
58-
###########################################
59-
## disable user agent verification to not break multiple image upload
60-
61-
php_flag suhosin.session.cryptua off
62-
</IfModule>
6340
<IfModule mod_php7.c>
6441
############################################
6542
## adjust memory limit

‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml renamed to ‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/AdminLoginActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="LoginAsAdmin">
11+
<actionGroup name="AdminLoginActionGroup">
1212
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
1313
</actionGroup>
1414
</actionGroups>

‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml renamed to ‎app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="LoginAdminWithCredentialsActionGroup">
11+
<actionGroup name="LoginAdminWithCredentialsActionGroup" deprecated="Use AdminLoginActionGroup instead">
12+
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
13+
</actionGroup>
14+
<actionGroup name="LoginAsAdmin" deprecated="Use AdminLoginActionGroup instead">
1215
<conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
1316
</actionGroup>
1417
</actionGroups>

‎app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</before>
2525
<after>
26-
<actionGroup ref="logout" stepKey="logout"/>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2727
</after>
2828
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
2929
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
2626
</before>
2727
<after>
28-
<actionGroup ref="logout" stepKey="logout"/>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2929
</after>
3030

3131
<!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
@@ -35,4 +35,4 @@
3535
<switchToNextTab stepKey="switchToNewTab"/>
3636
<seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
3737
</test>
38-
</tests>
38+
</tests>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</before>
2525
<after>
26-
<actionGroup ref="logout" stepKey="logout"/>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2727
</after>
2828
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
2929
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
21+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2222
</after>
23-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2525
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2626
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
21+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2222
</after>
23-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2525
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<group value="analytics"/>
2020
</annotations>
2121

22-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2424
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2525
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<before>
2222
<createData entity="adminNoReportRole" stepKey="noReportUserRole"/>
2323
<createData entity="adminNoReport" stepKey="noReportUser"/>
24-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
</before>
2626
<after>
27-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2828
</after>
2929
<amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
3030
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameSearch"/>
@@ -51,7 +51,7 @@
5151
<scrollTo selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="scrollToMenuItem"/>
5252
<!--<see stepKey="seeAdvancedReportingConfigMenuItem" selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>-->
5353
<seeElementInDOM selector="{{AdminConfigAdvancedReportingSection.advancedReportingMenuItem}}" stepKey="seeAdvancedReportingConfigMenuItem"/>
54-
<actionGroup ref="logout" stepKey="logoutOfAdmin2"/>
54+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin2"/>
5555

5656
<amOnPage url="{{AdminLoginPage.url}}" stepKey="amOnAdminLoginPage"/>
5757
<fillField selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$" stepKey="fillUsernameNoReport"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<group value="analytics"/>
2020
</annotations>
2121
<after>
22-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
22+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
2323
</after>
24-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2727
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>

‎app/code/Magento/Authorization/Model/Acl/Loader/Role.php

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,46 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorization\Model\Acl\Loader;
79

810
use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
11+
use Magento\Authorization\Model\Acl\Role\GroupFactory;
912
use Magento\Authorization\Model\Acl\Role\User as RoleUser;
10-
use Magento\Framework\App\ObjectManager;
13+
use Magento\Authorization\Model\Acl\Role\UserFactory;
14+
use Magento\Framework\Acl\Data\CacheInterface;
15+
use Magento\Framework\Acl\LoaderInterface;
16+
use Magento\Framework\App\ResourceConnection;
1117
use Magento\Framework\Serialize\Serializer\Json;
1218

13-
class Role implements \Magento\Framework\Acl\LoaderInterface
19+
/**
20+
* Acl Role Loader
21+
*/
22+
class Role implements LoaderInterface
1423
{
1524
/**
1625
* Cache key for ACL roles cache
1726
*/
1827
const ACL_ROLES_CACHE_KEY = 'authorization_role_cached_data';
1928

2029
/**
21-
* @var \Magento\Framework\App\ResourceConnection
30+
* @var ResourceConnection
2231
*/
2332
protected $_resource;
2433

2534
/**
26-
* @var \Magento\Authorization\Model\Acl\Role\GroupFactory
35+
* @var GroupFactory
2736
*/
2837
protected $_groupFactory;
2938

3039
/**
31-
* @var \Magento\Authorization\Model\Acl\Role\UserFactory
40+
* @var UserFactory
3241
*/
3342
protected $_roleFactory;
3443

3544
/**
36-
* @var \Magento\Framework\Acl\Data\CacheInterface
45+
* @var CacheInterface
3746
*/
3847
private $aclDataCache;
3948

@@ -48,28 +57,26 @@ class Role implements \Magento\Framework\Acl\LoaderInterface
4857
private $cacheKey;
4958

5059
/**
51-
* @param \Magento\Authorization\Model\Acl\Role\GroupFactory $groupFactory
52-
* @param \Magento\Authorization\Model\Acl\Role\UserFactory $roleFactory
53-
* @param \Magento\Framework\App\ResourceConnection $resource
54-
* @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
60+
* @param GroupFactory $groupFactory
61+
* @param UserFactory $roleFactory
62+
* @param ResourceConnection $resource
63+
* @param CacheInterface $aclDataCache
5564
* @param Json $serializer
5665
* @param string $cacheKey
5766
*/
5867
public function __construct(
59-
\Magento\Authorization\Model\Acl\Role\GroupFactory $groupFactory,
60-
\Magento\Authorization\Model\Acl\Role\UserFactory $roleFactory,
61-
\Magento\Framework\App\ResourceConnection $resource,
62-
\Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null,
63-
Json $serializer = null,
68+
GroupFactory $groupFactory,
69+
UserFactory $roleFactory,
70+
ResourceConnection $resource,
71+
CacheInterface $aclDataCache,
72+
Json $serializer,
6473
$cacheKey = self::ACL_ROLES_CACHE_KEY
6574
) {
66-
$this->_resource = $resource;
6775
$this->_groupFactory = $groupFactory;
6876
$this->_roleFactory = $roleFactory;
69-
$this->aclDataCache = $aclDataCache ?: ObjectManager::getInstance()->get(
70-
\Magento\Framework\Acl\Data\CacheInterface::class
71-
);
72-
$this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
77+
$this->_resource = $resource;
78+
$this->aclDataCache = $aclDataCache;
79+
$this->serializer = $serializer;
7380
$this->cacheKey = $cacheKey;
7481
}
7582

‎app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,38 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Authorization\Model\Acl\Loader;
79

8-
use Magento\Framework\App\ObjectManager;
10+
use Magento\Framework\Acl\Data\CacheInterface;
11+
use Magento\Framework\Acl\LoaderInterface;
12+
use Magento\Framework\Acl\RootResource;
13+
use Magento\Framework\App\ResourceConnection;
914
use Magento\Framework\Serialize\Serializer\Json;
1015

11-
class Rule implements \Magento\Framework\Acl\LoaderInterface
16+
/**
17+
* Acl Rule Loader
18+
*/
19+
class Rule implements LoaderInterface
1220
{
1321
/**
1422
* Rules array cache key
1523
*/
1624
const ACL_RULE_CACHE_KEY = 'authorization_rule_cached_data';
1725

1826
/**
19-
* @var \Magento\Framework\App\ResourceConnection
27+
* @var ResourceConnection
2028
*/
2129
protected $_resource;
2230

2331
/**
24-
* @var \Magento\Framework\Acl\RootResource
32+
* @var RootResource
2533
*/
2634
private $_rootResource;
2735

2836
/**
29-
* @var \Magento\Framework\Acl\Data\CacheInterface
37+
* @var CacheInterface
3038
*/
3139
private $aclDataCache;
3240

@@ -41,28 +49,26 @@ class Rule implements \Magento\Framework\Acl\LoaderInterface
4149
private $cacheKey;
4250

4351
/**
44-
* @param \Magento\Framework\Acl\RootResource $rootResource
45-
* @param \Magento\Framework\App\ResourceConnection $resource
46-
* @param array $data
47-
* @param \Magento\Framework\Acl\Data\CacheInterface $aclDataCache
52+
* @param RootResource $rootResource
53+
* @param ResourceConnection $resource
54+
* @param CacheInterface $aclDataCache
4855
* @param Json $serializer
56+
* @param array $data
4957
* @param string $cacheKey
5058
* @SuppressWarnings(PHPMD.UnusedFormalParameter):
5159
*/
5260
public function __construct(
53-
\Magento\Framework\Acl\RootResource $rootResource,
54-
\Magento\Framework\App\ResourceConnection $resource,
61+
RootResource $rootResource,
62+
ResourceConnection $resource,
63+
CacheInterface $aclDataCache,
64+
Json $serializer,
5565
array $data = [],
56-
\Magento\Framework\Acl\Data\CacheInterface $aclDataCache = null,
57-
Json $serializer = null,
5866
$cacheKey = self::ACL_RULE_CACHE_KEY
5967
) {
60-
$this->_resource = $resource;
6168
$this->_rootResource = $rootResource;
62-
$this->aclDataCache = $aclDataCache ?: ObjectManager::getInstance()->get(
63-
\Magento\Framework\Acl\Data\CacheInterface::class
64-
);
65-
$this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
69+
$this->_resource = $resource;
70+
$this->aclDataCache = $aclDataCache;
71+
$this->serializer = $serializer;
6672
$this->cacheKey = $cacheKey;
6773
}
6874

@@ -104,7 +110,7 @@ private function getRulesArray()
104110
return $this->serializer->unserialize($rulesCachedData);
105111
}
106112

107-
$ruleTable = $this->_resource->getTableName("authorization_rule");
113+
$ruleTable = $this->_resource->getTableName('authorization_rule');
108114
$connection = $this->_resource->getConnection();
109115
$select = $connection->select()
110116
->from(['r' => $ruleTable]);

0 commit comments

Comments
 (0)