Skip to content

Commit 9b70db7

Browse files
committed
Merge branch '1.3-develop-php74' into MC-40555
2 parents ac6f93e + 8cfe83b commit 9b70db7

File tree

18 files changed

+19
-19
lines changed

18 files changed

+19
-19
lines changed

app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SortingTest extends TestCase
3333
/**
3434
* @inheritdoc
3535
*/
36-
protected function setUp()
36+
protected function setUp(): void
3737
{
3838
$this->objectManager = new ObjectManager($this);
3939
$this->sortingFactoryMock = $this->createMock(Factory::class);

app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TemplateTest extends TestCase
3535
/**
3636
* @inheritDoc
3737
*/
38-
protected function setUp()
38+
protected function setUp(): void
3939
{
4040
parent::setUp();
4141
$this->logger = $this->createMock(LoggerInterface::class);

dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ViewTest extends TestCase
4040
/**
4141
* @inheritdoc
4242
*/
43-
protected function setUp()
43+
protected function setUp(): void
4444
{
4545
$this->objectManager = Bootstrap::getObjectManager();
4646
$this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class UploadTest extends TestCase
4848
/**
4949
* @inheritdoc
5050
*/
51-
protected function setUp()
51+
protected function setUp(): void
5252
{
5353
$this->objectManager = ObjectManager::getInstance();
5454

@@ -77,7 +77,7 @@ protected function setUp()
7777
/**
7878
* @inheritdoc
7979
*/
80-
protected function tearDown()
80+
protected function tearDown(): void
8181
{
8282
$_FILES = [];
8383
}

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
4444
/**
4545
* @inheritDoc
4646
*/
47-
protected function setUp()
47+
protected function setUp(): void
4848
{
4949
parent::setUp();
5050
$this->objectManager = Bootstrap::getObjectManager();

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
7474
/**
7575
* @inheritDoc
7676
*/
77-
protected function setUp()
77+
protected function setUp(): void
7878
{
7979
parent::setUp();
8080
$this->objectManager = Bootstrap::getObjectManager();

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AllowedParentTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
private $fileResolverMock;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
$objectManager = Bootstrap::getObjectManager();
2828

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AppearanceTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
private $contentTypesReader;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
parent::setUp();
2828

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
private $fileResolverMock;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
$objectManager = Bootstrap::getObjectManager();
2828

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
private $fileResolverMock;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
$objectManager = Bootstrap::getObjectManager();
2828

0 commit comments

Comments
 (0)