Skip to content

Commit f1a9736

Browse files
VladimirZaetsVladimirZaets
authored
Merge pull request #4239 from magento-engcom/2.3-develop-prs
[Magento Community Engineering] Community Contributions - 2.3-develop
2 parents 6494c9f + 24c3292 commit f1a9736

File tree

9 files changed

+66
-12
lines changed

9 files changed

+66
-12
lines changed

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public function __construct(
6767
}
6868

6969
/**
70-
* {@inheritdoc}
70+
* @inheritdoc
71+
*
7172
* @since 101.0.0
7273
*/
7374
public function modifyData(array $data)
@@ -76,6 +77,8 @@ public function modifyData(array $data)
7677
}
7778

7879
/**
80+
* Check if can add attributes on product form.
81+
*
7982
* @return boolean
8083
*/
8184
private function canAddAttributes()
@@ -89,7 +92,8 @@ private function canAddAttributes()
8992
}
9093

9194
/**
92-
* {@inheritdoc}
95+
* @inheritdoc
96+
*
9397
* @since 101.0.0
9498
*/
9599
public function modifyMeta(array $meta)
@@ -111,6 +115,8 @@ public function modifyMeta(array $meta)
111115
}
112116

113117
/**
118+
* Modify meta customize attribute modal.
119+
*
114120
* @param array $meta
115121
* @return array
116122
*/
@@ -207,6 +213,8 @@ private function customizeAddAttributeModal(array $meta)
207213
}
208214

209215
/**
216+
* Modify meta to customize create attribute modal.
217+
*
210218
* @param array $meta
211219
* @return array
212220
*/
@@ -289,6 +297,8 @@ private function customizeCreateAttributeModal(array $meta)
289297
}
290298

291299
/**
300+
* Modify meta to customize attribute grid.
301+
*
292302
* @param array $meta
293303
* @return array
294304
*/
@@ -309,7 +319,7 @@ private function customizeAttributesGrid(array $meta)
309319
'immediateUpdateBySelection' => true,
310320
'behaviourType' => 'edit',
311321
'externalFilterMode' => true,
312-
'dataLinks' => ['imports' => false, 'exports' => true],
322+
'dataLinks' => ['imports' => false, 'exports' => false],
313323
'formProvider' => 'ns = ${ $.namespace }, index = product_form',
314324
'groupCode' => static::GROUP_CODE,
315325
'groupName' => static::GROUP_NAME,

‎app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @api
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1516
* @since 100.0.2
1617
*/
1718
class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
@@ -26,7 +27,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
2627
/**
2728
* @var \Magento\Catalog\Model\Product[]
2829
*/
29-
private $products;
30+
private $products = [];
3031

3132
/**
3233
* Assign link table name

‎app/code/Magento/Paypal/view/frontend/layout/customer_account.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
910
<body>
1011
<referenceBlock name="customer_account_navigation">
11-
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-billing-agreements-link">
12+
<block class="Magento\Customer\Block\Account\SortLinkInterface"
13+
name="customer-account-navigation-billing-agreements-link"
14+
ifconfig="payment/paypal_express/active"
15+
>
1216
<arguments>
1317
<argument name="path" xsi:type="string">paypal/billing_agreement</argument>
1418
<argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>

‎app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Magento\Reports\Model\ResourceModel\Report;
1313

1414
/**
15+
* Class Collection
16+
*
1517
* @api
1618
* @since 100.0.2
1719
*/
@@ -100,6 +102,7 @@ public function __construct(
100102

101103
/**
102104
* Set period
105+
*
103106
* @codeCoverageIgnore
104107
*
105108
* @param int $period
@@ -113,6 +116,7 @@ public function setPeriod($period)
113116

114117
/**
115118
* Set interval
119+
*
116120
* @codeCoverageIgnore
117121
*
118122
* @param \DateTimeInterface $fromDate
@@ -248,7 +252,7 @@ protected function _getYearInterval(\DateTime $dateStart, \DateTime $dateEnd, $f
248252
? $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-m-d 00:00:00'))
249253
: $this->_localeDate->convertConfigTimeToUtc($dateStart->format('Y-01-01 00:00:00'));
250254

251-
$interval['end'] = $dateStart->diff($dateEnd)->y == 0
255+
$interval['end'] = $dateStart->format('Y') === $dateEnd->format('Y')
252256
? $this->_localeDate->convertConfigTimeToUtc(
253257
$dateStart->setDate($dateStart->format('Y'), $dateEnd->format('m'), $dateEnd->format('d'))
254258
->format('Y-m-d 23:59:59')
@@ -275,6 +279,7 @@ public function getPeriods()
275279

276280
/**
277281
* Set store ids
282+
*
278283
* @codeCoverageIgnore
279284
*
280285
* @param array $storeIds
@@ -288,6 +293,7 @@ public function setStoreIds($storeIds)
288293

289294
/**
290295
* Get store ids
296+
*
291297
* @codeCoverageIgnore
292298
*
293299
* @return array
@@ -309,6 +315,7 @@ public function getSize()
309315

310316
/**
311317
* Set page size
318+
*
312319
* @codeCoverageIgnore
313320
*
314321
* @param int $size
@@ -322,6 +329,7 @@ public function setPageSize($size)
322329

323330
/**
324331
* Get page size
332+
*
325333
* @codeCoverageIgnore
326334
*
327335
* @return int

‎app/code/Magento/Vault/view/frontend/layout/customer_account.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
910
<body>
1011
<referenceBlock name="customer_account_navigation">
11-
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-my-credit-cards-link">
12+
<block class="Magento\Customer\Block\Account\SortLinkInterface"
13+
name="customer-account-navigation-my-credit-cards-link"
14+
ifconfig="payment/braintree/active"
15+
>
1216
<arguments>
1317
<argument name="path" xsi:type="string">vault/cards/listaction</argument>
1418
<argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>

‎app/design/frontend/Magento/luma/web/css/source/_extends.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,7 @@
15321532
.abs-block-items-counter {
15331533
.lib-css(color, @block-items__counter__color);
15341534
.lib-font-size(12px);
1535+
vertical-align: middle;
15351536
white-space: nowrap;
15361537

15371538
&:before {
@@ -1555,6 +1556,7 @@
15551556
strong {
15561557
font-size: @font-size__l;
15571558
font-weight: @font-weight__light;
1559+
vertical-align: middle;
15581560
}
15591561
}
15601562
}

‎lib/web/css/source/lib/_typography.less‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
.lib-font-face(
1111
@family-name,
1212
@font-path,
13+
@font-format: false,
1314
@font-weight: normal,
1415
@font-style: normal,
1516
@font-display: auto
16-
) {
17+
) when (@font-format = false) {
1718
@font-face {
1819
font-family: @family-name;
1920
src: url('@{font-path}.woff2') format('woff2'),
@@ -24,6 +25,23 @@
2425
}
2526
}
2627

28+
.lib-font-face(
29+
@family-name,
30+
@font-path,
31+
@font-format: false,
32+
@font-weight: normal,
33+
@font-style: normal,
34+
@font-display: auto
35+
) when not (@font-format = false) {
36+
@font-face {
37+
font-family: @family-name;
38+
src: url('@{font-path}.@{font-format}') format(@font-format);
39+
font-weight: @font-weight;
40+
font-style: @font-style;
41+
font-display: @font-display;
42+
}
43+
}
44+
2745
// Rem font size
2846
.lib-font-size(@sizeValue) when not (ispercentage(@sizeValue)) and not (@sizeValue = false) and (isunit(@sizeValue, @font-size-unit)) {
2947
.lib-css(font-size, @sizeValue);

‎lib/web/jquery.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
* Date: 2016-05-20T17:17Z
1313
*/
1414

15+
/*
16+
* includes patch for CVE-2019-11358
17+
* prototype pollution vulnerability in jQuery before 3.4.0
18+
*/
19+
1520
(function( global, factory ) {
1621

1722
if ( typeof module === "object" && typeof module.exports === "object" ) {
@@ -209,8 +214,9 @@
209214
src = target[ name ];
210215
copy = options[ name ];
211216

217+
// Prevent Object.prototype pollution
212218
// Prevent never-ending loop
213-
if ( target === copy ) {
219+
if ( name === "__proto__" || target === copy ) {
214220
continue;
215221
}
216222

‎lib/web/jquery/jquery.min.js‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)