Skip to content

Commit 88d403c

Browse files
slavvkaslavvka
authored
Merge branch '2.4-develop' into fix/issue-24735
2 parents 3391686 + 0d3defe commit 88d403c

File tree

1,560 files changed

+32990
-7833
lines changed

Some content is hidden

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

1,560 files changed

+32990
-7833
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

‎README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
2-
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
3-
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
1+
<p align="center">
2+
<a href="https://magento.com">
3+
<img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento" />
4+
</a>
5+
</p>
6+
<p align="center">
7+
<br /><br />
8+
<a href="https://www.codetriage.com/magento/magento2">
9+
<img src="https://www.codetriage.com/magento/magento2/badges/users.svg" alt="Open Source Helpers" />
10+
</a>
11+
<a href="https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge">
12+
<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter" />
13+
</a>
14+
<a href="https://crowdin.com/project/magento-2">
15+
<img src="https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg" alt="Crowdin" />
16+
</a>
17+
</p>
418

519
## Welcome
620
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.

‎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/ReportXml/QueryFactory.php

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Analytics\ReportXml;
78

89
use Magento\Analytics\ReportXml\DB\SelectBuilderFactory;
910
use Magento\Framework\App\CacheInterface;
11+
use Magento\Framework\DB\Select;
1012
use Magento\Framework\ObjectManagerInterface;
13+
use Magento\Framework\Serialize\Serializer\Json;
1114

1215
/**
1316
* Creates Query object according to configuration
17+
*
1418
* Factory for @see \Magento\Analytics\ReportXml\Query
1519
*/
1620
class QueryFactory
@@ -45,6 +49,11 @@ class QueryFactory
4549
*/
4650
private $selectHydrator;
4751

52+
/**
53+
* @var Json
54+
*/
55+
private $jsonSerializer;
56+
4857
/**
4958
* QueryFactory constructor.
5059
*
@@ -54,21 +63,24 @@ class QueryFactory
5463
* @param SelectBuilderFactory $selectBuilderFactory
5564
* @param Config $config
5665
* @param array $assemblers
66+
* @param Json $jsonSerializer
5767
*/
5868
public function __construct(
5969
CacheInterface $queryCache,
6070
SelectHydrator $selectHydrator,
6171
ObjectManagerInterface $objectManager,
6272
SelectBuilderFactory $selectBuilderFactory,
6373
Config $config,
64-
array $assemblers
74+
array $assemblers,
75+
Json $jsonSerializer
6576
) {
6677
$this->config = $config;
6778
$this->selectBuilderFactory = $selectBuilderFactory;
6879
$this->assemblers = $assemblers;
6980
$this->queryCache = $queryCache;
7081
$this->objectManager = $objectManager;
7182
$this->selectHydrator = $selectHydrator;
83+
$this->jsonSerializer = $jsonSerializer;
7284
}
7385

7486
/**
@@ -101,14 +113,10 @@ private function constructQuery($queryName)
101113
$selectBuilder = $assembler->assemble($selectBuilder, $queryConfig);
102114
}
103115
$select = $selectBuilder->create();
104-
return $this->objectManager->create(
105-
Query::class,
106-
[
107-
'select' => $select,
108-
'selectHydrator' => $this->selectHydrator,
109-
'connectionName' => $selectBuilder->getConnectionName(),
110-
'config' => $queryConfig
111-
]
116+
return $this->createQueryObject(
117+
$select,
118+
$selectBuilder->getConnectionName(),
119+
$queryConfig
112120
);
113121
}
114122

@@ -122,19 +130,42 @@ public function create($queryName)
122130
{
123131
$cached = $this->queryCache->load($queryName);
124132
if ($cached) {
125-
$queryData = json_decode($cached, true);
126-
return $this->objectManager->create(
127-
Query::class,
128-
[
129-
'select' => $this->selectHydrator->recreate($queryData['select_parts']),
130-
'selectHydrator' => $this->selectHydrator,
131-
'connectionName' => $queryData['connectionName'],
132-
'config' => $queryData['config']
133-
]
133+
$queryData = $this->jsonSerializer->unserialize($cached);
134+
return $this->createQueryObject(
135+
$this->selectHydrator->recreate($queryData['select_parts']),
136+
$queryData['connectionName'],
137+
$queryData['config']
134138
);
135139
}
136140
$query = $this->constructQuery($queryName);
137-
$this->queryCache->save(json_encode($query), $queryName);
141+
$this->queryCache->save(
142+
$this->jsonSerializer->serialize($query),
143+
$queryName
144+
);
138145
return $query;
139146
}
147+
148+
/**
149+
* Create query class using objectmanger
150+
*
151+
* @param Select $select
152+
* @param string $connection
153+
* @param array $queryConfig
154+
* @return Query
155+
*/
156+
private function createQueryObject(
157+
Select $select,
158+
string $connection,
159+
array $queryConfig
160+
) {
161+
return $this->objectManager->create(
162+
Query::class,
163+
[
164+
'select' => $select,
165+
'selectHydrator' => $this->selectHydrator,
166+
'connectionName' => $connection,
167+
'config' => $queryConfig
168+
]
169+
);
170+
}
140171
}

‎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"/>

0 commit comments

Comments
 (0)