Merge remote-tracking branch 'magento2/2.4-develop' into ref-AdminAddBundleItemsTest

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/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/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/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

@@ -17,6 +17,7 @@
             <testCaseId value="MC-28376"/>
             <group value="analytics"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

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

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82648"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="adminNoReportRole" stepKey="noReportUserRole"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-66464"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -12,7 +12,6 @@
 /**
  * Admin Role Model
  *
- * @api
  * @method int getParentId()
  * @method Role setParentId(int $value)
  * @method int getTreeLevel()

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

@@ -17,25 +17,23 @@ interface UserContextInterface
     /**#@+
      * User type
      */
-    const USER_TYPE_INTEGRATION = 1;
-    const USER_TYPE_ADMIN = 2;
-    const USER_TYPE_CUSTOMER = 3;
-    const USER_TYPE_GUEST = 4;
+    public const USER_TYPE_INTEGRATION = 1;
+    public const USER_TYPE_ADMIN = 2;
+    public const USER_TYPE_CUSTOMER = 3;
+    public const USER_TYPE_GUEST = 4;
     /**#@-*/
 
     /**
      * Identify current user ID.
      *
      * @return int|null
-     * @api
      */
     public function getUserId();
 
     /**
      * Retrieve current user type.
      *
      * @return int|null
-     * @api
      */
     public function getUserType();
 }