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

fascinosum · fascinosum · commit c7fefd5c0c25 · 2020-04-27T19:38:15.000-05:00
diff --git a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
@@ -323,7 +323,7 @@ public function testEmailNotifyWhenCredentialsChanged(
             ->withConsecutive([$oldEmail, self::STUB_CUSTOMER_NAME], [$newEmail, self::STUB_CUSTOMER_NAME])
             ->willReturnSelf();
 
-        $transport = $this->createMock(TransportInterface::class);
+        $transport = $this->getMockForAbstractClass(TransportInterface::class);
 
         $this->transportBuilderMock->expects(clone $expects)
             ->method('getTransport')
@@ -813,7 +813,7 @@ private function mockDefaultTransportBuilder(
         string $customerName,
         array $templateVars = []
     ):void {
-        $transportMock = $this->createMock(TransportInterface::class);
+        $transportMock = $this->getMockForAbstractClass(TransportInterface::class);
 
         $this->transportBuilderMock->expects($this->once())
             ->method('setTemplateIdentifier')
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
     {
         $this->config = $this->getMockBuilder(BlacklistPatternsConfigInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->config->expects($this->at(0))->method('get')->willReturn([
             'tmp' => '/pub\/media\/tmp/',
             'captcha' => '/pub\/media\/captcha/'
diff --git a/app/code/Magento/MediaGalleryCatalog/Test/Unit/Plugin/Product/Gallery/RemoveAssetAfterRemoveImageTest.php b/app/code/Magento/MediaGalleryCatalog/Test/Unit/Plugin/Product/Gallery/RemoveAssetAfterRemoveImageTest.php
@@ -56,8 +56,8 @@ protected function setUp(): void
         $this->processorSubjectMock = $this->createMock(ProcessorSubject::class);
         $this->productMock = $this->createMock(Product::class);
 
-        $this->deleteMediaAssetByPathMock = $this->createMock(DeleteAssetsByPathsInterface::class);
-        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->deleteMediaAssetByPathMock = $this->getMockForAbstractClass(DeleteAssetsByPathsInterface::class);
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $this->plugin = (new ObjectManagerHelper($this))->getObject(
             RemoveAssetAfterRemoveImage::class,
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Account/EmailTemplateTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Account/EmailTemplateTest.php
@@ -44,7 +44,7 @@ class EmailTemplateTest extends AbstractController
      */
     private $formKey;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Customer/InvalidateTokenTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Customer/InvalidateTokenTest.php
@@ -26,7 +26,7 @@ class InvalidateTokenTest extends AbstractBackendController
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Config/ShareTest.php
@@ -30,7 +30,7 @@ class ShareTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Account/LinkTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Account/LinkTest.php
@@ -30,7 +30,7 @@ class LinkTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Customer/Products/ListProductsTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Customer/Products/ListProductsTest.php
@@ -55,7 +55,7 @@ class ListProductsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -69,7 +69,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->customerSession->logout();
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Element/UiComponent/ContextTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Element/UiComponent/ContextTest.php
@@ -40,7 +40,7 @@ class ContextTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->request = Bootstrap::getObjectManager()->get(RequestInterface::class);
         $this->contextFactory = Bootstrap::getObjectManager()->get(ContextFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Element/UiComponentFactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Element/UiComponentFactoryTest.php
@@ -29,7 +29,7 @@ class UiComponentFactoryTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->factory = Bootstrap::getObjectManager()->get(UiComponentFactoryFactory::class);
     }
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php
@@ -25,7 +25,7 @@ class ExtractAssetsFromContentTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->extractAssetsFromContent = Bootstrap::getObjectManager()
             ->get(ExtractAssetsFromContentInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php
@@ -45,7 +45,7 @@ class SaveDeleteContentAssetLinksTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->saveContentAssetLinks = Bootstrap::getObjectManager()->get(SaveContentAssetLinksInterface::class);
         $this->getAssetIdsByContentIdentity = Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php b/dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php
@@ -32,7 +32,7 @@ class UpdateContentAssetLinksTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->updateContentAssetLinks = Bootstrap::getObjectManager()->get(UpdateContentAssetLinksInterface::class);
         $this->getAssetIdsByContentIdentity = Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/AssetEndToEndTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/AssetEndToEndTest.php
@@ -73,7 +73,7 @@ class AssetEndToEndTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->saveAssetsKeywords = Bootstrap::getObjectManager()->get(SaveAssetsKeywordsInterface::class);
         $this->getAssetsKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
@@ -118,7 +118,7 @@ public function testExecute(): void
         $loadedAssets = $this->getAssetsByPath->execute([$asset->getPath()]);
         $loadedAsset = $loadedAssets[0];
 
-        $this->assertEquals(1, count($loadedAssets));
+        $this->assertCount(1, $loadedAssets);
 
         $assetKeywords = $this->assetsKeywordsFactory->create(
             [
@@ -133,14 +133,14 @@ public function testExecute(): void
         $this->saveAssetsKeywords->execute([$assetKeywords]);
         $loadedAssetKeywords = $this->getAssetsKeywords->execute([$loadedAsset->getId()]);
 
-        $this->assertEquals(1, count($loadedAssetKeywords));
+        $this->assertCount(1, $loadedAssetKeywords);
 
         /** @var AssetKeywordsInterface $loadedAssetKeywords1 */
         $loadedAssetKeywords1 = current($loadedAssetKeywords);
 
         $loadedKeywords = $loadedAssetKeywords1->getKeywords();
 
-        $this->assertEquals(2, count($loadedKeywords));
+        $this->assertCount(2, $loadedKeywords);
 
         foreach ($loadedKeywords as $theKeyword) {
             $this->assertTrue(in_array($theKeyword->getKeyword(), ['pear', 'plum']));
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/CreateByPathsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/CreateByPathsTest.php
@@ -36,7 +36,7 @@ class CreateByPathsTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->createByPaths = Bootstrap::getObjectManager()->get(CreateDirectoriesByPathsInterface::class);
         $this->mediaDirectoryPath = Bootstrap::getObjectManager()->get(Filesystem::class)
@@ -54,10 +54,11 @@ public function testCreateDirectory(): void
 
     /**
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
     public function testCreateDirectoryThatAlreadyExist(): void
     {
+        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class);
+
         $this->createByPaths->execute([self::TEST_DIRECTORY_NAME]);
         $this->assertFileExists($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME);
         $this->createByPaths->execute([self::TEST_DIRECTORY_NAME]);
@@ -66,11 +67,12 @@ public function testCreateDirectoryThatAlreadyExist(): void
     /**
      * @param array $paths
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      * @dataProvider notAllowedPathsProvider
      */
     public function testCreateDirectoryWithRelativePath(array $paths): void
     {
+        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class);
+
         $this->createByPaths->execute($paths);
     }
 
@@ -97,7 +99,7 @@ public function notAllowedPathsProvider(): array
     /**
      * @throws \Magento\Framework\Exception\FileSystemException
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Framework\Filesystem::class);
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/DeleteByPathsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/DeleteByPathsTest.php
@@ -36,7 +36,7 @@ class DeleteByPathsTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->deleteByPaths = Bootstrap::getObjectManager()->get(DeleteDirectoriesByPathsInterface::class);
         $this->filesystem = Bootstrap::getObjectManager()->get(Filesystem::class);
@@ -60,11 +60,12 @@ public function testDeleteDirectory(): void
     /**
      * @param array $paths
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
-     * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
      * @dataProvider notAllowedPathsProvider
      */
     public function testDeleteDirectoryThatIsNotAllowed(array $paths): void
     {
+        $this->expectException(\Magento\Framework\Exception\CouldNotDeleteException::class);
+
         $this->deleteByPaths->execute($paths);
     }
 
@@ -91,7 +92,7 @@ public function notAllowedPathsProvider(): array
     /**
      * @throws \Magento\Framework\Exception\FileSystemException
      */
-    public function tearDown()
+    protected function tearDown(): void
     {
         $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         if ($directory->isExist($this->testDirectoryName)) {
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsBlacklistedTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsBlacklistedTest.php
@@ -25,7 +25,7 @@ class IsBlacklistedTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->service = Bootstrap::getObjectManager()->get(IsPathBlacklistedInterface::class);
     }
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
@@ -52,7 +52,7 @@ class AssetKeywordsTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->saveAssetsKeywords = Bootstrap::getObjectManager()->get(SaveAssetsKeywordsInterface::class);
         $this->getAssetsKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
@@ -74,7 +74,7 @@ public function testSaveAndGetKeywords(array $keywords): void
         $keywords = ['pear', 'plum'];
 
         $loadedAssets = $this->getAssetsByPath->execute([self::FIXTURE_ASSET_PATH]);
-        $this->assertEquals(1, count($loadedAssets));
+        $this->assertCount(1, $loadedAssets);
         $loadedAsset = current($loadedAssets);
 
         $assetKeywords = $this->assetsKeywordsFactory->create(
@@ -87,7 +87,7 @@ public function testSaveAndGetKeywords(array $keywords): void
         $this->saveAssetsKeywords->execute([$assetKeywords]);
         $loadedAssetKeywords = $this->getAssetsKeywords->execute([$loadedAsset->getId()]);
 
-        $this->assertEquals(1, count($loadedAssetKeywords));
+        $this->assertCount(1, $loadedAssetKeywords);
 
         /** @var AssetKeywordsInterface $loadedAssetKeyword */
         $loadedAssetKeyword = current($loadedAssetKeywords);
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetsByIdsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetsByIdsTest.php
@@ -27,7 +27,7 @@ class AssetsByIdsTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->getAssetsByIds = Bootstrap::getObjectManager()->get(GetAssetsByIdsInterface::class);
     }
@@ -42,7 +42,7 @@ public function setUp()
     public function testExecute(): void
     {
         $assets = $this->getAssetsByIds->execute([self::FIXTURE_ASSET_ID]);
-        $this->assertEquals(1, count($assets));
+        $this->assertCount(1, $assets);
         $this->assertEquals($assets[0]->getPath(), self::FIXTURE_ASSET_PATH);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetsTest.php
@@ -55,7 +55,7 @@ class AssetsTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->assetFactory = Bootstrap::getObjectManager()->get(AssetInterfaceFactory::class);
         $this->saveAssets = Bootstrap::getObjectManager()->get(SaveAssetsInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/DeleteAssetsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/DeleteAssetsTest.php
@@ -31,7 +31,7 @@ class DeleteAssetsTest extends TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->getAssetsByPath = Bootstrap::getObjectManager()->get(GetAssetsByPathsInterface::class);
         $this->deleteAssetsByPaths = Bootstrap::getObjectManager()->get(DeleteAssetsByPathsInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/Tab/ReviewsTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/Tab/ReviewsTest.php
@@ -29,7 +29,7 @@ class ReviewsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Creditmemo/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Creditmemo/TotalsTest.php
@@ -34,7 +34,7 @@ class TotalsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/HistoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/HistoryTest.php
@@ -38,7 +38,7 @@ class HistoryTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -51,7 +51,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->customerSession->logout();
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Info/ButtonsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Info/ButtonsTest.php
@@ -42,7 +42,7 @@ class ButtonsTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -56,7 +56,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->registry->unregister('current_order');
         $this->customerSession->logout();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/InfoTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/InfoTest.php
@@ -44,7 +44,7 @@ class InfoTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -58,7 +58,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->registry->unregister('current_order');
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Invoice/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Invoice/TotalsTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Form/Element/MultiSelectTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Form/Element/MultiSelectTest.php
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/SanitizerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/SanitizerTest.php

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected function setUp(): void`
`35`	`35`	`{`
`36`	`36`	`$this->config = $this->getMockBuilder(BlacklistPatternsConfigInterface::class)`
`37`	`37`	`->disableOriginalConstructor()`
`38`		`- ->getMock();`
	`38`	`+ ->getMockForAbstractClass();`
`39`	`39`	`$this->config->expects($this->at(0))->method('get')->willReturn([`
`40`	`40`	`'tmp' => '/pub\/media\/tmp/',`
`41`	`41`	`'captcha' => '/pub\/media\/captcha/'`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class EmailTemplateTest extends AbstractController`
`44`	`44`	`*/`
`45`	`45`	`private $formKey;`
`46`	`46`
`47`		`- protected function setUp()`
	`47`	`+ protected function setUp(): void`
`48`	`48`	`{`
`49`	`49`	`parent::setUp();`
`50`	`50`	`$this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class InvalidateTokenTest extends AbstractBackendController`
`26`	`26`	`/**`
`27`	`27`	`* @inheritdoc`
`28`	`28`	`*/`
`29`		`- protected function setUp()`
	`29`	`+ protected function setUp(): void`
`30`	`30`	`{`
`31`	`31`	`parent::setUp();`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ShareTest extends TestCase`
`30`	`30`	`/**`
`31`	`31`	`* @inheritdoc`
`32`	`32`	`*/`
`33`		`- protected function setUp()`
	`33`	`+ protected function setUp(): void`
`34`	`34`	`{`
`35`	`35`	`parent::setUp();`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class LinkTest extends TestCase`
`30`	`30`	`/**`
`31`	`31`	`* @inheritdoc`
`32`	`32`	`*/`
`33`		`- protected function setUp()`
	`33`	`+ protected function setUp(): void`
`34`	`34`	`{`
`35`	`35`	`parent::setUp();`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class ContextTest extends TestCase`
`40`	`40`	`/**`
`41`	`41`	`* @inheritDoc`
`42`	`42`	`*/`
`43`		`- protected function setUp()`
	`43`	`+ protected function setUp(): void`
`44`	`44`	`{`
`45`	`45`	`$this->request = Bootstrap::getObjectManager()->get(RequestInterface::class);`
`46`	`46`	`$this->contextFactory = Bootstrap::getObjectManager()->get(ContextFactory::class);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class UiComponentFactoryTest extends TestCase`
`29`	`29`	`/**`
`30`	`30`	`* @inheritDoc`
`31`	`31`	`*/`
`32`		`- protected function setUp()`
	`32`	`+ protected function setUp(): void`
`33`	`33`	`{`
`34`	`34`	`$this->factory = Bootstrap::getObjectManager()->get(UiComponentFactoryFactory::class);`
`35`	`35`	`}`