Skip to content

Commit de047a2

Browse files
bubasumabubasuma
committed
Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-4243
2 parents 17340d9 + f6aa682 commit de047a2

File tree

16 files changed

+1003
-107
lines changed

16 files changed

+1003
-107
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
<createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
3030
</before>
3131
<after>
32-
<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
33-
<actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="selectAndDeleteProducts"/>
34-
<actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
32+
<!-- Delete all products via API -->
33+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3534
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3635
<deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
3736
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// phpcs:disable Generic.Files.LineLength
99

1010
/** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */
11+
/** @var \Magento\Framework\Escaper $escaper */
1112

1213
$_item = $block->getItem();
1314
$product = $_item->getProduct();
@@ -18,10 +19,10 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
1819
?>
1920
<tbody class="cart item">
2021
<tr class="item-info">
21-
<td data-th="<?= $block->escapeHtml(__('Item')) ?>" class="col item">
22+
<td data-th="<?= $escaper->escapeHtml(__('Item')) ?>" class="col item">
2223
<?php if ($block->hasProductUrl()): ?>
23-
<a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"
24-
title="<?= $block->escapeHtml($block->getProductName()) ?>"
24+
<a href="<?= $escaper->escapeUrl($block->getProductUrl()) ?>"
25+
title="<?= $escaper->escapeHtml($block->getProductName()) ?>"
2526
tabindex="-1"
2627
class="product-item-photo">
2728
<?php else: ?>
@@ -36,30 +37,30 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
3637
<div class="product-item-details">
3738
<strong class="product-item-name">
3839
<?php if ($block->hasProductUrl()): ?>
39-
<a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
40+
<a href="<?= $escaper->escapeUrl($block->getProductUrl()) ?>"><?= $escaper->escapeHtml($block->getProductName()) ?></a>
4041
<?php else: ?>
41-
<?= $block->escapeHtml($block->getProductName()) ?>
42+
<?= $escaper->escapeHtml($block->getProductName()) ?>
4243
<?php endif; ?>
4344
</strong>
4445
<?php if ($_options = $block->getOptionList()): ?>
4546
<dl class="item-options">
4647
<?php foreach ($_options as $_option): ?>
4748
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
48-
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
49+
<dt><?= $escaper->escapeHtml($_option['label']) ?></dt>
4950
<dd>
5051
<?php if (isset($_formatedOptionValue['full_view'])): ?>
51-
<?= $block->escapeHtml($_formatedOptionValue['full_view'], ['span', 'a']) ?>
52+
<?= $escaper->escapeHtml($_formatedOptionValue['full_view'], ['span', 'a']) ?>
5253
<?php else: ?>
53-
<?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
54+
<?= $escaper->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
5455
<?php endif; ?>
5556
</dd>
5657
<?php endforeach; ?>
5758
</dl>
5859
<?php endif; ?>
5960
<?php if ($messages = $block->getMessages()): ?>
6061
<?php foreach ($messages as $message): ?>
61-
<div class= "cart item message <?= $block->escapeHtmlAttr($message['type']) ?>">
62-
<div><?= $block->escapeHtml($message['text']) ?></div>
62+
<div class="cart item message <?= $escaper->escapeHtmlAttr($message['type']) ?>">
63+
<div><?= $escaper->escapeHtml($message['text']) ?></div>
6364
</div>
6465
<?php endforeach; ?>
6566
<?php endif; ?>
@@ -71,53 +72,53 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
7172
</td>
7273

7374
<?php if ($canApplyMsrp): ?>
74-
<td class="col msrp" data-th="<?= $block->escapeHtml(__('Price')) ?>">
75+
<td class="col msrp" data-th="<?= $escaper->escapeHtml(__('Price')) ?>">
7576
<span class="pricing msrp">
76-
<span class="msrp notice"><?= $block->escapeHtml(__('See price before order confirmation.')) ?></span>
77+
<span class="msrp notice"><?= $escaper->escapeHtml(__('See price before order confirmation.')) ?></span>
7778
<?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
7879
<a href="#" class="action help map"
79-
id="<?= ($block->escapeHtmlAttr($helpLinkId)) ?>"
80+
id="<?= ($escaper->escapeHtmlAttr($helpLinkId)) ?>"
8081
data-mage-init='{"addToCart":{
8182
"origin": "info",
82-
"helpLinkId": "#<?= $block->escapeJs($block->escapeHtml($helpLinkId)) ?>",
83-
"productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
83+
"helpLinkId": "#<?= $escaper->escapeJs($escaper->escapeHtml($helpLinkId)) ?>",
84+
"productName": "<?= $escaper->escapeJs($escaper->escapeHtml($product->getName())) ?>",
8485
"showAddToCart": false
8586
}
8687
}'
8788
>
88-
<span><?= $block->escapeHtml(__("What's this?")) ?></span>
89+
<span><?= $escaper->escapeHtml(__("What's this?")) ?></span>
8990
</a>
9091
</span>
9192
</td>
9293
<?php else: ?>
93-
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
94+
<td class="col price" data-th="<?= $escaper->escapeHtml(__('Price')) ?>">
9495
<?= $block->getUnitPriceHtml($_item) ?>
9596
</td>
9697
<?php endif; ?>
97-
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
98+
<td class="col qty" data-th="<?= $escaper->escapeHtml(__('Qty')) ?>">
9899
<div class="field qty">
99100
<div class="control qty">
100-
<label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
101-
<span class="label"><?= $block->escapeHtml(__('Qty')) ?></span>
102-
<input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
103-
name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
104-
data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
105-
value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
101+
<label for="cart-<?= $escaper->escapeHtmlAttr($_item->getId()) ?>-qty">
102+
<span class="label"><?= $escaper->escapeHtml(__('Qty')) ?></span>
103+
<input id="cart-<?= $escaper->escapeHtmlAttr($_item->getId()) ?>-qty"
104+
name="cart[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>][qty]"
105+
data-cart-item-id="<?= $escaper->escapeHtmlAttr($_item->getSku()) ?>"
106+
value="<?= $escaper->escapeHtmlAttr($block->getQty()) ?>"
106107
type="number"
107108
min="0"
108109
size="4"
109110
step="any"
110-
title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
111+
title="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>"
111112
class="input-text qty"
112113
data-validate="{required:true,'validate-greater-than-zero':true}"
113-
data-item-qty="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
114+
data-item-qty="<?= $escaper->escapeHtmlAttr($block->getQty()) ?>"
114115
data-role="cart-item-qty"/>
115116
</label>
116117
</div>
117118
</div>
118119
</td>
119120

120-
<td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
121+
<td class="col subtotal" data-th="<?= $escaper->escapeHtml(__('Subtotal')) ?>">
121122
<?php if ($canApplyMsrp): ?>
122123
<span class="cart msrp subtotal">--</span>
123124
<?php else: ?>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateWidgetWithEnabledBlockActionGroup.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 2025 Adobe
5+
* All Rights Reserved.
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="AdminCreateWidgetWithEnabledBlockActionGroup" extends="AdminCreateWidgetWithBlockActionGroup">
12+
<annotations>
13+
<description>EXTENDS: AdminCreateWidgetWithBlockActionGroup. Creates the provided Widget which includes the provided enabled Block (instead of disabled).</description>
14+
</annotations>
15+
16+
<remove keyForRemoval="chooseStatus"/>
17+
<selectOption selector="{{AdminNewWidgetSection.blockStatus}}" userInput="Enable" stepKey="chooseStatusEnabled" after="waitForLoadBlocks"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/PageBuilderConfigData.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="DisablePageBuilderConfigData">
11+
<data key="path">cms/pagebuilder/enabled</data>
12+
<data key="value">0</data>
13+
</entity>
14+
<entity name="EnablePageBuilderConfigData">
15+
<data key="path">cms/pagebuilder/enabled</data>
16+
<data key="value">1</data>
17+
</entity>
18+
</entities>

‎app/code/Magento/Customer/Model/AccountManagement.php‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,8 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
967967
}
968968
$this->customerRegistry->remove($customer->getId());
969969
} catch (InputException $e) {
970-
$this->customerRepository->delete($customer);
970+
$this->deleteCustomerInSecureArea($customer);
971+
971972
throw $e;
972973
}
973974
$customer = $this->customerRepository->getById($customer->getId());
@@ -1678,4 +1679,23 @@ private function isAddressAllowedForWebsite(AddressInterface $address, $storeId)
16781679

16791680
return in_array($address->getCountryId(), $allowedCountries);
16801681
}
1682+
1683+
/**
1684+
* Set isSecureArea to true, then delete the customer and revert isSecureArea to original value
1685+
*
1686+
* @param CustomerInterface $customer
1687+
* @return void
1688+
* @throws LocalizedException
1689+
*/
1690+
private function deleteCustomerInSecureArea(CustomerInterface $customer): void
1691+
{
1692+
$originalValue = $this->registry->registry('isSecureArea');
1693+
$this->registry->unregister('isSecureArea');
1694+
$this->registry->register('isSecureArea', true);
1695+
1696+
$this->customerRepository->delete($customer);
1697+
1698+
$this->registry->unregister('isSecureArea');
1699+
$this->registry->register('isSecureArea', $originalValue);
1700+
}
16811701
}

‎app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogFilterDatePickerTodayActionGroup.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* Copyright 2021 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -15,6 +15,7 @@
1515
<click selector="{{AdminLoginAsCustomerLogToolbarSection.filters}}" stepKey="clickFilters"/>
1616
<click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerFrom}}" stepKey="clickFromDate"/>
1717
<click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickToToday"/>
18+
<waitForElementClickable selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerTo}}" stepKey="waitForToDateClickable"/>
1819
<click selector="{{AdminLoginAsCustomerLogToolbarSection.DatePickerTo}}" stepKey="clickToDate"/>
1920
<click selector="{{AdminLoginAsCustomerLogToolbarSection.todayDate}}" stepKey="clickTodayDateAgain"/>
2021
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>

‎app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,5 +323,6 @@
323323
<data key="amount_note">Voided authorization. Amount: $15.00.</data>
324324
<data key="status">void</data>
325325
<data key="label">Voided</data>
326+
<data key="cancelled_note">Canceled order online Amount: $15.00.</data>
326327
</entity>
327328
</entities>

0 commit comments

Comments
 (0)