Merge remote-tracking branch 'magento2/2.4-develop' into unlock-admin-user

Author: engcom-Charlie

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.4.0||~8.0.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.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdvancedPricingImportExport/composer.json

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

app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

@@ -16,6 +16,7 @@
             <description value="Admin should be able to create a new search term using search terms grid"/>
             <severity value="CRITICAL"/>
             <group value="AdvancedSearch"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/AmqpStore/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/module-store": "*",
-        "php": "~7.4.0||~8.0.0"
+        "php": "~7.4.0||~8.0.0||~8.1.0"
     },
     "suggest": {
         "magento/module-asynchronous-operations": "*",