PB-493: Update PHP version in composer.json files

anthoula · anthoula · commit 40d4c7ae533a · 2020-04-22T14:14:57.000-05:00
- fix fatal errors to be compatible with PHPUnit9
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php
@@ -33,7 +33,7 @@ class SortingTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->sortingFactoryMock = $this->createMock(Factory::class);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php
@@ -40,7 +40,7 @@ class ViewTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php
@@ -48,7 +48,7 @@ class UploadTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = ObjectManager::getInstance();
 
@@ -77,7 +77,7 @@ protected function setUp()
     /**
      * @inheritdoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $_FILES = [];
     }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php
@@ -44,7 +44,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
@@ -74,7 +74,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php
@@ -22,7 +22,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php
@@ -22,7 +22,7 @@ class AppearanceTest extends \PHPUnit\Framework\TestCase
      */
     private $contentTypesReader;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php
@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php
@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $fileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
@@ -30,7 +30,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
      */
     private $contentTypesFileResolverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php
@@ -23,7 +23,7 @@ class ElementTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
     }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
@@ -16,7 +16,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->templateFilter = ObjectManager::getInstance()->create(Template::class);
     }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
@@ -27,7 +27,7 @@ class UiComponentConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php
@@ -24,7 +24,7 @@ class ConfigTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->get(Config::class);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php
@@ -22,7 +22,7 @@ class RendererPoolTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php
@@ -27,7 +27,7 @@ class TemplatePluginTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->templateFilter = $this->objectManager->get(TemplateFilter::class);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php
@@ -20,7 +20,7 @@ class MenuSectionsTest extends \PHPUnit\Framework\TestCase
      */
     private $componentDirSearch;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $componentRegistrar = new ComponentRegistrar();
         $this->componentDirSearch = new DirSearch($componentRegistrar, new ReadFactory(new DriverPool()));

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SortingTest extends TestCase`
`33`	`33`	`/**`
`34`	`34`	`* @inheritdoc`
`35`	`35`	`*/`
`36`		`- protected function setUp()`
	`36`	`+ protected function setUp(): void`
`37`	`37`	`{`
`38`	`38`	`$this->objectManager = new ObjectManager($this);`
`39`	`39`	`$this->sortingFactoryMock = $this->createMock(Factory::class);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class ViewTest extends TestCase`
`40`	`40`	`/**`
`41`	`41`	`* @inheritdoc`
`42`	`42`	`*/`
`43`		`- protected function setUp()`
	`43`	`+ protected function setUp(): void`
`44`	`44`	`{`
`45`	`45`	`$this->objectManager = Bootstrap::getObjectManager();`
`46`	`46`	`$this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class UploadTest extends TestCase`
`48`	`48`	`/**`
`49`	`49`	`* @inheritdoc`
`50`	`50`	`*/`
`51`		`- protected function setUp()`
	`51`	`+ protected function setUp(): void`
`52`	`52`	`{`
`53`	`53`	`$this->objectManager = ObjectManager::getInstance();`
`54`	`54`
`@@ -77,7 +77,7 @@ protected function setUp()`
`77`	`77`	`/**`
`78`	`78`	`* @inheritdoc`
`79`	`79`	`*/`
`80`		`- protected function tearDown()`
	`80`	`+ protected function tearDown(): void`
`81`	`81`	`{`
`82`	`82`	`$_FILES = [];`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll`
`44`	`44`	`/**`
`45`	`45`	`* @inheritDoc`
`46`	`46`	`*/`
`47`		`- protected function setUp()`
	`47`	`+ protected function setUp(): void`
`48`	`48`	`{`
`49`	`49`	`parent::setUp();`
`50`	`50`	`$this->objectManager = Bootstrap::getObjectManager();`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController`
`74`	`74`	`/**`
`75`	`75`	`* @inheritDoc`
`76`	`76`	`*/`
`77`		`- protected function setUp()`
	`77`	`+ protected function setUp(): void`
`78`	`78`	`{`
`79`	`79`	`parent::setUp();`
`80`	`80`	`$this->objectManager = Bootstrap::getObjectManager();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`*/`
`23`	`23`	`private $fileResolverMock;`
`24`	`24`
`25`		`- protected function setUp()`
	`25`	`+ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`$objectManager = Bootstrap::getObjectManager();`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class AppearanceTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`*/`
`23`	`23`	`private $contentTypesReader;`
`24`	`24`
`25`		`- protected function setUp()`
	`25`	`+ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`parent::setUp();`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase`
`22`	`22`	`*/`
`23`	`23`	`private $fileResolverMock;`
`24`	`24`
`25`		`- protected function setUp()`
	`25`	`+ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`$objectManager = Bootstrap::getObjectManager();`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase`
`30`	`30`	`*/`
`31`	`31`	`private $contentTypesFileResolverMock;`
`32`	`32`
`33`		`- protected function setUp()`
	`33`	`+ protected function setUp(): void`
`34`	`34`	`{`
`35`	`35`	`$this->objectManager = Bootstrap::getObjectManager();`
`36`	`36`