Skip to content

Commit 6323f0d

Browse files
soumyausoumyau
committed
MQE-1704: MFTF Compatibility with PHPUnit 8
Upgraded PhpUnit + Codeception
1 parent f6bbe8c commit 6323f0d

28 files changed

+276
-399
lines changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"ext-dom": "*",
1515
"ext-json": "*",
1616
"ext-openssl": "*",
17-
"allure-framework/allure-codeception": "~1.3.0",
17+
"allure-framework/allure-codeception": "~1.4.0",
1818
"aws/aws-sdk-php": "^3.132",
19-
"codeception/codeception": "~2.4.5",
19+
"codeception/codeception": "~4.1.4",
2020
"composer/composer": "^1.6",
2121
"csharpru/vault-php": "~3.5.3",
2222
"csharpru/vault-php-guzzle6-transport": "^2.0",
@@ -38,7 +38,7 @@
3838
"goaop/framework": "2.2.0",
3939
"codacy/coverage": "^1.4",
4040
"phpmd/phpmd": "^2.6.0",
41-
"phpunit/phpunit": "~6.5.0 || ~7.0.0",
41+
"phpunit/phpunit": "~8.0.0",
4242
"rregeer/phpunit-coverage-check": "^0.1.4",
4343
"php-coveralls/php-coveralls": "^1.0",
4444
"symfony/stopwatch": "~3.4.6"

‎composer.lock

+220-343
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/unit/Magento/FunctionalTestFramework/Allure/AllureHelperTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AllureHelperTest extends TestCase
2222
/**
2323
* Clear Allure Lifecycle
2424
*/
25-
public function tearDown()
25+
public function tearDown(): void
2626
{
2727
Allure::setDefaultLifecycle();
2828
AspectMock::clean();

‎dev/tests/unit/Magento/FunctionalTestFramework/Composer/ComposerInstallTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ComposerInstallTest extends MagentoTestCase
1818
*/
1919
private $composer;
2020

21-
public function setUp()
21+
public function setUp(): void
2222
{
2323
$composerJson = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Composer' . DIRECTORY_SEPARATOR . '_files'
2424
. DIRECTORY_SEPARATOR . 'dir1' . DIRECTORY_SEPARATOR . 'dir2' . DIRECTORY_SEPARATOR . 'composer.json';

‎dev/tests/unit/Magento/FunctionalTestFramework/Composer/ComposerPackageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ComposerPackageTest extends MagentoTestCase
1919
*/
2020
private $composer;
2121

22-
public function setUp()
22+
public function setUp(): void
2323
{
2424
$composerJson = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Composer' . DIRECTORY_SEPARATOR . '_files'
2525
. DIRECTORY_SEPARATOR . 'dir1' . DIRECTORY_SEPARATOR . 'dir2' . DIRECTORY_SEPARATOR . 'composer.json';

‎dev/tests/unit/Magento/FunctionalTestFramework/Config/Reader/FilesystemTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class FilesystemTest extends TestCase
1919
* Before test functionality
2020
* @return void
2121
*/
22-
public function setUp()
22+
public function setUp(): void
2323
{
2424
TestLoggingUtil::getInstance()->setMockLoggingUtil();
2525
}
@@ -100,7 +100,7 @@ public function createPseudoFileSystem($fileList)
100100
* After class functionality
101101
* @return void
102102
*/
103-
public static function tearDownAfterClass()
103+
public static function tearDownAfterClass(): void
104104
{
105105
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
106106
parent::tearDownAfterClass();

‎dev/tests/unit/Magento/FunctionalTestFramework/Console/BaseGenerateCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class BaseGenerateCommandTest extends TestCase
1717
{
18-
public function tearDown()
18+
public function tearDown(): void
1919
{
2020
AspectMock::clean();
2121
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/PersistedObjectHandlerTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class PersistedObjectHandlerTest extends MagentoTestCase
2727
* Before test functionality
2828
* @return void
2929
*/
30-
public function setUp()
30+
public function setUp(): void
3131
{
3232
TestLoggingUtil::getInstance()->setMockLoggingUtil();
3333
}
@@ -510,7 +510,7 @@ public function mockCurlHandler($response)
510510
]);
511511
}
512512

513-
public function tearDown()
513+
public function tearDown(): void
514514
{
515515
// Clear out Singleton between tests
516516
$property = new \ReflectionProperty(PersistedObjectHandler::class, "INSTANCE");
@@ -524,7 +524,7 @@ public function tearDown()
524524
* After class functionality
525525
* @return void
526526
*/
527-
public static function tearDownAfterClass()
527+
public static function tearDownAfterClass(): void
528528
{
529529
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
530530
parent::tearDownAfterClass();

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Objects/EntityDataObjectTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class EntityDataObjectTest extends MagentoTestCase
4040
* Before test functionality
4141
* @return void
4242
*/
43-
public function setUp()
43+
public function setUp(): void
4444
{
4545
TestLoggingUtil::getInstance()->setMockLoggingUtil();
4646
}
@@ -141,7 +141,7 @@ public function testGetCamelCaseKeys()
141141
* After class functionality
142142
* @return void
143143
*/
144-
public static function tearDownAfterClass()
144+
public static function tearDownAfterClass(): void
145145
{
146146
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
147147
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Persist/OperationDataArrayResolverTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class OperationDataArrayResolverTest extends MagentoTestCase
4141
* Before test functionality
4242
* @return void
4343
*/
44-
public function setUp()
44+
public function setUp(): void
4545
{
4646
TestLoggingUtil::getInstance()->setMockLoggingUtil();
4747
}
@@ -481,7 +481,7 @@ public function testNestedMetadataArrayOfDiverseObjects()
481481
* After class functionality
482482
* @return void
483483
*/
484-
public static function tearDownAfterClass()
484+
public static function tearDownAfterClass(): void
485485
{
486486
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
487487
}

‎dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Util/DataExtensionUtilTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EntityDataExtensionTest extends MagentoTestCase
2222
* Before method functionality
2323
* @return void
2424
*/
25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
AspectMock::clean();
2828
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Objects/ElementObjectTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testTimeoutNotNull()
3232
$element = new ElementObject('name', 'type', 'selector', null, '15', false);
3333
$timeout = $element->getTimeout();
3434
$this->assertEquals(15, $timeout);
35-
$this->assertInternalType('int', $timeout);
35+
$this->assertIsInt($timeout);
3636
}
3737

3838
/**
@@ -43,7 +43,7 @@ public function testTimeoutCastFromString()
4343
$element = new ElementObject('name', 'type', 'selector', null, 'helloString', true);
4444
$timeout = $element->getTimeout();
4545
$this->assertEquals(0, $timeout);
46-
$this->assertInternalType('int', $timeout);
46+
$this->assertIsInt($timeout);
4747
}
4848

4949
/**

‎dev/tests/unit/Magento/FunctionalTestFramework/Suite/Handlers/SuiteObjectHandlerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class SuiteObjectHandlerTest extends MagentoTestCase
2121
{
22-
public function setUp()
22+
public function setUp(): void
2323
{
2424
$resolverMock = new MockModuleResolverBuilder();
2525
$resolverMock->setup();

‎dev/tests/unit/Magento/FunctionalTestFramework/Suite/SuiteGeneratorTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SuiteGeneratorTest extends MagentoTestCase
2929
/**
3030
* Setup entry append and clear for Suite Generator
3131
*/
32-
public static function setUpBeforeClass()
32+
public static function setUpBeforeClass(): void
3333
{
3434
AspectMock::double(SuiteGenerator::class, [
3535
'clearPreviousSessionConfigEntries' => null,
@@ -41,7 +41,7 @@ public static function setUpBeforeClass()
4141
* Before test functionality
4242
* @return void
4343
*/
44-
public function setUp()
44+
public function setUp(): void
4545
{
4646
TestLoggingUtil::getInstance()->setMockLoggingUtil();
4747
$resolverMock = new MockModuleResolverBuilder();
@@ -274,7 +274,7 @@ private function setMockTestAndSuiteParserOutput($testData, $suiteData)
274274
/**
275275
* clean up function runs after all tests
276276
*/
277-
public static function tearDownAfterClass()
277+
public static function tearDownAfterClass(): void
278278
{
279279
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
280280
parent::tearDownAfterClass();

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/TestObjectHandlerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private function setMockParserOutput($data)
283283
*
284284
* @return void
285285
*/
286-
public function tearDown()
286+
public function tearDown(): void
287287
{
288288
AspectMock::clean();
289289
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionGroupObjectTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ActionGroupObjectTest extends MagentoTestCase
2828
* Before test functionality
2929
* @return void
3030
*/
31-
public function setUp()
31+
public function setUp(): void
3232
{
3333
TestLoggingUtil::getInstance()->setMockLoggingUtil();
3434
}
@@ -355,7 +355,7 @@ private function assertOnMergeKeyAndActionValue($actions, $expectedValue, $expec
355355
* After class functionality
356356
* @return void
357357
*/
358-
public static function tearDownAfterClass()
358+
public static function tearDownAfterClass(): void
359359
{
360360
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
361361
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ActionObjectTest extends MagentoTestCase
2828
* Before test functionality
2929
* @return void
3030
*/
31-
public function setUp()
31+
public function setUp(): void
3232
{
3333
TestLoggingUtil::getInstance()->setMockLoggingUtil();
3434
}
@@ -393,7 +393,7 @@ private function mockDataHandlerWithData($dataObject)
393393
* After class functionality
394394
* @return void
395395
*/
396-
public static function tearDownAfterClass()
396+
public static function tearDownAfterClass(): void
397397
{
398398
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
399399
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionGroupAnnotationExtractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ActionGroupAnnotationExtractorTest extends TestCase
1616
* Before test functionality
1717
* @return void
1818
*/
19-
public function setUp()
19+
public function setUp(): void
2020
{
2121
TestLoggingUtil::getInstance()->setMockLoggingUtil();
2222
}
@@ -48,7 +48,7 @@ public function testActionGroupExtractAnnotations()
4848
* After class functionality
4949
* @return void
5050
*/
51-
public static function tearDownAfterClass()
51+
public static function tearDownAfterClass(): void
5252
{
5353
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
5454
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionGroupObjectExtractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ActionGroupObjectExtractorTest extends MagentoTestCase
1717
/**
1818
* Setup method
1919
*/
20-
public function setUp()
20+
public function setUp(): void
2121
{
2222
$this->testActionGroupObjectExtractor = new ActionGroupObjectExtractor();
2323
TestLoggingUtil::getInstance()->setMockLoggingUtil();
@@ -63,7 +63,7 @@ private function createBasicActionObjectArray(
6363
/**
6464
* clean up function runs after all tests
6565
*/
66-
public static function tearDownAfterClass()
66+
public static function tearDownAfterClass(): void
6767
{
6868
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
6969
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ActionMergeUtilTest extends MagentoTestCase
2323
* Before test functionality
2424
* @return void
2525
*/
26-
public function setUp()
26+
public function setUp(): void
2727
{
2828
TestLoggingUtil::getInstance()->setMockLoggingUtil();
2929
}
@@ -292,7 +292,7 @@ public function testInvalidSecretFunctions()
292292
* After class functionality
293293
* @return void
294294
*/
295-
public static function tearDownAfterClass()
295+
public static function tearDownAfterClass(): void
296296
{
297297
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
298298
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionObjectExtractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ActionObjectExtractorTest extends MagentoTestCase
1818
/**
1919
* Setup method
2020
*/
21-
public function setUp()
21+
public function setUp(): void
2222
{
2323
$this->testActionObjectExtractor = new ActionObjectExtractor();
2424
TestLoggingUtil::getInstance()->setMockLoggingUtil();
@@ -130,7 +130,7 @@ private function createBasicActionObjectArray($stepKey = 'testAction1', $before
130130
/**
131131
* clean up function runs after all tests
132132
*/
133-
public static function tearDownAfterClass()
133+
public static function tearDownAfterClass(): void
134134
{
135135
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
136136
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/AnnotationExtractorTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AnnotationExtractorTest extends TestCase
1919
* Before test functionality
2020
* @return void
2121
*/
22-
public function setUp()
22+
public function setUp(): void
2323
{
2424
TestLoggingUtil::getInstance()->setMockLoggingUtil();
2525
}
@@ -209,7 +209,7 @@ public function testTestCaseIdUniqueness()
209209
* After class functionality
210210
* @return void
211211
*/
212-
public static function tearDownAfterClass()
212+
public static function tearDownAfterClass(): void
213213
{
214214
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
215215
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ObjectExtensionUtilTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ObjectExtensionUtilTest extends TestCase
2828
* Before test functionality
2929
* @return void
3030
*/
31-
public function setUp()
31+
public function setUp(): void
3232
{
3333
TestLoggingUtil::getInstance()->setMockLoggingUtil();
3434
$resolverMock = new MockModuleResolverBuilder();
@@ -39,7 +39,7 @@ public function setUp()
3939
* After class functionality
4040
* @return void
4141
*/
42-
public static function tearDownAfterClass()
42+
public static function tearDownAfterClass(): void
4343
{
4444
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
4545
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ModuleResolverTest extends MagentoTestCase
2525
* Before test functionality
2626
* @return void
2727
*/
28-
public function setUp()
28+
public function setUp(): void
2929
{
3030
TestLoggingUtil::getInstance()->setMockLoggingUtil();
3131
}
@@ -34,7 +34,7 @@ public function setUp()
3434
* After class functionality
3535
* @return void
3636
*/
37-
public static function tearDownAfterClass()
37+
public static function tearDownAfterClass(): void
3838
{
3939
TestLoggingUtil::getInstance()->clearMockLoggingUtil();
4040
}
@@ -987,7 +987,7 @@ private function mockForceGenerate($forceGenerate)
987987
* After method functionality
988988
* @return void
989989
*/
990-
protected function tearDown()
990+
protected function tearDown(): void
991991
{
992992
// re set env
993993
if (!isset($_ENV['MAGENTO_ADMIN_USERNAME'])) {

0 commit comments

Comments
 (0)