Merge remote-tracking branch 'upstream/2.4-develop' into di-compile-tests-regex

Author: fredden

Gruntfile.js.sample

@@ -52,7 +52,6 @@ module.exports = function (grunt) {
         prod: function (component) {
             var tasks = [
                 'less',
-                'autoprefixer',
                 'cssmin',
                 'usebanner'
             ].map(function (task) {

app/bootstrap.php

@@ -30,6 +30,16 @@
     exit(1);
 }
 
+// PHP 8 compatibility. Define constants that are not present in PHP < 8.0
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80000) {
+    if (!defined('T_NAME_QUALIFIED')) {
+        define('T_NAME_QUALIFIED', 24001);
+    }
+    if (!defined('T_NAME_FULLY_QUALIFIED')) {
+        define('T_NAME_FULLY_QUALIFIED', 24002);
+    }
+}
+
 require_once __DIR__ . '/autoload.php';
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

@@ -15,6 +15,7 @@
             <description value="AdminAnalytics Check Tracking."/>
             <severity value="MINOR"/>
             <testCaseId value="MC-36869"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminAnalytics/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",

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

@@ -18,23 +18,20 @@ interface InboxInterface
      *
      * @param int|null $severity
      * @return array|string|null
-     * @api
      */
     public function getSeverities($severity = null);
 
     /**
      * Retrieve Latest Notice
      *
      * @return $this
-     * @api
      */
     public function loadLatestNotice();
 
     /**
      * Retrieve notice statuses
      *
      * @return array
-     * @api
      */
     public function getNoticeStatus();
 }

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14125"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -69,7 +69,7 @@ define([
         }
     });
 
-    $(document).ready(function () {
+    $(function () {
         $('#system_messages .message-system-short .error').on('click', function () {
             $('#message-system-all').systemMessageDialog('openModal', 1);
         });

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

@@ -9,21 +9,21 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
         <div class="message-system-collapsible">
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.3.0||~7.4.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",