Merge branch '2.4-develop' into performance-inline-translations

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

@@ -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/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -6,12 +6,16 @@
 
 namespace Magento\Amqp\Test\Unit\Setup;
 
+use Magento\Amqp\Setup\ConnectionValidator;
+use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Amqp\Setup\ConfigOptionsList;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Framework\App\DeploymentConfig;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
+class ConfigOptionsListTest extends TestCase
 {
     /**
      * @var ObjectManager
@@ -24,12 +28,12 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\Amqp\Setup\ConnectionValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConnectionValidator|MockObject
      */
     private $connectionValidatorMock;
 
     /**
-     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     * @var DeploymentConfig|MockObject
      */
     private $deploymentConfigMock;
 
@@ -38,7 +42,7 @@ class ConfigOptionsListTest extends \PHPUnit\Framework\TestCase
      */
     private $options;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->options = [
             ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_HOST => 'host',
@@ -51,18 +55,18 @@ protected function setUp()
         ];
 
         $this->objectManager = new ObjectManager($this);
-        $this->connectionValidatorMock = $this->getMockBuilder(\Magento\Amqp\Setup\ConnectionValidator::class)
+        $this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
-        $this->deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
 
         $this->model = $this->objectManager->getObject(
-            \Magento\Amqp\Setup\ConfigOptionsList::class,
+            ConfigOptionsList::class,
             [
                 'connectionValidator' => $this->connectionValidatorMock,
             ]
@@ -135,9 +139,9 @@ public function testCreateConfig($options, $expectedConfigData)
         $result = $this->model->createConfig($options, $this->deploymentConfigMock);
         $this->assertInternalType('array', $result);
         $this->assertNotEmpty($result);
-        /** @var \Magento\Framework\Config\Data\ConfigData $configData */
+        /** @var ConfigData $configData */
         $configData = $result[0];
-        $this->assertInstanceOf(\Magento\Framework\Config\Data\ConfigData::class, $configData);
+        $this->assertInstanceOf(ConfigData::class, $configData);
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.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/Analytics/etc/di.xml

@@ -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>

app/code/Magento/AsynchronousOperations/composer.json

@@ -6,6 +6,7 @@
     },
     "require": {
         "magento/framework": "*",
+        "magento/framework-message-queue": "*",
         "magento/framework-bulk": "*",
         "magento/module-authorization": "*",
         "magento/module-backend": "*",