From 1ee76f0d3f9a4adfd6d64ccce92c04a969efa13f Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 31 Mar 2020 21:57:46 +0300
Subject: [PATCH 1/2] Upgrade to phpunit 8

Update unit tests in Amqp module
---
 .../Test/Unit/Setup/ConfigOptionsListTest.php | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
index 5b19ba055d059..57d9372dc0f0d 100644
--- a/app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php
+++ b/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());
     }
 

From 45c8564a6264c37ee7c43a7862abd0f3b5216570 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 2 Apr 2020 12:17:57 +0300
Subject: [PATCH 2/2] Fix static tests

---
 .../Framework/TestFramework/Unit/Listener/GarbageCleanup.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
index 483bc7148a7c7..34a8963c198cc 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/GarbageCleanup.php
@@ -17,7 +17,8 @@ class GarbageCleanup implements TestListener
     use \PHPUnit\Framework\TestListenerDefaultImplementation;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function endTestSuite(TestSuite $suite): void