Merge branch 'MCP-996' of github.com:magento-performance/magento2ce into MCP-996

Author: JacobBrownAustin

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,72 @@
+name: Bug report
+description: Technical issue with the Magento 2 core components
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please read [our guidelines](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#report-an-issue) before submitting the issue.
+  - type: textarea
+    attributes:
+      label: Preconditions and environment
+      description: |
+        Describe your environment.
+        Provide all the details that will help us to reproduce the bug.
+      value: |
+        - Magento version
+        - Anything else that would help a developer reproduce the bug
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Provide a set of clear steps to reproduce this bug.
+      placeholder: |
+        Example:
+          1. Navigate to storefront as a guest.
+          2. Open Test Category.
+          3. Click “Add to Cart” on the Virtual Product.
+          4. Open mini shopping cart and click “Proceed to Checkout”.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected result
+      description: |
+        Tell us what you expected to happen.
+      placeholder: |
+        Example:
+          Order is placed successfully, customer is redirected to the success page.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual result
+      description: |
+        Tell us what happened. Include error messages and issues.
+      placeholder: |
+        Example:
+          “Place order” button is not visible, order cannot be placed.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        Additional information is often requested when the bug report is processed. You can save time by providing both Magento and browser logs, screenshots, repository branch and HEAD commit you checked out to install Magento and any other artifacts related to the issue.
+        Also, links to the comments with important information, Root Cause analysis, additional video recordings; and anything else that is important for the issue and at some reason cannot be added to other sections.
+  - type: textarea
+    attributes:
+      label: Release note
+      description: |
+        Help us to provide meaningful release notes to the community.
+  - type: checkboxes
+    attributes:
+      label: Triage and priority
+      description: |
+        Provide [Severity](https://developer.adobe.com/commerce/contributor/guides/code-contributions/#community-backlog-priority) assessment for the Issue as a Reporter.
+        This information helps us during the Confirmation and Issue triage processes.
+      options:
+        - label: 'Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._'
+        - label: 'Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._'
+        - label: 'Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._'
+        - label: 'Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._'

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -4,7 +4,7 @@ Magento values the contributions of the security research community, and we look
 
 ## Where should I report security issues?
 
-We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/magento).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
+We strongly encourage you to report all security issues privately via our [bug bounty program](https://hackerone.com/adobe).  Please provide us with relevant technical details and repro steps to expedite our investigation.  If you prefer not to use HackerOne, email us directly at `psirt@adobe.com` with details and repro steps.  
 
 ## Learning More About Security
 To learn more about securing a Magento store, please visit the [Security Center](https://magento.com/security).

SECURITY.md

@@ -5,9 +5,22 @@
  */
 namespace Magento\AdminNotification\Model;
 
-use Magento\Framework\Escaper;
+use Magento\AdminNotification\Model\InboxFactory;
+use Magento\Backend\App\ConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Escaper;
+use Magento\Framework\HTTP\Adapter\Curl;
+use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\UrlInterface;
+use SimpleXMLElement;
 
 /**
  * AdminNotification Feed model
@@ -16,87 +29,85 @@
  * @api
  * @since 100.0.2
  */
-class Feed extends \Magento\Framework\Model\AbstractModel
+class Feed extends AbstractModel
 {
-    const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';
+    public const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';
 
-    const XML_FEED_URL_PATH = 'system/adminnotification/feed_url';
+    public const XML_FEED_URL_PATH = 'system/adminnotification/feed_url';
 
-    const XML_FREQUENCY_PATH = 'system/adminnotification/frequency';
+    public const XML_FREQUENCY_PATH = 'system/adminnotification/frequency';
 
-    const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
+    public const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
 
     /**
      * @var Escaper
      */
     private $escaper;
 
     /**
-     * Feed url
-     *
      * @var string
      */
     protected $_feedUrl;
 
     /**
-     * @var \Magento\Backend\App\ConfigInterface
+     * @var ConfigInterface
      */
     protected $_backendConfig;
 
     /**
-     * @var \Magento\AdminNotification\Model\InboxFactory
+     * @var InboxFactory
      */
     protected $_inboxFactory;
 
     /**
-     * @var \Magento\Framework\HTTP\Adapter\CurlFactory
+     * @var CurlFactory
      *
      */
     protected $curlFactory;
 
     /**
      * Deployment configuration
      *
-     * @var \Magento\Framework\App\DeploymentConfig
+     * @var DeploymentConfig
      */
     protected $_deploymentConfig;
 
     /**
-     * @var \Magento\Framework\App\ProductMetadataInterface
+     * @var ProductMetadataInterface
      */
     protected $productMetadata;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlBuilder;
 
     /**
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Backend\App\ConfigInterface $backendConfig
+     * @param Context $context
+     * @param Registry $registry
+     * @param ConfigInterface $backendConfig
      * @param InboxFactory $inboxFactory
-     * @param \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory
-     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
-     * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param CurlFactory $curlFactory
+     * @param DeploymentConfig $deploymentConfig
+     * @param ProductMetadataInterface $productMetadata
+     * @param UrlInterface $urlBuilder
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
      * @param array $data
      * @param Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Backend\App\ConfigInterface $backendConfig,
-        \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
-        \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory,
-        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
-        \Magento\Framework\App\ProductMetadataInterface $productMetadata,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        Context $context,
+        Registry $registry,
+        ConfigInterface $backendConfig,
+        InboxFactory $inboxFactory,
+        CurlFactory $curlFactory,
+        DeploymentConfig $deploymentConfig,
+        ProductMetadataInterface $productMetadata,
+        UrlInterface $urlBuilder,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
         array $data = [],
         Escaper $escaper = null
     ) {
@@ -210,10 +221,11 @@ public function setLastUpdate()
     /**
      * Retrieve feed data as XML element
      *
-     * @return \SimpleXMLElement
+     * @return SimpleXMLElement
      */
     public function getFeedData()
     {
+        /** @var Curl $curl */
         $curl = $this->curlFactory->create();
         $curl->setConfig(
             [
@@ -227,11 +239,11 @@ public function getFeedData()
         $curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
         $data = $curl->read();
         $data = preg_split('/^\r?$/m', $data, 2);
-        $data = trim($data[1]);
+        $data = trim($data[1] ?? '');
         $curl->close();
 
         try {
-            $xml = new \SimpleXMLElement($data);
+            $xml = new SimpleXMLElement($data);
         } catch (\Exception $e) {
             return false;
         }
@@ -242,15 +254,15 @@ public function getFeedData()
     /**
      * Retrieve feed as XML element
      *
-     * @return \SimpleXMLElement
+     * @return SimpleXMLElement
      */
     public function getFeedXml()
     {
         try {
             $data = $this->getFeedData();
-            $xml = new \SimpleXMLElement($data);
+            $xml = new SimpleXMLElement($data);
         } catch (\Exception $e) {
-            $xml = new \SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?>');
+            $xml = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?>');
         }
 
         return $xml;
@@ -259,10 +271,10 @@ public function getFeedXml()
     /**
      * Converts incoming data to string format and escapes special characters.
      *
-     * @param \SimpleXMLElement $data
+     * @param SimpleXMLElement $data
      * @return string
      */
-    private function escapeString(\SimpleXMLElement $data)
+    private function escapeString(SimpleXMLElement $data)
     {
         return $this->escaper->escapeHtml((string)$data);
     }

app/code/Magento/AdminNotification/Model/Feed.php

@@ -3,17 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/** @var $this \Magento\AdminNotification\Block\ToolbarEntry */
-
+// phpcs:disable Generic.Files.LineLength
+/** @var $block \Magento\AdminNotification\Block\ToolbarEntry */
     $notificationCount = $block->getUnreadNotificationCount();
     $notificationCounterMax = $block->getNotificationCounterMax();
 ?>
 <div
     data-mage-init='{"toolbarEntry": {}}'
     class="notifications-wrapper admin__action-dropdown-wrap"
     data-notification-count="<?= (int)$notificationCount ?>">
-    <?php if ($notificationCount > 0) : ?>
+    <?php if ($notificationCount > 0): ?>
         <a
             href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
             class="notifications-action admin__action-dropdown"
@@ -27,19 +26,19 @@
         <ul
             class="admin__action-dropdown-menu"
             data-mark-as-read-url="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
-            <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
+            <?php foreach ($block->getLatestUnreadNotifications() as $notification): ?>
                 <?php /** @var $notification \Magento\AdminNotification\Model\Inbox */ ?>
-                <li class="notifications-entry<?php if ($notification->getSeverity() == 1) : ?> notifications-critical<?php endif; ?>"
+                <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
                     data-notification-id="<?= $block->escapeHtmlAttr($notification->getId()) ?>"
-                    data-notification-severity="<?php if ($notification->getSeverity() == 1) : ?>1<?php endif; ?>">
+                    data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
                     <?php
-                        $notificationDescription = $notification->getDescription();
+                        $notificationDescription = $notification->getDescription() ?? '';
                         $notificationDescriptionLength = $block->getNotificationDescriptionLength();
                     ?>
                     <strong class="notifications-entry-title">
                         <?= $block->escapeHtml($notification->getTitle()) ?>
                     </strong>
-                    <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
+                    <?php if (strlen($notificationDescription) > $notificationDescriptionLength): ?>
                         <p class="notifications-entry-description _cutted">
                             <span class="notifications-entry-description-start">
                                 <?= $block->escapeHtml(substr($notificationDescription, 0, $notificationDescriptionLength)) ?>
@@ -48,7 +47,7 @@
                                 <?= $block->escapeHtml(substr($notificationDescription, $notificationDescriptionLength)) ?>
                             </span>
                         </p>
-                    <?php else : ?>
+                    <?php else: ?>
                         <p class="notifications-entry-description">
                             <?= $block->escapeHtml($notificationDescription) ?>
                         </p>
@@ -71,7 +70,7 @@
                 </a>
             </li>
         </ul>
-    <?php else : ?>
+    <?php else: ?>
         <a
             class="notifications-action admin__action-dropdown"
             href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"