Skip to content

Commit 2dc2a50

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop expedited
Accepted Community Pull Requests: - #29492: Extract images from content only when new media gallery enabled (by @Nazar65) - #29475: Fix new iTxt && zTxt segment creation for PNG image XMP && IPTC segments (by @Nazar65) - #29490: Fix used in entities of the same type are displayed separately in delete warning (by @Nazar65) - #29485: [MFTF] Created ActionGroup for click addProductsToOption button (by @Usik2203) - #29455: fix RSS Feed - first load not working (by @engcom-Charlie) - #29484: magento/adobe-stock-integration#1746: Corrected placeholders (by @sivaschenko) - #29202: Reduce TierPriceManagement class complexity by quick refactor (by @lbajsarowicz) - #29472: [MFTF] Add new ActionGroup (by @Usik2203) - #29398: #1684: Login failed error contains HTML tags (by @yolouiese) - #29214: Fix Issues 29213 (by @sarron93) - #29376: Checkout / Sales Rules / Get rid of redundant DB query (by @lbajsarowicz) - #29291: Add back extension point for adding some html to the category page (by @iGerchak) - #28923: improve and make more strict autoload.php (by @rvitaliy) Fixed GitHub Issues: - #1750: Install magento 2 on sever (reported by @tungmpo) has been fixed in #29492 by @Nazar65 in 2.4-develop branch Related commits: 1. 8420c37 2. 1972841 3. 78980b3 4. 12c6bbb 5. 94bda9e - #1749: Critical checkout issue with configurable product (Cannot read property 'checkoutUrl' of undefined) (reported by @biotech) has been fixed in #29490 by @Nazar65 in 2.4-develop branch Related commits: 1. c410eae 2. a1de721 3. 84ee18b - #25211: RSS Feed - first load not working (reported by @JuraseQ) has been fixed in #29455 by @engcom-Charlie in 2.4-develop branch Related commits: 1. b2a8ff4 2. 176ce43 3. 1786065 4. 8fdaa15 5. 0fa559e 6. fb06211 7. 3f304d9 8. 8896804 9. 745a5a6 10. 1ab0e35 - #29477: [Issue] Reduce TierPriceManagement class complexity by quick refactor (reported by @m2-assistant[bot]) has been fixed in #29202 by @lbajsarowicz in 2.4-develop branch Related commits: 1. 30caed7 2. 3ec0f57 - #29539: [Issue] [MFTF] Add new ActionGroup (reported by @m2-assistant[bot]) has been fixed in #29472 by @Usik2203 in 2.4-develop branch Related commits: 1. 5ed8190 2. 6066e18 3. ae1d33a 4. ad98a40 - #1684: events.xml event with exclude param (reported by @michal-sk) has been fixed in #29398 by @yolouiese in 2.4-develop branch Related commits: 1. deb001c 2. b5550cc 3. cc94133 4. 2d0bbad 5. 811c4ad 6. 88923fa 7. 07dd895 8. ad3da2d - #29213: Price Filter Into Grid not working for specific data (reported by @sarron93) has been fixed in #29214 by @sarron93 in 2.4-develop branch Related commits: 1. 2af8717 2. 1be7e8c 3. eb2a805 - #29453: [Issue] Checkout / Sales Rules / Get rid of redundant DB query (reported by @m2-assistant[bot]) has been fixed in #29376 by @lbajsarowicz in 2.4-develop branch Related commits: 1. d8a386e 2. 2c18740 3. d33a9ea 4. 1a77014 - #29286: Add back extension point for adding some html to the category page (reported by @ihor-sviziev) has been fixed in #29291 by @iGerchak in 2.4-develop branch Related commits: 1. 08671ba 2. aeccbe5 3. 47cef27 4. 3da492b - #29527: [Issue] improve and make more strict autoload.php (reported by @m2-assistant[bot]) has been fixed in #28923 by @rvitaliy in 2.4-develop branch Related commits: 1. d87d307
2 parents cdffb2b + 8f6aad0 commit 2dc2a50

File tree

75 files changed

+836
-288
lines changed

Some content is hidden

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

75 files changed

+836
-288
lines changed

‎app/autoload.php‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,48 @@
55
* Copyright © Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
8+
declare(strict_types=1);
9+
810
use Magento\Framework\Autoload\AutoloaderRegistry;
911
use Magento\Framework\Autoload\ClassLoaderWrapper;
1012

1113
/**
1214
* Shortcut constant for the root directory
1315
*/
14-
define('BP', dirname(__DIR__));
16+
\define('BP', \dirname(__DIR__));
1517

16-
define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
18+
\define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
1719

18-
if (!file_exists(VENDOR_PATH)) {
20+
if (!\is_readable(VENDOR_PATH)) {
1921
throw new \Exception(
2022
'We can\'t read some files that are required to run the Magento application. '
2123
. 'This usually means file permissions are set incorrectly.'
2224
);
2325
}
2426

25-
$vendorDir = require VENDOR_PATH;
26-
$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
27+
$vendorAutoload = (
28+
static function (): ?string {
29+
$vendorDir = require VENDOR_PATH;
30+
31+
$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
32+
if (\is_readable($vendorAutoload)) {
33+
return $vendorAutoload;
34+
}
35+
36+
$vendorAutoload = "{$vendorDir}/autoload.php";
37+
if (\is_readable($vendorAutoload)) {
38+
return $vendorAutoload;
39+
}
40+
41+
return null;
42+
}
43+
)();
2744

28-
/* 'composer install' validation */
29-
if (file_exists($vendorAutoload)) {
30-
$composerAutoloader = include $vendorAutoload;
31-
} else if (file_exists("{$vendorDir}/autoload.php")) {
32-
$vendorAutoload = "{$vendorDir}/autoload.php";
33-
$composerAutoloader = include $vendorAutoload;
34-
} else {
45+
if ($vendorAutoload === null) {
3546
throw new \Exception(
3647
'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
3748
);
3849
}
3950

51+
$composerAutoloader = include $vendorAutoload;
4052
AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected function _getCurrencyList()
162162
/**
163163
* Retrieve filter value
164164
*
165-
* @param null $index
165+
* @param string|null $index
166166
* @return array|null
167167
*/
168168
public function getValue($index = null)
@@ -194,11 +194,11 @@ public function getCondition()
194194
$rate = $this->_getRate($displayCurrency, $this->_getColumnCurrencyCode());
195195

196196
if (isset($value['from'])) {
197-
$value['from'] *= $rate;
197+
$value['from'] = (float) $value['from'] * $rate;
198198
}
199199

200200
if (isset($value['to'])) {
201-
$value['to'] *= $rate;
201+
$value['to'] = (float) $value['to'] * $rate;
202202
}
203203

204204
$this->prepareRates($displayCurrency);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@
6464
<waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
6565
<click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
6666
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
67-
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
68-
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
67+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
6968
<!-- Checkout select Check/Money Order payment -->
7069
<comment userInput="Select Check/Money payment" stepKey="checkoutSelectCheckMoneyPayment"/>
7170
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Backend\Test\Unit\Block\Widget\Grid\Column\Filter;
9+
10+
use Magento\Backend\Block\Context;
11+
use Magento\Backend\Block\Widget\Grid\Column;
12+
use Magento\Backend\Block\Widget\Grid\Column\Filter\Price;
13+
use Magento\Framework\App\RequestInterface;
14+
use Magento\Framework\DB\Helper;
15+
use Magento\Directory\Model\Currency;
16+
use Magento\Directory\Model\Currency\DefaultLocator;
17+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
18+
use PHPUnit\Framework\MockObject\MockObject;
19+
use PHPUnit\Framework\TestCase;
20+
21+
class PriceTest extends TestCase
22+
{
23+
/** @var RequestInterface|MockObject */
24+
private $requestMock;
25+
26+
/** @var Context|MockObject */
27+
private $context;
28+
29+
/** @var Helper|MockObject */
30+
private $helper;
31+
32+
/** @var Currency|MockObject */
33+
private $currency;
34+
35+
/** @var DefaultLocator|MockObject */
36+
private $currencyLocator;
37+
38+
/** @var Column|MockObject */
39+
private $columnMock;
40+
41+
/** @var Price */
42+
private $blockPrice;
43+
44+
protected function setUp(): void
45+
{
46+
$this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
47+
48+
$this->context = $this->createMock(Context::class);
49+
$this->context->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
50+
51+
$this->helper = $this->createMock(Helper::class);
52+
53+
$this->currency = $this->getMockBuilder(Currency::class)
54+
->disableOriginalConstructor()
55+
->setMethods(['getAnyRate'])
56+
->getMock();
57+
58+
$this->currencyLocator = $this->createMock(DefaultLocator::class);
59+
60+
$this->columnMock = $this->getMockBuilder(Column::class)
61+
->disableOriginalConstructor()
62+
->setMethods(['getCurrencyCode'])
63+
->getMock();
64+
65+
$helper = new ObjectManager($this);
66+
67+
$this->blockPrice = $helper->getObject(Price::class, [
68+
'context' => $this->context,
69+
'resourceHelper' => $this->helper,
70+
'currencyModel' => $this->currency,
71+
'currencyLocator' => $this->currencyLocator
72+
]);
73+
$this->blockPrice->setColumn($this->columnMock);
74+
}
75+
76+
public function testGetCondition()
77+
{
78+
$this->currencyLocator->expects(
79+
$this->any()
80+
)->method(
81+
'getDefaultCurrency'
82+
)->with(
83+
$this->requestMock
84+
)->willReturn(
85+
'defaultCurrency'
86+
);
87+
88+
$this->currency->expects($this->at(0))
89+
->method('getAnyRate')
90+
->with('defaultCurrency')
91+
->willReturn(1.0);
92+
93+
$testValue = [
94+
'value' => [
95+
'from' => '1234a',
96+
]
97+
];
98+
99+
$this->blockPrice->addData($testValue);
100+
$this->assertEquals(['from' => 1234], $this->blockPrice->getCondition());
101+
}
102+
}

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionActionGroup.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="AdminClickAddProductToOptionActionGroup">
12+
<annotations>
13+
<description>Click AddProductToOption button for bundle product.</description>
14+
</annotations>
15+
16+
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
17+
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
18+
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
5050
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5151
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
52-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
53-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
54-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
52+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
5553
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
5654
<argument name="product" value="$$simpleProduct0$$"/>
5755
</actionGroup>
@@ -101,9 +99,7 @@
10199
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" stepKey="waitForBundleOptionsToAppear"/>
102100
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillNewestOptionTitle"/>
103101
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('1')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectNewInputType"/>
104-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToNewBundle"/>
105-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToNewOption"/>
106-
<waitForPageLoad stepKey="waitForPageLoadAfterNewBundleProducts"/>
102+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToNewOption"/>
107103
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions">
108104
<argument name="product" value="$$simpleProduct2$$"/>
109105
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
4949
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
5050
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
51-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
52-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
53-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
51+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
5452
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
5553
<argument name="product" value="$$simpleProduct1$$"/>
5654
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
3939
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
4040
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
41-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
42-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
43-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
41+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
4442
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
4543
<argument name="product" value="$$simpleProduct1$$"/>
4644
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
3939
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
4040
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
41-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
42-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
43-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
41+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
4442
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
4543
<argument name="product" value="$$simpleProduct1$$"/>
4644
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
4747
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
4848
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
49-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
50-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
51-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
49+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
5250
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
5351
<argument name="product" value="$$simpleProduct1$$"/>
5452
</actionGroup>
@@ -81,9 +79,7 @@
8179
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
8280
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
8381
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>
84-
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle2"/>
85-
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption2"/>
86-
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts2"/>
82+
<actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption2"/>
8783
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptionsx2">
8884
<argument name="product" value="$$simpleProduct3$$"/>
8985
</actionGroup>

0 commit comments

Comments
 (0)