Merge branch '2.4-develop' into trigger-unable-create

Author: fredden

.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,7 +41,7 @@ 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.
+  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.

README.md

@@ -21,13 +21,13 @@ Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a
 
 ## Magento System Requirements
 
-[Magento System Requirements](https://devdocs.magento.com/guides/v2.4/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.4/install-gde/bk-install-guide.html).
+* [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/bk-install-guide.html)
 
-## Learn More About GraphQL in Magento 2
+## Learn About GraphQL in Magento 2
 
 * [GraphQL Developer Guide](https://devdocs.magento.com/guides/v2.4/graphql/index.html)
 
@@ -37,12 +37,14 @@ Contributions can take the form of new components or features, changes to existi
 
 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.4/contributor-guide/contributing.html
-[2]: https://devdocs.magento.com/guides/v2.4/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
 
@@ -61,7 +63,7 @@ Magento is thankful for any contribution that can improve our codebase, document
 ### 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.4/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
 
@@ -85,6 +87,6 @@ To connect with Magento and the Community, join us on the [Magento Community Eng
 
 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/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>

app/code/Magento/AsynchronousOperations/Model/AccessValidator.php

@@ -55,6 +55,6 @@ public function isAllowed($bulkUuid)
             $this->bulkSummaryFactory->create(),
             $bulkUuid
         );
-        return $bulkSummary->getUserId() === $this->userContext->getUserId();
+        return ((int) $bulkSummary->getUserId()) === ((int) $this->userContext->getUserId());
     }
 }

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html

@@ -6,4 +6,4 @@
 -->
 <div css="$data.additionalClasses"
      if="error"
-     text="error"/>
+     text="error"></div>

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html

@@ -11,5 +11,5 @@
             attr="{
                 title: $action().label
             }"
-    />
+    ></button>
 </div>

app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html

@@ -31,12 +31,12 @@
                 <a class="action__message-log"
                    href="#"
                    click="dismissAll"
-                   text="dismissAllText"/>
+                   text="dismissAllText"></a>
                 <a class="action__message-log"
                     attr="{
                         href: link
                     }"
-                    text="linkText"/>
+                    text="linkText"></a>
             </div>
         </div>
     </div>

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -60,7 +60,7 @@ protected function add(UserContextInterface $userContext)
      */
     public function getUserId()
     {
-        return $this->getUserContext() ? $this->getUserContext()->getUserId() : null;
+        return $this->getUserContext() ? ((int) $this->getUserContext()->getUserId()) : null;
     }
 
     /**

app/code/Magento/Backend/Test/Mftf/Helper/CurlHelpers.php

@@ -25,8 +25,13 @@ class CurlHelpers extends Helper
      * @return void
      *
      */
-    public function assertCurlResponseContainsString($url, $expectedString, $postBody = null, $cookieName = 'admin', $message = ''): void
-    {
+    public function assertCurlResponseContainsString(
+        $url,
+        $expectedString,
+        $postBody = null,
+        $cookieName = 'admin',
+        $message = ''
+    ): void {
         $cookie = $this->getCookie($cookieName);
         $curlResponse = $this->getCurlResponse($url, $cookie, $postBody);
         $this->assertStringContainsString($expectedString, $curlResponse, $message);
@@ -43,8 +48,13 @@ public function assertCurlResponseContainsString($url, $expectedString, $postBod
      * @return void
      *
      */
-    public function assertImageContentIsEqual($url, $expectedString, $postBody = null, $cookieName = null, $message = ''): void
-    {
+    public function assertImageContentIsEqual(
+        $url,
+        $expectedString,
+        $postBody = null,
+        $cookieName = null,
+        $message = ''
+    ): void {
         $cookie = $this->getCookie($cookieName);
         $imageContent = $this->getCurlResponse($url, $cookie, $postBody);
         // Must make request twice until bug is resolved: B2B-1789
@@ -65,23 +75,57 @@ public function assertImageContentIsEqual($url, $expectedString, $postBody = nul
      * @return void
      *
      */
-    public function assertCurlResponseDoesNotContainString($url, $expectedString, $postBody = null, $cookieName = 'admin'): void
-    {
+    public function assertCurlResponseDoesNotContainString(
+        $url,
+        $expectedString,
+        $postBody = null,
+        $cookieName = 'admin'
+    ): void {
         $cookie = $this->getCookie($cookieName);
         $curlResponse = $this->getCurlResponse($url, $cookie, $postBody);
         $this->assertStringNotContainsString($expectedString, $curlResponse);
     }
 
+    /**
+     * Assert a that a curl request's response headers contains an expected string
+     *
+     * @param string $url
+     * @param string $expectedString
+     * @param string $postBody
+     * @param string $cookieName
+     * @return void
+     *
+     */
+    public function assertCurlResponseHeadersContainsString(
+        $url,
+        $expectedString,
+        $postBody = null,
+        $cookieName = 'admin'
+    ): void {
+        $cookie = $this->getCookie($cookieName);
+        $curlResponse = $this->getCurlResponse(
+            $url,
+            $cookie,
+            $postBody,
+            [
+                CURLOPT_NOBODY => true,
+                CURLOPT_HEADER => true,
+            ]
+        );
+        $this->assertStringContainsString($expectedString, $curlResponse);
+    }
+
     /**
      * Sends a curl request with the provided URL & cookie. Returns the response
      *
      * @param string $url
      * @param string $cookie
      * @param string $postBody
+     * @param array $options
      * @return string
      *
      */
-    private function getCurlResponse($url, $cookie = null, $postBody = null): string
+    private function getCurlResponse($url, $cookie = null, $postBody = null, array $options = []): string
     {
         // Start Session
         $session = curl_init($url);
@@ -94,6 +138,9 @@ private function getCurlResponse($url, $cookie = null, $postBody = null): string
         }
         curl_setopt($session, CURLOPT_COOKIE, $cookie);
         curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
+        foreach ($options as $option => $value) {
+            curl_setopt($session, $option, $value);
+        }
 
         // Execute
         $response = curl_exec($session);