Skip to content

Commit 04d9621

Browse files
aa-kashkaa-kashk
authored
Merge branch '2.4-develop' into ACPT-733-2
2 parents 5e48099 + abe22bc commit 04d9621

File tree

242 files changed

+8019
-9402
lines changed

Some content is hidden

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

242 files changed

+8019
-9402
lines changed

‎.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/developer_experience_issue.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Developer experience issue
2+
description: Issues related to customization, extensibility, modularity
3+
labels: ['Triage: Dev.Experience']
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
9+
- type: textarea
10+
attributes:
11+
label: Summary
12+
description: |
13+
Describe the issue you are experiencing.
14+
Include general information, error messages, environments, and so on.
15+
validations:
16+
required: true
17+
- type: textarea
18+
attributes:
19+
label: Examples
20+
description: |
21+
Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
22+
validations:
23+
required: true
24+
- type: textarea
25+
attributes:
26+
label: Proposed solution
27+
description: |
28+
Suggest your potential solutions for this issue.
29+
- type: textarea
30+
attributes:
31+
label: Release note
32+
description: |
33+
Help us to provide meaningful release notes to the community.
34+
- type: checkboxes
35+
attributes:
36+
label: Triage and priority
37+
description: |
38+
Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
39+
This information helps us during the Confirmation and Issue triage processes.
40+
options:
41+
- label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
42+
- label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
43+
- label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
44+
- label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
45+
- label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Feature request
2+
description: Report to https://github.com/magento/community-features
3+
labels: ['feature request']
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Important: This repository is intended only for Magento 2 Technical Issues.
9+
Enter Feature Requests at https://github.com/magento/community-features.
10+
Project stakeholders monitor and manage requests.
11+
Feature requests entered using this form may be moved to the forum.
12+
- type: textarea
13+
attributes:
14+
label: Description
15+
description: |
16+
Describe the feature you would like to add.
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Expected behavior
22+
description: |
23+
What is the expected behavior of this feature?
24+
How is it going to work?
25+
validations:
26+
required: true
27+
- type: textarea
28+
attributes:
29+
label: Benefits
30+
description: |
31+
How do you think this feature would improve Magento?
32+
- type: textarea
33+
attributes:
34+
label: Additional information
35+
description: |
36+
What other information can you provide about the desired feature?
37+
- type: textarea
38+
attributes:
39+
label: Release note
40+
description: |
41+
Help us to provide meaningful release notes to the community.

‎app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
/**
1515
* Export Advanced Pricing
1616
*
17-
* @author Magento Core Team <[email protected]>
1817
* @SuppressWarnings(PHPMD.TooManyFields)
1918
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2019
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2120
*/
2221
class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
2322
{
24-
const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
23+
public const ENTITY_ADVANCED_PRICING = 'advanced_pricing';
2524

2625
/**
2726
* @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
@@ -568,10 +567,10 @@ protected function getTierPrices(array $listSku, $table)
568567
if (isset($price[0]) && !empty($price[0]) || isset($price[1]) && !empty($price[1])) {
569568
$select->orWhere('ap.percentage_value IS NOT NULL');
570569
}
571-
if (isset($updatedAtFrom) && !empty($updatedAtFrom)) {
570+
if (isset($updatedAtFrom)) {
572571
$select->where('cpe.updated_at >= ?', $updatedAtFrom);
573572
}
574-
if (isset($updatedAtTo) && !empty($updatedAtTo)) {
573+
if (isset($updatedAtTo)) {
575574
$select->where('cpe.updated_at <= ?', $updatedAtTo);
576575
}
577576
$exportData = $this->_connection->fetchAll($select);

‎app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
<switchToNextTab stepKey="switchToNewTab"/>
1717
<waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
18-
<seeInCurrentUrl url="reports/advanced-reporting" stepKey="seeAssertAdvancedReportingPageUrl"/>
18+
<seeInCurrentUrl url="report" stepKey="seeAssertAdvancedReportingPageUrl"/>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/Backend/Block/Widget/Grid/Extended.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Backend\Block\Widget\Grid;
79

810
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -18,6 +20,7 @@
1820
* @SuppressWarnings(PHPMD.NumberOfChildren)
1921
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2022
* @since 100.0.2
23+
* @see \Magento\Backend\Block\Widget\Grid
2124
*/
2225
class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Backend\Block\Widget\Grid\ExportInterface
2326
{
@@ -1151,7 +1154,7 @@ public function getExcelFile($sheetName = '')
11511154
{
11521155
$this->_isExport = true;
11531156
$this->_prepareGrid();
1154-
1157+
$this->getCollection()->setPageSize(0);
11551158
$convert = new \Magento\Framework\Convert\Excel(
11561159
$this->getCollection()->getIterator(),
11571160
[$this, 'getRowRecord']

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache implements
1717
*
1818
* @see _isAllowed()
1919
*/
20-
const ADMIN_RESOURCE = 'Magento_Backend::flush_catalog_images';
20+
public const ADMIN_RESOURCE = 'Magento_Backend::flush_catalog_images';
2121

2222
/**
23-
* Clean JS/css files cache
23+
* Clean image cache
2424
*
2525
* @return \Magento\Backend\Model\View\Result\Redirect
2626
*/

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCheckDashboardWithChartsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group value="pr_exclude"/>
2222
</annotations>
2323
<before>
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2425
<magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>
2526
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
2627
<argument name="tags" value="config full_page"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminVerifyStateProvinceRequiredOnAddingNewAddressPageTest.xml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminVerifyStateProvinceRequiredOnAddingNewAddressPageTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<stories value="Verification of required fields on new address page test"/>
15+
<title value="Admin verifies State/Province should be required fields on add new address page test"/>
16+
<description value="Admin verifies State/Province should be required fields on add new address page test"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-3912"/>
19+
<group value="configuration"/>
20+
</annotations>
21+
<before>
22+
<!-- Set locale options to United Kingdom-->
23+
<magentoCLI stepKey="localeUK" command="config:set general/locale/code en_GB"/>
24+
<!-- Deploy static content with United Kingdom locale-->
25+
<magentoCLI command="setup:static-content:deploy en_GB" stepKey="deployStaticContentWithUnitedKingdomLocale"/>
26+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
27+
</before>
28+
<after>
29+
<!-- Set locale options to en_US-->
30+
<magentoCLI stepKey="localeUS" command="config:set general/locale/code en_US"/>
31+
<!-- Change Admin locale to default -->
32+
<actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminAccountToUnitedStates">
33+
<argument name="InterfaceLocaleByValue" value="en_US" />
34+
</actionGroup>
35+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
39+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
40+
<argument name="tags" value=""/>
41+
</actionGroup>
42+
</after>
43+
44+
<!-- Open Admin Store Configuration Page -->
45+
<actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
46+
47+
<!--"Choose United Kingdom" as State Option Required and save configuration -->
48+
<conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
49+
<waitForAjaxLoad stepKey="waitForAjax"/>
50+
<scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
51+
<selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" userInput="United Kingdom" stepKey="selectCountriesWithRequiredRegion"/>
52+
<click selector="#save" stepKey="saveStateOptionsConfig"/>
53+
<waitForPageLoad stepKey="waitForSavingConfig"/>
54+
55+
<!-- create customer on storefront -->
56+
<actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
57+
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
58+
<actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
59+
<argument name="customer" value="Simple_US_Customer"/>
60+
</actionGroup>
61+
<actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
62+
63+
<!-- Open AddressBook and set Country as "United Kingdom" -->
64+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBookPage">
65+
<argument name="menu" value="Address Book"/>
66+
</actionGroup>
67+
68+
<!-- Choose Country as "United Kingdom" -->
69+
<selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="United Kingdom" stepKey="selectCountry"/>
70+
<click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
71+
72+
<!-- Assert the error message -->
73+
<seeElement selector="{{StorefrontCustomerMessagesSection.assertErrorMessage}}" stepKey="assetErrorMessage"/>
74+
</test>
75+
</tests>

‎app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ protected function setUp(): void
4242
public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedError)
4343
{
4444
$actualError = $this->_xsdValidator->validate($this->_xsdSchema, $xmlString);
45-
$this->assertEquals($expectedError, $actualError);
45+
$this->assertEquals(false, empty($actualError));
46+
foreach ($expectedError as $error) {
47+
$this->assertContains($error, $actualError);
48+
}
4649
}
4750

4851
public function testSchemaCorrectlyIdentifiesValidXml()

0 commit comments

Comments
 (0)