Merge branch '2.4-develop' into fix-addConfigurableProductsToCart

.github/CONTRIBUTING.md

@@ -15,7 +15,7 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,7 +34,7 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 2.
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -20,7 +20,7 @@ Fields marked with (*) are required. Please don't remove the template.
 <!--- Suggest your potential solutions for this issue. -->
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

.github/PULL_REQUEST_TEMPLATE.md

@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 76
+daysUntilStale: 152
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 14
+daysUntilClose: 28
 
 # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
 onlyLabels: []
@@ -15,6 +15,8 @@ exemptLabels:
   - "Priority: P0"
   - "Priority: P1"
   - "Priority: P2"
+  - "Severity: S0"
+  - "Severity: S1"
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
@@ -39,8 +41,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 28 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

README.md

@@ -15,50 +15,55 @@
     </a>
 </p>
 
-## Welcome
+# Welcome
+
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento System Requirements
-[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).
+
+* [Magento System Requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
 
 ## Install Magento
 
-*    [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
+* [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html)
+
+## Learn About GraphQL in Magento 2
 
-## Learn More About GraphQL in Magento 2
+* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.4/graphql/index.html)
 
-* [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.3/graphql/index.html)
+## Contributing to the Magento 2 Code Base
 
-<h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 
 To learn about how to contribute, click [here][1].
 
-To learn about issues, click [here][2]. To open an issue, click [here][3].
+To learn about issues, click [here][2].
+
+To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
-[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
+[1]: https://devdocs.magento.com/contributor-guide/contributing.html
+[2]: https://devdocs.magento.com/contributor-guide/contributing.html#report
 [3]: https://github.com/magento/magento2/issues
 [4]: https://devdocs.magento.com
 
-<h3>Community Maintainers</h3>
+### Community Maintainers
+
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks to these Community Maintainers for their valuable contributions.
 
-<a href="https://magento.com/magento-contributors#maintainers">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
-</a>
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers)
+
+### Top Contributors
 
-<h3>Top Contributors</h3>
 Magento is thankful for any contribution that can improve our codebase, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
-<a href="https://magento.com/magento-contributors">
-    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
-</a>
+
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://magento.com/magento-contributors)
 
 ### Labels Applied by the Magento Team
+
 We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
-Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
+Please review the [Code Contributions guide](https://devdocs.magento.com/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
 ## Reporting Security Issues
 
@@ -71,18 +76,17 @@ Stay up-to-date on the latest security news and patches for Magento by signing u
 Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
 
 [Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
-Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.4-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
 
 Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit <https://magento.com/legal/terms/enterprise>.
 
 ## Community Engineering Slack
 
 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).
 
-
 We have channels for each project. These channels are recommended for new members:
 
-- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
-- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
-- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
+* [general](https://magentocommeng.slack.com/archives/C4YS78WE6): Open chat for introductions and Magento 2 questions
+* [github](https://magentocommeng.slack.com/archives/C7KB93M32): Support for GitHub issues, pull requests, and processes
+* [public-backlog](https://magentocommeng.slack.com/archives/CCV3J3RV5): Discussions of the Magento 2 backlog

app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

@@ -11,6 +11,12 @@
             <policy id="script-src">
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
+            <policy id="style-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="img-src">
@@ -19,6 +25,7 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                     <value id="dpmdemdex" type="host">dpm.demdex.net</value>
                     <value id="everesttech" type="host">cm.everesttech.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
             <policy id="connect-src">
@@ -27,9 +34,15 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                 </values>
             </policy>
+            <policy id="media-src">
+                <values>
+                    <value id="adobe" type="host">*.adobe.com</value>
+                </values>
+            </policy>
             <policy id="frame-src">
                 <values>
                     <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                    <value id="adobe" type="host">*.adobe.com</value>
                 </values>
             </policy>
         </policies>

app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml

@@ -85,7 +85,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>Help us improve Magento Admin by allowing us to collect usage data.</p>
                         <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin and related products and services.</p>
-                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/m2/ce/user_guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
+                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/user-guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
 ]]></item>
                     </item>
                 </argument>

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -101,6 +101,8 @@ protected function _getConfigUrl()
      */
     public function getIdentity()
     {
+        // md5() here is not for cryptographic use.
+        // phpcs:ignore Magento2.Security.InsecureFunction
         return md5('BASE_URL' . $this->_getConfigUrl());
     }
 

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

@@ -62,6 +62,8 @@ protected function _getCacheTypesForRefresh()
      */
     public function getIdentity()
     {
+        // md5() here is not for cryptographic use.
+        // phpcs:ignore Magento2.Security.InsecureFunction
         return md5('cache' . implode(':', $this->_getCacheTypesForRefresh()));
     }
 

app/code/Magento/AdminNotification/README.md

@@ -5,24 +5,25 @@ The Magento_AdminNotification module provides the ability to alert administrator
 ## Installation details
 
 The Magento_AdminNotification module creates the following tables in the database:
+
 - `adminnotification_inbox`
 - `admin_system_messages`
 
 Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
 
-For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
 
 ## Extensibility
 
-Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+Extension developers can interact with the Magento_AdminNotification module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
 
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdminNotification module.
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdminNotification module.
 
 ### Events
 
 This module observes the following events:
 
- - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver` file.
+- `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver` file.
 
 ### Layouts
 
@@ -31,10 +32,10 @@ This module introduces the following layouts and layout handles in the `view/adm
 - `adminhtml_notification_index`
 - `adminhtml_notification_block`
 
-For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+For more information about layouts in Magento 2, see the [Layout documentation](https://devdocs.magento.com/guides/v2.4/frontend-dev-guide/layouts/layout-overview.html).
 
 ### UI components
 
 You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
 
-For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
+For information about UI components in Magento 2, see [Overview of UI components](https://devdocs.magento.com/guides/v2.4/ui_comp_guide/bk-ui_comps.html).

app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js

@@ -36,6 +36,16 @@ define([
             return record[this.messageIndex];
         },
 
+        /**
+         * Proxy to getLabel function with UnsanitizedHtml suffix
+         *
+         * @param {Object} record
+         * @returns {String}
+         */
+        getLabelUnsanitizedHtml: function (record) {
+            return this.getLabel(record);
+        },
+
         /** @inheritdoc */
         getFieldClass: function ($row) {
             var status = this.statusMap[$row.status] || 'warning',

app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/cells/message.html

@@ -5,4 +5,4 @@
  */
 -->
 <div css="$col.getFieldClass($row())"
-     html="$col.getLabel($row())"/>
+     html="$col.getLabelUnsanitizedHtml($row())"></div>