merge magento/2.4-develop into magento-techdivision/MC-33061-fix-sql-view-backup

Author: magento-mts-svc

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAdminWithCredentialsActionGroup.xml

@@ -11,28 +11,27 @@
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\App\CacheInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * Class CanViewNotificationTest
- */
-class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
+class CanViewNotificationTest extends TestCase
 {
     /** @var CanViewNotification */
     private $canViewNotification;
 
-    /** @var  Logger|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Logger|MockObject */
     private $viewerLoggerMock;
 
-    /** @var ProductMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ProductMetadataInterface|MockObject */
     private $productMetadataMock;
 
-    /** @var  Log|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Log|MockObject */
     private $logMock;
 
-    /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
+    /** @var  $cacheStorageMock MockObject|CacheInterface */
     private $cacheStorageMock;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();

app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/_Deprecated_ActionGroup/LoginAsAdminActionGroup.xml

@@ -22,7 +22,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php

@@ -161,15 +161,13 @@
                 <item name="25" xsi:type="string">payment/banktransfer/active</item>
                 <item name="26" xsi:type="string">payment/cashondelivery/title</item>
                 <item name="27" xsi:type="string">payment/cashondelivery/active</item>
-                <item name="28" xsi:type="string">payment/authorizenet_directpost/title</item>
-                <item name="29" xsi:type="string">payment/authorizenet_directpost/active</item>
-                <item name="30" xsi:type="string">payment/paypal_billing_agreement/title</item>
-                <item name="31" xsi:type="string">payment/paypal_billing_agreement/active</item>
-                <item name="32" xsi:type="string">payment/braintree/title</item>
-                <item name="33" xsi:type="string">payment/braintree/active</item>
-                <item name="34" xsi:type="string">payment/braintree_paypal/title</item>
-                <item name="35" xsi:type="string">payment/braintree_paypal/active</item>
-                <item name="36" xsi:type="string">analytics/general/vertical</item>
+                <item name="28" xsi:type="string">payment/paypal_billing_agreement/title</item>
+                <item name="29" xsi:type="string">payment/paypal_billing_agreement/active</item>
+                <item name="30" xsi:type="string">payment/braintree/title</item>
+                <item name="31" xsi:type="string">payment/braintree/active</item>
+                <item name="32" xsi:type="string">payment/braintree_paypal/title</item>
+                <item name="33" xsi:type="string">payment/braintree_paypal/active</item>
+                <item name="34" xsi:type="string">analytics/general/vertical</item>
             </argument>
         </arguments>
     </type>