MC-34039: Merge 2.4-develop into 2.4-develop-php74

fascinosum · fascinosum · commit 9ead59058865 · 2020-05-07T13:12:40.000-05:00
diff --git a/app/code/Magento/Cron/Test/Unit/Model/DeadlockRetrierTest.php b/app/code/Magento/Cron/Test/Unit/Model/DeadlockRetrierTest.php
@@ -35,18 +35,19 @@ class DeadlockRetrierTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->adapterMock = $this->createMock(AdapterInterface::class);
+        $this->adapterMock = $this->getMockForAbstractClass(AdapterInterface::class);
         $this->modelMock = $this->createMock(AbstractModel::class);
         $this->retrier = new DeadlockRetrier();
     }
 
     /**
-     * @expectedException \Magento\Framework\DB\Adapter\DeadlockException
      */
     public function testInsideTransaction(): void
     {
+        $this->expectException(\Magento\Framework\DB\Adapter\DeadlockException::class);
+
         $this->adapterMock->expects($this->once())
             ->method('getTransactionLevel')
             ->willReturn(1);
@@ -63,10 +64,11 @@ function () {
     }
 
     /**
-     * @expectedException \Magento\Framework\DB\Adapter\DeadlockException
      */
     public function testRetry(): void
     {
+        $this->expectException(\Magento\Framework\DB\Adapter\DeadlockException::class);
+
         $this->adapterMock->expects($this->once())
             ->method('getTransactionLevel')
             ->willReturn(0);
diff --git a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
@@ -81,7 +81,7 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->getMock();
 
-        $this->retrierMock = $this->createMock(DeadlockRetrierInterface::class);
+        $this->retrierMock = $this->getMockForAbstractClass(DeadlockRetrierInterface::class);
     }
 
     /**
@@ -477,7 +477,7 @@ public function testTryLockJobSuccess(): void
         $jobCode = 'test_job';
         $tableName = 'cron_schedule';
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
         $connectionMock->expects($this->once())
             ->method('update')
             ->with(
@@ -535,7 +535,7 @@ public function testTryLockJobFailure(): void
         $jobCode = 'test_job';
         $tableName = 'cron_schedule';
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
         $connectionMock->expects($this->once())
             ->method('update')
             ->with(
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -223,7 +223,7 @@ protected function setUp(): void
             ->getMock();
         $this->statFactory->expects($this->any())->method('create')->willReturn($this->stat);
 
-        $this->retrierMock = $this->createMock(DeadlockRetrierInterface::class);
+        $this->retrierMock = $this->getMockForAbstractClass(DeadlockRetrierInterface::class);
 
         $this->cronQueueObserver = new ProcessCronQueueObserver(
             $this->objectManagerMock,
@@ -313,7 +313,7 @@ public function testDispatchCanNotLock()
         $schedule->expects($this->never())->method('setFinishedAt');
         $schedule->expects($this->once())->method('getResource')->willReturn($this->scheduleResourceMock);
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $this->scheduleResourceMock->expects($this->once())
             ->method('getConnection')
@@ -398,7 +398,7 @@ public function testDispatchExceptionTooLate()
         $schedule->expects($this->once())->method('save');
         $schedule->expects($this->once())->method('getResource')->willReturn($this->scheduleResourceMock);
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $this->scheduleResourceMock->expects($this->once())
             ->method('getConnection')
@@ -482,7 +482,7 @@ public function testDispatchExceptionNoCallback()
         $schedule->expects($this->any())->method('getStatus')->willReturn(Schedule::STATUS_ERROR);
         $schedule->expects($this->once())->method('save');
         $schedule->expects($this->once())->method('getResource')->willReturn($this->scheduleResourceMock);
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $this->scheduleResourceMock->expects($this->once())
             ->method('getConnection')
@@ -593,7 +593,7 @@ public function testDispatchExceptionInCallback(
         $schedule->expects($this->exactly($saveCalls))->method('save');
         $schedule->expects($this->exactly($saveCalls))->method('getResource')->willReturn($this->scheduleResourceMock);
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $this->scheduleResourceMock->expects($this->exactly($saveCalls))
             ->method('getConnection')
@@ -717,7 +717,7 @@ public function testDispatchRunJob()
         $schedule->expects($this->any())->method('setFinishedAt')->willReturnSelf();
         $schedule->expects($this->exactly(2))->method('getResource')->willReturn($this->scheduleResourceMock);
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $this->scheduleResourceMock->expects($this->exactly(2))
             ->method('getConnection')
@@ -1050,7 +1050,7 @@ public function testMissedJobsCleanedInTime()
         $scheduleMock->expects($this->exactly(9))->method('getResource')->willReturn($this->scheduleResourceMock);
         $this->scheduleFactoryMock->expects($this->exactly(10))->method('create')->willReturn($scheduleMock);
 
-        $connectionMock = $this->createMock(AdapterInterface::class);
+        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
 
         $connectionMock->expects($this->exactly(5))
             ->method('delete')
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Setup/InstallConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Setup/InstallConfigTest.php
@@ -25,7 +25,7 @@ class InstallConfigTest extends TestCase
      */
     private $configWriterMock;
 
-    protected function setup()
+    protected function setup(): void
     {
         $this->configWriterMock = $this->getMockBuilder(WriterInterface::class)->getMockForAbstractClass();
 
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Setup/ValidatorTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Setup/ValidatorTest.php
@@ -31,7 +31,7 @@ class ValidatorTest extends TestCase
      */
     private $elasticsearchClientMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->clientResolverMock = $this->getMockBuilder(ClientResolver::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php
@@ -24,7 +24,7 @@ class ValidatorTest extends TestCase
 
     private $scopeConfigMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $this->otherEngineValidatorMock = $this->getMockForAbstractClass(ValidatorInterface::class);
diff --git a/app/code/Magento/Search/Test/Unit/Setup/CompositeInstallConfigTest.php b/app/code/Magento/Search/Test/Unit/Setup/CompositeInstallConfigTest.php
@@ -36,7 +36,7 @@ class CompositeInstallConfigTest extends TestCase
      */
     private $scopeConfigMock;
 
-    protected function setup()
+    protected function setup(): void
     {
         $objectManager = new ObjectManager($this);
         $this->firstInstallConfigMock = $this->getMockForAbstractClass(InstallConfigInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -20,7 +20,7 @@
  */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");
     }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -11,7 +11,7 @@
  */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");
     }
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -31,7 +31,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
      */
     protected $searchEngine;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ConfigureCatalogSearchTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ConfigureCatalogSearchTest.php
@@ -25,7 +25,7 @@ class ConfigureCatalogSearchTest extends TestCase
      */
     private $searchConfigOptionsList;
 
-    protected function setup()
+    protected function setup(): void
     {
         $this->searchConfigOptionsList = new SearchConfigOptionsList();
         $this->controller = new ConfigureCatalogSearch($this->searchConfigOptionsList);
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/SearchEngineCheckTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/SearchEngineCheckTest.php
@@ -33,7 +33,7 @@ class SearchEngineCheckTest extends TestCase
      */
     private $objectManagerHelper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $searchConfigOptionsList = new SearchConfigOptionsList();
         $this->objectManagerHelper = new ObjectManager($this);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php
@@ -20,7 +20,7 @@ class SearchConfigOptionsListTest extends TestCase
      */
     private $searchConfigOptionsList;
 
-    protected function setup()
+    protected function setup(): void
     {
         $objectManager = new ObjectManager($this);
         $this->searchConfigOptionsList = $objectManager->getObject(SearchConfigOptionsList::class);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php
@@ -37,7 +37,7 @@ class SearchConfigTest extends TestCase
      */
     private $searchEngineValidatorMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->installConfigMock = $this->getMockBuilder(CompositeInstallConfig::class)
             ->disableOriginalConstructor()
@@ -78,11 +78,12 @@ public function testSaveConfiguration(array $installInput, array $searchInput)
      * @param array $installInput
      * @param array $searchInput
      * @dataProvider installInputDataProvider
-     * @expectedException \Magento\Setup\Exception
-     * @expectedExceptionMessage Search engine 'other-engine' is not an available search engine.
      */
     public function testSaveConfigurationInvalidSearchEngine(array $installInput, array $searchInput)
     {
+        $this->expectException(\Magento\Setup\Exception::class);
+        $this->expectExceptionMessage('Search engine \'other-engine\' is not an available search engine.');
+
         $installInput['search-engine'] = 'other-engine';
         $searchInput['search-engine'] = 'other-engine';
         $this->installConfigMock->expects($this->never())->method('configure');
@@ -94,11 +95,12 @@ public function testSaveConfigurationInvalidSearchEngine(array $installInput, ar
      * @param array $installInput
      * @param array $searchInput
      * @dataProvider installInputDataProvider
-     * @expectedExceptionMessage Could not connect to host
-     * @expectedException \Magento\Framework\Validation\ValidationException
      */
     public function testSaveConfigurationValidationFail(array $installInput, array $searchInput)
     {
+        $this->expectException(\Magento\Framework\Validation\ValidationException::class);
+        $this->expectExceptionMessage('Could not connect to host');
+
         $this->installConfigMock->expects($this->once())->method('configure')->with($searchInput);
         $this->searchEngineValidatorMock
             ->expects($this->once())

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class InstallConfigTest extends TestCase`
`25`	`25`	`*/`
`26`	`26`	`private $configWriterMock;`
`27`	`27`
`28`		`- protected function setup()`
	`28`	`+ protected function setup(): void`
`29`	`29`	`{`
`30`	`30`	`$this->configWriterMock = $this->getMockBuilder(WriterInterface::class)->getMockForAbstractClass();`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class ValidatorTest extends TestCase`
`31`	`31`	`*/`
`32`	`32`	`private $elasticsearchClientMock;`
`33`	`33`
`34`		`- protected function setUp()`
	`34`	`+ protected function setUp(): void`
`35`	`35`	`{`
`36`	`36`	`$this->clientResolverMock = $this->getMockBuilder(ClientResolver::class)`
`37`	`37`	`->disableOriginalConstructor()`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ValidatorTest extends TestCase`
`24`	`24`
`25`	`25`	`private $scopeConfigMock;`
`26`	`26`
`27`		`- protected function setUp()`
	`27`	`+ protected function setUp(): void`
`28`	`28`	`{`
`29`	`29`	`$objectManager = new ObjectManager($this);`
`30`	`30`	`$this->otherEngineValidatorMock = $this->getMockForAbstractClass(ValidatorInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class CompositeInstallConfigTest extends TestCase`
`36`	`36`	`*/`
`37`	`37`	`private $scopeConfigMock;`
`38`	`38`
`39`		`- protected function setup()`
	`39`	`+ protected function setup(): void`
`40`	`40`	`{`
`41`	`41`	`$objectManager = new ObjectManager($this);`
`42`	`42`	`$this->firstInstallConfigMock = $this->getMockForAbstractClass(InstallConfigInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class FullTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`{`
`23`		`- protected function setUp()`
	`23`	`+ protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`$this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`	`class CollectionTest extends \PHPUnit\Framework\TestCase`
`13`	`13`	`{`
`14`		`- protected function setUp()`
	`14`	`+ protected function setUp(): void`
`15`	`15`	`{`
`16`	`16`	`$this->markTestSkipped("MC-18332: Mysql Search Engine is deprecated and will be removed");`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest`
`31`	`31`	`*/`
`32`	`32`	`protected $searchEngine;`
`33`	`33`
`34`		`- protected function setUp()`
	`34`	`+ protected function setUp(): void`
`35`	`35`	`{`
`36`	`36`	`$this->objectManager = Bootstrap::getObjectManager();`
`37`	`37`