Skip to content

Commit 6f14e00

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MC-15991-category-image
# Conflicts: # app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
2 parents 4745f33 + abbfa03 commit 6f14e00

File tree

436 files changed

+13559
-2458
lines changed

Some content is hidden

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

436 files changed

+13559
-2458
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Please see LICENSE_EE.txt for the full text of the MEE License or visit https://
6464

6565
## Community Engineering Slack
6666

67-
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-slack).
67+
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://opensource.magento.com/slack).
6868

6969

7070
We have channels for each project. These channels are recommended for new members:

‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
(function (factory) {
7-
if (typeof define === 'function' && define.amd) {
8-
define([
9-
'jquery',
10-
'mage/backend/validation',
11-
'prototype'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function (jQuery) {
17-
6+
define([
7+
'jquery',
8+
'mage/backend/validation',
9+
'prototype'
10+
], function (jQuery) {
1811
window.directPost = Class.create();
1912
directPost.prototype = {
2013
initialize: function (methodCode, iframeId, controller, orderSaveUrl, cgiUrl, nativeAction) {
@@ -349,4 +342,4 @@
349342
}
350343
}
351344
};
352-
}));
345+
});

‎app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public function testGetSolutionIdSandbox($environment, $expectedSolution)
8181
$this->assertEquals($expectedSolution, $this->model->getSolutionId(123));
8282
}
8383

84+
/**
85+
* @return array
86+
*/
8487
public function configMapProvider()
8588
{
8689
return [
@@ -97,6 +100,10 @@ public function configMapProvider()
97100
['getTransactionInfoSyncKeys', 'transactionSyncKeys', 'a,b,c', ['a', 'b', 'c']],
98101
];
99102
}
103+
104+
/**
105+
* @return array
106+
*/
100107
public function environmentUrlProvider()
101108
{
102109
return [
@@ -105,6 +112,9 @@ public function environmentUrlProvider()
105112
];
106113
}
107114

115+
/**
116+
* @return array
117+
*/
108118
public function environmentSolutionProvider()
109119
{
110120
return [

‎app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,22 @@ public function testBuildWithBothAddresses()
108108
$this->assertEquals('abc', $result['transactionRequest']['customerIP']);
109109
}
110110

111+
/**
112+
* @param $responseData
113+
* @param $addressPrefix
114+
*/
111115
private function validateAddressData($responseData, $addressPrefix)
112116
{
113117
foreach ($this->mockAddressData as $fieldValue => $field) {
114118
$this->assertEquals($addressPrefix . $field['sampleData'], $responseData[$fieldValue]);
115119
}
116120
}
117121

122+
/**
123+
* @param $prefix
124+
*
125+
* @return \PHPUnit\Framework\MockObject\MockObject
126+
*/
118127
private function createAddressMock($prefix)
119128
{
120129
$addressAdapterMock = $this->createMock(AddressAdapterInterface::class);

‎app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ public function testDoesNothingWhenPending(string $status)
112112
$this->handler->handle($subject, $response);
113113
}
114114

115+
/**
116+
* @return array
117+
*/
115118
public function pendingTransactionStatusesProvider()
116119
{
117120
return [
@@ -120,6 +123,9 @@ public function pendingTransactionStatusesProvider()
120123
];
121124
}
122125

126+
/**
127+
* @return array
128+
*/
123129
public function declinedTransactionStatusesProvider()
124130
{
125131
return [

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,22 +482,22 @@
482482
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
483483
<label>Base URL</label>
484484
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
485-
<comment>Specify URL or {{base_url}} placeholder.</comment>
485+
<comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
486486
</field>
487487
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
488488
<label>Base Link URL</label>
489489
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
490-
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
490+
<comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
491491
</field>
492492
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
493493
<label>Base URL for Static View Files</label>
494494
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
495-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
495+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
496496
</field>
497497
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
498498
<label>Base URL for User Media Files</label>
499499
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
500-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
500+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
501501
</field>
502502
</group>
503503
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
506506
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
507507
<label>Secure Base URL</label>
508508
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
509-
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
509+
<comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
510510
</field>
511511
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
512512
<label>Secure Base Link URL</label>
513513
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
514-
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
514+
<comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
515515
</field>
516516
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
517517
<label>Secure Base URL for Static View Files</label>
518518
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
519-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
519+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
520520
</field>
521521
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
522522
<label>Secure Base URL for User Media Files</label>
523523
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
524-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
524+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
525525
</field>
526526
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
527527
<label>Use Secure URLs on Storefront</label>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
170170
<?php if ($block->getSortableUpdateCallback()) : ?>
171171
<?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
172172
<?php endif; ?>
173+
<?php if ($block->getFilterKeyPressCallback()) : ?>
174+
<?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
175+
<?php endif; ?>
173176
<?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
174177
<?php if ($block->getRowInitCallback()) : ?>
175178
<?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ $numColumns = count($block->getColumns());
272272
<?php if ($block->getCheckboxCheckCallback()) : ?>
273273
<?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
274274
<?php endif; ?>
275+
<?php if ($block->getFilterKeyPressCallback()) : ?>
276+
<?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
277+
<?php endif; ?>
275278
<?php if ($block->getRowInitCallback()) : ?>
276279
<?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
277280
<?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();

‎app/code/Magento/Backend/view/adminhtml/web/js/translate.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
*/
55

66
/* eslint-disable strict */
7-
(function (factory) {
8-
if (typeof define === 'function' && define.amd) {
9-
define([
10-
'jquery',
11-
'mage/mage'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function ($) {
7+
define([
8+
'jquery',
9+
'mage/mage'
10+
], function ($) {
1711
$.extend(true, $, {
1812
mage: {
1913
translate: (function () {
@@ -51,4 +45,4 @@
5145
$.mage.__ = $.proxy($.mage.translate.translate, $.mage.translate);
5246

5347
return $.mage.__;
54-
}));
48+
});

‎app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Braintree\Error\Validation;
1212
use Braintree\Result\Error;
1313
use Braintree\Result\Successful;
14+
use Braintree\Transaction;
1415

1516
/**
1617
* Processes errors codes from Braintree response.
@@ -38,12 +39,14 @@ public function getErrorCodes($response): array
3839
$result[] = $error->code;
3940
}
4041

41-
if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
42-
$result[] = $response->transaction->gatewayRejectionReason;
43-
}
42+
if (isset($response->transaction) && $response->transaction) {
43+
if ($response->transaction->status === Transaction::GATEWAY_REJECTED) {
44+
$result[] = $response->transaction->gatewayRejectionReason;
45+
}
4446

45-
if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
46-
$result[] = $response->transaction->processorResponseCode;
47+
if ($response->transaction->status === Transaction::PROCESSOR_DECLINED) {
48+
$result[] = $response->transaction->processorResponseCode;
49+
}
4750
}
4851

4952
return $result;

0 commit comments

Comments
 (0)