Skip to content

Commit acec859

Browse files
glo80326glo80326
committed
Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into 2.4-develop
2 parents 33a0230 + 72239c5 commit acec859

File tree

264 files changed

+2477
-707
lines changed

Some content is hidden

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

264 files changed

+2477
-707
lines changed

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
#ini_set('display_errors', 1);
1515

1616
/* PHP version validation */
17-
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70300) {
17+
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70400) {
1818
if (PHP_SAPI == 'cli') {
19-
echo 'Magento supports PHP 7.3.0 or later. ' .
19+
echo 'Magento supports PHP 7.4.0 or later. ' .
2020
'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
2121
} else {
2222
echo <<<HTML
2323
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
24-
<p>Magento supports PHP 7.3.0 or later. Please read
24+
<p>Magento supports PHP 7.4.0 or later. Please read
2525
<a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
2626
Magento System Requirements</a>.
2727
</div>

‎app/code/Magento/AwsS3/Test/Mftf/Helper/FileAssertions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public function assertDirectoryNotEmpty($path, $message = ''): void
297297
* @param string $filePathJson - path to file or json structure with paths by storage type.
298298
* @return mixed
299299
*/
300-
private function extractFilePath($filePathJson)
300+
public function extractFilePath($filePathJson)
301301
{
302302
$filePathArgs = json_decode($filePathJson, true);
303303
if (isset($filePathArgs[$this->storageType])) {

‎app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
/*global define*/
76
/*global FORM_KEY*/
87
define([
98
'jquery',

‎app/code/Magento/Backend/view/adminhtml/web/js/dashboard/totals.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
/*global define*/
76
/*global FORM_KEY*/
87
define([
98
'jquery',

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddOptionOnBundleProductEditPageActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminClickAddOptionOnBundleProductEditPageActionGroup">
12+
<annotations>
13+
<description>Clicks the "Add Option" button on the Bundle Product Edit page</description>
14+
</annotations>
15+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionByOptionIndexActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminClickAddProductToOptionByOptionIndexActionGroup">
12+
<annotations>
13+
<description>Clicks "Add Product To Option" button for Option by index for Bundle</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="1"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="waitForAddProductsToOptionButton"/>
20+
<click selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="clickAddProductsToOptionButton"/>
21+
<waitForPageLoad stepKey="waitForPageLoadAfterAddingPorductsToBundle"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleItemQtyActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminFillBundleItemQtyActionGroup">
12+
<annotations>
13+
<description>Fills Bundle item qty</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="0"/>
17+
<argument name="productIndex" type="string" defaultValue="0"/>
18+
<argument name="qty" type="string" defaultValue="0"/>
19+
</arguments>
20+
21+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(optionIndex, productIndex)}}" userInput="{{qty}}" stepKey="fillProductDefaultQty"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleOptionTitleActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminFillBundleOptionTitleActionGroup">
12+
<arguments>
13+
<argument name="optionTitle" type="string" defaultValue="option1"/>
14+
<argument name="index" type="string" defaultValue="0"/>
15+
</arguments>
16+
17+
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" stepKey="waitForBundleOptions"/>
18+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" userInput="{{optionTitle}}" stepKey="fillOptionTitle"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleOptionTypeActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminFillBundleOptionTypeActionGroup">
12+
<annotations>
13+
<description>Fills Bundle Option Type</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionType" type="string" defaultValue="Checkbox"/>
17+
<argument name="optionIndex" type="string" defaultValue="0"/>
18+
</arguments>
19+
20+
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType(optionIndex)}}" userInput="{{optionType}}" stepKey="fillOptionType"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOpenCreateBundleProductPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenCreateBundleProductPageActionGroup">
12+
<annotations>
13+
<description>Opens the Create Product page for Bundle</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
17+
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

0 commit comments

Comments
 (0)