Skip to content

Commit 9b6cfdf

Browse files
dhorytskyidhorytskyi
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-21808
2 parents 3345605 + 128c2ad commit 9b6cfdf

File tree

72 files changed

+1203
-627
lines changed

Some content is hidden

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

72 files changed

+1203
-627
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/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/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,6 +1595,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
15951595
} else {
15961596
return parent::addAttributeToFilter($attribute, $condition, $joinType);
15971597
}
1598+
1599+
return $this;
15981600
}
15991601

16001602
/**

‎app/code/Magento/Catalog/view/frontend/web/js/gallery.js

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

6-
(function (factory) {
7-
'use strict';
8-
9-
if (typeof define === 'function' && define.amd) {
10-
define([
11-
'jquery',
12-
'jquery-ui-modules/widget'
13-
], factory);
14-
} else {
15-
factory(jQuery);
16-
}
17-
}(function ($) {
6+
define([
7+
'jquery',
8+
'jquery-ui-modules/widget'
9+
], function ($) {
1810
'use strict';
1911

2012
$.widget('mage.gallery', {
@@ -49,4 +41,4 @@
4941
});
5042

5143
return $.mage.gallery;
52-
}));
44+
});

‎app/code/Magento/Catalog/view/frontend/web/product/view/validation.js

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

6-
(function (factory) {
7-
'use strict';
8-
9-
if (typeof define === 'function' && define.amd) {
10-
define([
11-
'jquery',
12-
'jquery-ui-modules/widget',
13-
'mage/validation/validation'
14-
], factory);
15-
} else {
16-
factory(jQuery);
17-
}
18-
}(function ($) {
6+
define([
7+
'jquery',
8+
'jquery-ui-modules/widget',
9+
'mage/validation/validation'
10+
], function ($) {
1911
'use strict';
2012

2113
$.widget('mage.validation', $.mage.validation, {
@@ -97,4 +89,4 @@
9789
});
9890

9991
return $.mage.validation;
100-
}));
92+
});

‎app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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\Cookie\Block\DataProviders;
9+
10+
use Magento\Framework\Session\Config\ConfigInterface;
11+
use Magento\Framework\View\Element\Block\ArgumentInterface;
12+
13+
/**
14+
* Provide cookie configuration
15+
*/
16+
class SessionConfig implements ArgumentInterface
17+
{
18+
/**
19+
* Session config
20+
*
21+
* @var ConfigInterface
22+
*/
23+
private $sessionConfig;
24+
25+
/**
26+
* Constructor
27+
*
28+
* @param ConfigInterface $sessionConfig
29+
*/
30+
public function __construct(
31+
ConfigInterface $sessionConfig
32+
) {
33+
$this->sessionConfig = $sessionConfig;
34+
}
35+
/**
36+
* Get session.cookie_secure
37+
*
38+
* @return bool
39+
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
40+
*/
41+
public function getCookieSecure()
42+
{
43+
return $this->sessionConfig->getCookieSecure();
44+
}
45+
}

‎app/code/Magento/Cookie/view/adminhtml/layout/default.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9+
<body>
10+
<referenceContainer name="after.body.start">
11+
<block class="Magento\Framework\View\Element\Js\Cookie" name="cookie_config" template="Magento_Cookie::html/cookie.phtml">
12+
<arguments>
13+
<argument name="session_config" xsi:type="object">Magento\Cookie\Block\DataProviders\SessionConfig</argument>
14+
</arguments>
15+
</block>
16+
</referenceContainer>
17+
</body>
18+
</page>

‎app/code/Magento/Cookie/view/base/requirejs-config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
var config = {
7+
paths: {
8+
'jquery/jquery-storageapi': 'Magento_Cookie/js/jquery.storageapi.extended'
9+
}
10+
};

‎app/code/Magento/Cookie/view/base/templates/html/cookie.phtml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/**
8+
* Cookie settings initialization script
9+
*
10+
* @var $block \Magento\Framework\View\Element\Js\Cookie
11+
*/
12+
?>
13+
14+
<script>
15+
window.cookiesConfig = window.cookiesConfig || {};
16+
window.cookiesConfig.secure = <?= /* @noEscape */ $block->getSessionConfig()->getCookieSecure() ? 'true' : 'false' ?>;
17+
</script>

0 commit comments

Comments
 (0)