Merge branch '2.4-develop' of http://github.com/magento/magento2 into Fixed-22363

� Conflicts:
�	app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml

Author: engcom-Echo

.github/CODEOWNERS

@@ -1,6 +1,7 @@
 ---
 name: Developer experience issue
 about: Issues related to customization, extensibility, modularity
+labels: 'Triage: Dev.Experience'
 
 ---
 

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

@@ -1,6 +1,7 @@
 ---
 name: Feature request
 about: Please consider reporting directly to https://github.com/magento/community-features
+labels: 'feature request'
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -15,6 +15,9 @@
     Letting us know what has changed and why it needed changing will help us validate this pull request.
 -->
 
+### Related Pull Requests
+<!-- related pull request placeholder -->
+
 ### Fixed Issues (if relevant)
 <!---
     If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,20 @@
-[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
+<p align="center">
+  <a href="https://magento.com">
+    <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento" />
+  </a>
+</p>
+<p align="center">
+    <br /><br />
+    <a href="https://www.codetriage.com/magento/magento2">
+        <img src="https://www.codetriage.com/magento/magento2/badges/users.svg" alt="Open Source Helpers" />
+    </a>
+    <a href="https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge">
+        <img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter" />
+    </a>
+    <a href="https://crowdin.com/project/magento-2">
+        <img src="https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg" alt="Crowdin" />
+    </a>
+</p>
 
 ## 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.

README.md

@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="admin">
-            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1">
                 <label>Admin Usage</label>
-                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1">
                     <label>Enable Admin Usage Tracking</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>

app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminAnalytics', __DIR__);

app/code/Magento/AdminAnalytics/registration.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Adminhtml AdminNotification Severity Renderer
  *
@@ -8,12 +10,16 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+use Magento\Backend\Block\Context;
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Url\Helper\Data;
+
 /**
  * Renderer class for action in the admin notifications grid
- *
- * @package Magento\AdminNotification\Block\Grid\Renderer
  */
-class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+class Actions extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Url\Helper\Data
@@ -25,11 +31,8 @@ class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstrac
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
-        array $data = []
-    ) {
+    public function __construct(Context $context, Data $urlHelper, array $data = [])
+    {
         $this->_urlHelper = $urlHelper;
         parent::__construct($context, $data);
     }
@@ -40,7 +43,7 @@ public function __construct(
      * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
             $this->escapeUrl($row->getUrl())
@@ -49,7 +52,7 @@ public function render(\Magento\Framework\DataObject $row)
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
-            ['_current' => true, 'id' => $row->getId()]
+            ['_current' => true, 'id' => $row->getNotificationId()]
         ) . '">' . __(
             'Mark as Read'
         ) . '</a>' : '';
@@ -63,8 +66,8 @@ public function render(\Magento\Framework\DataObject $row)
                 '*/*/remove/',
                 [
                     '_current' => true,
-                    'id' => $row->getId(),
-                    \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl
+                    'id' => $row->getNotificationId(),
+                    ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl
                 ]
             ),
             __('Are you sure?'),

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Adminhtml AdminNotification Severity Renderer
  *
@@ -7,15 +9,21 @@
  */
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
-class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\DataObject;
+
+/**
+ * Renderer class for notice in the admin notifications grid
+ */
+class Notice extends AbstractRenderer
 {
     /**
      * Renders grid column
      *
      * @param   \Magento\Framework\DataObject $row
      * @return  string
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         return '<span class="grid-row-title">' .
             $this->escapeHtml($row->getTitle()) .