Skip to content

Commit 6ef58b4

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into AC-12682
2 parents 13d36b6 + fd5cf3a commit 6ef58b4

File tree

70 files changed

+1319
-963
lines changed

Some content is hidden

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

70 files changed

+1319
-963
lines changed

‎app/code/Magento/ApplicationPerformanceMonitor/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
**ApplicationPerformanceMonitor**
1+
# ApplicationPerformanceMonitor
22

33
Monitors the Performance of the Application
44

55
To configure, edit app/etc/env.php
66
Add these lines.
77

8-
```
8+
```php
99
'application' => [
1010
'performance_monitor' => [
1111
'logger_output_enable' => 1,
@@ -21,7 +21,8 @@ The option `logger_output_enable` enables outputting performance metrics to the
2121
The option `logger_output_verbose` adds additional metrics.
2222

2323
Example output in log file without verbose:
24-
```
24+
25+
```log
2526
[2023-10-04T20:48:23.727037+00:00] report.ERROR: "Profile information": {
2627
"applicationClass": "Magento\ApplicationServer\App\Application\Interceptor",
2728
"applicationServer": "1",
@@ -36,7 +37,8 @@ Example output in log file without verbose:
3637
```
3738

3839
Example output in log file with verbose:
39-
```
40+
41+
```log
4042
[2023-10-04T20:55:31.174304+00:00] report.ERROR: "Profile information": {
4143
"applicationClass": "Magento\ApplicationServer\App\Application\Interceptor",
4244
"applicationServer": "1",

‎app/code/Magento/ApplicationPerformanceMonitorNewRelic/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
**ApplicationPerformanceMonitorNewRelic**
1+
# ApplicationPerformanceMonitorNewRelic
22

33
Monitors the Performance of the Application in New Relic
44

55
To use this module, it requires a New Relic account and the environment already by configured to use that account.
6-
For general New Relic PHP configuration information, see https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/ .
6+
For general New Relic PHP configuration information, see <https://docs.newrelic.com/docs/apm/agents/php-agent/configuration/php-agent-configuration/>.
77

8-
To configure this module, edit app/etc/env.php
8+
To configure this module, edit `app/etc/env.php`.
99
Add these lines.
1010

11-
```
11+
```php
1212
'application' => [
1313
'performance_monitor' => [
1414
'newrelic_output_enable' => 1,
1515
'newrelic_output_verbose' => 0,
1616
]
1717
]
1818
```
19+
1920
Use 0 or 1 as the value to enable or disable.
2021
`newrelic_output_enable` defaults to 1, and `newrelic_output_verbose` defaults to 0.
2122

‎app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,31 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var \Magento\Backend\Block\Template $block */
8+
/** @var \Magento\Framework\Escaper $escaper */
69
?>
710
<div class="page-actions">
811
<div class="page-actions-inner">
912
<div class="page-actions-buttons">
1013
<?= $block->getChildHtml() ?>
1114

15+
<?php if ($block->getAuthorization()->isAllowed('Magento_Reports::statistics')): ?>
1216
<form class="action-element"
13-
action="<?= $block->escapeUrl($block->getUrl('*/*/refreshStatistics')) ?>"
17+
action="<?= $escaper->escapeUrl($block->getUrl('*/*/refreshStatistics')) ?>"
1418
method="post">
1519
<input
1620
name="form_key"
1721
type="hidden"
18-
value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>"/>
22+
value="<?= $escaper->escapeHtmlAttr($block->getFormKey()) ?>"/>
1923
<button
2024
class="action-primary"
2125
type="submit"
22-
title="<?= $block->escapeHtmlAttr(__('Reload Data')) ?>">
23-
<?= $block->escapeHtml(__('Reload Data')) ?>
26+
title="<?= $escaper->escapeHtmlAttr(__('Reload Data')) ?>">
27+
<?= $escaper->escapeHtml(__('Reload Data')) ?>
2428
</button>
2529
</form>
30+
<?php endif; ?>
2631
</div>
2732
</div>
2833
</div>

‎app/code/Magento/Bundle/view/frontend/requirejs-config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,12 @@ var config = {
1111
slide: 'Magento_Bundle/js/slide',
1212
productSummary: 'Magento_Bundle/js/product-summary'
1313
}
14+
},
15+
config: {
16+
mixins: {
17+
'mage/validation': {
18+
'Magento_Bundle/js/validation': true
19+
}
20+
}
1421
}
1522
};

‎app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,65 @@
55
*/
66
?>
77

8-
<?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
8+
<?php
9+
/**
10+
* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox
11+
* @var \Magento\Framework\Escaper $escaper
12+
*/
13+
?>
914
<?php $_option = $block->getOption() ?>
1015
<?php $_selections = $_option->getSelections() ?>
11-
<?php $inputClass = 'checkbox product bundle option bundle-option-' . $block->escapeHtmlAttr($_option->getId()) ?>
12-
<?php $inputId = 'bundle-option-' . $block->escapeHtmlAttr($_option->getId()) ?>
13-
<?php $inputName = 'bundle_option[' . $block->escapeHtmlAttr($_option->getId()) . ']' ?>
16+
<?php $inputClass = 'checkbox product bundle option bundle-option-' . $escaper->escapeHtmlAttr($_option->getId()) ?>
17+
<?php $inputId = 'bundle-option-' . $escaper->escapeHtmlAttr($_option->getId()) ?>
18+
<?php $inputName = 'bundle_option[' . $escaper->escapeHtmlAttr($_option->getId()) . ']' ?>
1419
<?php $dataValidation = 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' .
15-
$block->escapeHtmlAttr($_option->getId()) . ']&quot;]:checked\'}"' ?>
20+
$escaper->escapeHtmlAttr($_option->getId()) . ']&quot;]:checked\'}"' ?>
1621

1722
<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
1823
<label class="label">
19-
<span><?= $block->escapeHtml($_option->getTitle()) ?></span>
24+
<span><?= $escaper->escapeHtml($_option->getTitle()) ?></span>
2025
</label>
2126
<div class="control">
2227
<div class="nested options-list">
2328
<?php if ($block->showSingle()): ?>
2429
<?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
2530
<?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
2631
<input type="hidden"
27-
class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> product bundle option"
28-
name="bundle_option[<?= $block->escapeHtml($_option->getId()) ?>]"
29-
value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
32+
class="bundle-option-<?= $escaper->escapeHtmlAttr($_option->getId()) ?> product bundle option"
33+
name="bundle_option[<?= $escaper->escapeHtml($_option->getId()) ?>]"
34+
value="<?= $escaper->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
3035
<?php else: ?>
3136
<?php foreach ($_selections as $selection): ?>
3237
<?php $sectionId = $selection->getSelectionId() ?>
3338
<div class="field choice">
3439
<input class="<?=/* @noEscape */ $inputClass ?> change-container-classname"
35-
id="<?=/* @noEscape */ $inputId . '-' . $block->escapeHtmlAttr($sectionId)?>"
36-
type="checkbox"
37-
<?php if ($_option->getRequired()): ?>
38-
<?= /* @noEscape */ $dataValidation ?>
39-
<?php endif;?>
40-
name="<?=/* @noEscape */ $inputName .'['. $block->escapeHtmlAttr($sectionId)?>]"
41-
data-selector="<?= /* @noEscape */ $inputName.'['.$block->escapeHtmlAttr($sectionId)?>]"
42-
<?php if ($block->isSelected($selection)): ?>
43-
<?= ' checked="checked"' ?>
44-
<?php endif; ?>
45-
<?php if (!$selection->isSaleable()): ?>
46-
<?= ' disabled="disabled"' ?>
47-
<?php endif; ?>
48-
value="<?= $block->escapeHtmlAttr($sectionId) ?>"
49-
data-errors-message-box="#validation-message-box"/>
40+
id="<?=/* @noEscape */ $inputId . '-' . $escaper->escapeHtmlAttr($sectionId)?>"
41+
type="checkbox"
42+
<?php if ($_option->getRequired()): ?>
43+
<?= /* @noEscape */ $dataValidation ?>
44+
<?php endif;?>
45+
name="<?=/* @noEscape */ $inputName .'['. $escaper->escapeHtmlAttr($sectionId)?>]"
46+
data-selector="<?= /* @noEscape */ $inputName.'['.$escaper->escapeHtmlAttr($sectionId)?>]"
47+
<?php if ($block->isSelected($selection)): ?>
48+
<?= ' checked="checked"' ?>
49+
<?php endif; ?>
50+
<?php if (!$selection->isSaleable()): ?>
51+
<?= ' disabled="disabled"' ?>
52+
<?php endif; ?>
53+
value="<?= $escaper->escapeHtmlAttr($sectionId) ?>"
54+
data-errors-msg-box="#validation-message-box-<?=$escaper->escapeHtmlAttr($_option->getId())?>"/>
5055
<label class="label"
51-
for="<?= /* @noEscape */ $inputId . '-' . $block->escapeHtmlAttr($sectionId) ?>">
56+
for="<?= /* @noEscape */ $inputId . '-' . $escaper->escapeHtmlAttr($sectionId) ?>">
5257
<span><?= /* @noEscape */ $block->getSelectionQtyTitlePrice($selection) ?></span>
5358
<br/>
5459
<?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($selection) ?>
5560
</label>
5661
</div>
62+
5763
<?php endforeach; ?>
58-
<div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
59-
<div id="validation-message-box"></div>
6064
<?php endif; ?>
6165
</div>
66+
<div id="bundle-option-<?= $escaper->escapeHtmlAttr($_option->getId()) ?>-container"></div>
67+
<div id="validation-message-box-<?= $escaper->escapeHtmlAttr($_option->getId()) ?>"></div>
6268
</div>
6369
</div>

‎app/code/Magento/Bundle/view/frontend/web/js/validation.js

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
define([
2+
'jquery',
3+
'jquery-ui-modules/widget'
4+
], function ($) {
5+
'use strict';
6+
var enhancedMageValidation = {
7+
/**
8+
* @param {*} error
9+
* @param {*} element
10+
*/
11+
options: {
12+
errorPlacement: function (error, element) {
13+
var errorPlacement = element,
14+
fieldWrapper,messageBox;
15+
16+
// logic for date-picker error placement
17+
if (element.hasClass('_has-datepicker')) {
18+
errorPlacement = element.siblings('button');
19+
}
20+
// logic for field wrapper
21+
fieldWrapper = element.closest('.addon');
22+
23+
if (fieldWrapper.length) {
24+
errorPlacement = fieldWrapper.after(error);
25+
}
26+
//logic for checkboxes/radio
27+
if (element.is(':checkbox') || element.is(':radio')) {
28+
errorPlacement = element.parents('.control').children().last();
29+
30+
//fallback if group does not have .control parent
31+
if (!errorPlacement.length) {
32+
errorPlacement = element.siblings('label').last();
33+
}
34+
}
35+
if (element.attr('data-errors-msg-box')) {
36+
messageBox = $(element.attr('data-errors-msg-box'));
37+
messageBox.html(error);
38+
return;
39+
}
40+
//logic for control with tooltip
41+
if (element.siblings('.tooltip').length) {
42+
errorPlacement = element.siblings('.tooltip');
43+
}
44+
//logic for select with tooltip in after element
45+
if (element.next().find('.tooltip').length) {
46+
errorPlacement = element.next();
47+
}
48+
errorPlacement.after(error);
49+
}
50+
51+
}
52+
};
53+
54+
return function (mageValidation) {
55+
$.widget('mage.validation', mageValidation, enhancedMageValidation);
56+
return $.mage.validation;
57+
};
58+
});

‎app/code/Magento/Catalog/view/frontend/web/js/related-products.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,12 @@ define([
4747
* @return {Boolean} - Prevent default event action and event propagation.
4848
*/
4949
_selectAllRelated: function (e) {
50-
var innerHTML = this.options.relatedProductsCheckFlag ?
51-
this.options.selectAllMessage : this.options.unselectAllMessage;
50+
let isChecked = this.options.relatedProductsCheckFlag;
5251

53-
$(e.target).html(innerHTML);
54-
$(this.options.relatedCheckbox + ':visible').attr(
55-
'checked',
56-
this.options.relatedProductsCheckFlag = !this.options.relatedProductsCheckFlag
57-
);
52+
$(e.target).html(isChecked ? this.options.selectAllMessage : this.options.unselectAllMessage);
53+
this.options.relatedProductsCheckFlag = !isChecked;
54+
55+
$(this.options.relatedCheckbox + ':visible').prop('checked', this.options.relatedProductsCheckFlag);
5856
this._addRelatedToProduct();
5957

6058
return false;

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function _construct()
6464
*/
6565
public function prepareCondition($attribute, $value)
6666
{
67-
$condition = false;
67+
$condition = $value;
6868

6969
if (is_array($value)) {
7070
if ($attribute->getBackendType() == 'varchar') { // multiselect

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityAcceptLowerThanStockQuantityAfterChangingStockInBackendTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description value="Verify if lower than stock product quantity is accepted after changing stock qty in backend"/>
1515
<severity value="CRITICAL"/>
1616
<testCaseId value="AC-5987"/>
17-
<group value="mtf_migrated"/>
17+
<group value="mtf_migrated"/>
1818
</annotations>
1919

2020
<before>
@@ -61,14 +61,14 @@
6161
<waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
6262

6363
<!--Assert "The requested qty is not available"-->
64-
<see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="The requested qty is not available" stepKey="seeTheErrorMessageDisplayed"/>
64+
<see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="Not enough items for sale" stepKey="seeTheErrorMessageDisplayed"/>
6565

6666
<fillField selector="{{CheckoutCartProductSection.qty($$simpleProduct.sku$$)}}" userInput="8" stepKey="updateProductQty"/>
6767
<click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
6868
<waitForAjaxLoad stepKey="waitForAjaxLoad2"/>
6969
<waitForAjaxLoad stepKey="waitForPageLoad2"/>
7070

71-
<dontSee userInput="The requested qty is not available" stepKey="dontSeeTheErrorMessageDisplayed"/>
71+
<dontSee userInput="Not enough items for sale" stepKey="dontSeeTheErrorMessageDisplayed"/>
7272

7373
</test>
7474
</tests>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addProductToCart"/>
5151
<!-- Check that error remains -->
5252
<actionGroup ref="StorefrontAssertProductAddToCartErrorMessageActionGroup" stepKey="assertFailure">
53-
<argument name="message" value="The requested qty is not available"/>
53+
<argument name="message" value="Not enough items for sale"/>
5454
</actionGroup>
5555
</test>
5656
</tests>

0 commit comments

Comments
 (0)