Skip to content

Commit 09b1563

Browse files
duhonduhon
committed
Merge remote-tracking branch 'mainline/2.3.0-release' into MAGETWO-94482
2 parents 061af74 + 5393b18 commit 09b1563

File tree

1,017 files changed

+44614
-25371
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,017 files changed

+44614
-25371
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.3.0
2+
=============
3+
To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
4+
15
2.1.0
26
=============
37
To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
*/
77
namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
88

9-
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
9+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
10+
11+
class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
1012
{
1113
/**
1214
* @return void

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
*/
66
namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
77

8+
use Magento\Framework\App\Action\HttpGetActionInterface;
9+
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
810
use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
911
use Magento\Framework\Controller\ResultFactory;
1012
use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
1113
use Magento\Catalog\Model\Product as CatalogProduct;
1214

13-
class GetFilter extends ExportController
15+
class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
1416
{
1517
/**
1618
* Get grid-filter of entity attributes action.

‎app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66
namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;
77

8+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
89
use Magento\Backend\App\Action;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Framework\App\Config\ScopeConfigInterface;
1112

1213
/**
1314
* Provides link to BI Essentials signup
1415
*/
15-
class SignUp extends Action
16+
class SignUp extends Action implements HttpGetActionInterface
1617
{
1718
/**
1819
* Path to config value with URL to BI Essentials sign-up page.

‎app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Analytics\Controller\Adminhtml\Reports;
77

8+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
89
use Magento\Analytics\Model\Exception\State\SubscriptionUpdateException;
910
use Magento\Analytics\Model\ReportUrlProvider;
1011
use Magento\Backend\App\Action;
@@ -16,7 +17,7 @@
1617
/**
1718
* Provide redirect to resource with reports.
1819
*/
19-
class Show extends Action
20+
class Show extends Action implements HttpGetActionInterface
2021
{
2122
/**
2223
* @var ReportUrlProvider

‎app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="adminNoReport" type="user">
1212
<data key="username" unique="suffix">noreport</data>
1313
<data key="firstname">No</data>
@@ -18,7 +18,7 @@
1818
<data key="interface_local">en_US</data>
1919
<data key="is_active">true</data>
2020
<data key="current_password">123123q</data>
21-
</entity>
21+
</entity>
2222
<entity name="restrictedWebUser" type="user">
2323
<data key="username" unique="suffix">restrictedWebUser</data>
2424
<data key="firstname">restricted</data>

‎app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigSection.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="AdminConfigSection">
10+
<element name="advancedReportingMenuItem" type="text" selector="//*[@id='system_config_tabs']/div[1]//span[text()='Advanced Reporting']"/>
11+
<element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
12+
<element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
13+
<element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
14+
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
15+
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
16+
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17+
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18+
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
19+
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
20+
<element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
21+
</section>
22+
</sections>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
19-
<skip>
20-
<issueId value="MAGETWO-90659"/>
21-
</skip>
2219
</annotations>
2320
<after>
2421
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421

2522
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-82648"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData stepKey="noReportUserRole" entity="adminNoReportRole"/>

0 commit comments

Comments
 (0)