Skip to content

Commit 3d2e6e5

Browse files
sidolovsidolov
authored
Merge pull request #57 from magento-gl/phpunit10
[Arrows] Delivery of PHPUnit 10 Upgrade
2 parents de42815 + 0e31b83 commit 3d2e6e5

23 files changed

+287
-397
lines changed

Diff for: ‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require-dev": {
2222
"ext-dom": "*",
23-
"phpunit/phpunit": "~9.5.8",
23+
"phpunit/phpunit": "^10.5",
2424
"squizlabs/php_codesniffer": "~3.6.0"
2525
},
2626
"autoload": {

Diff for: ‎composer.lock

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

Diff for: ‎dev/tests/Unit/ClassHierarchy/EntityTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ public function testIsTrait(string $type, bool $expected)
488488
*
489489
* @return array
490490
*/
491-
public function dataProviderIsClass()
491+
public static function dataProviderIsClass()
492492
{
493493
return [
494494
'entity-is-class-returns-true' => [
@@ -511,7 +511,7 @@ public function dataProviderIsClass()
511511
*
512512
* @return array
513513
*/
514-
public function dataProviderIsInterface()
514+
public static function dataProviderIsInterface()
515515
{
516516
return [
517517
'entity-is-class-returns-false' => [
@@ -534,7 +534,7 @@ public function dataProviderIsInterface()
534534
*
535535
* @return array
536536
*/
537-
public function dataProviderIsTrait()
537+
public static function dataProviderIsTrait()
538538
{
539539
return [
540540
'entity-is-class-returns-false' => [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandApiClassesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-class';
4848
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandApiInterfacesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-interface';
4848
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandApiTraitsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testExecute(
4444
);
4545
}
4646

47-
public function changesDataProvider()
47+
public static function changesDataProvider()
4848
{
4949
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-trait';
5050

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandDatabaseSchemasTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testExecute(
4848
/**
4949
* @return array
5050
*/
51-
public function changesDataProvider()
51+
public static function changesDataProvider()
5252
{
5353
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/db_schema';
5454
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandDiXmlTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/di_xml';
4848

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandLayoutTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/layout_xml';
4848
getcwd();

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandLessTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/less';
4848

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandMftfTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected function executeCommand($pathToSourceCodeBefore, $pathToSourceCodeAfte
8080
return $commandTester;
8181
}
8282

83-
public function changesDataProvider()
83+
public static function changesDataProvider()
8484
{
8585
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/mftf';
8686
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandNonApiClassesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-class';
4848
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandNonApiInterfacesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-interface';
4848
return [

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandNonApiTraitsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testExecute(
4444
);
4545
}
4646

47-
public function changesDataProvider()
47+
public static function changesDataProvider()
4848
{
4949
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-trait';
5050

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandSystemXmlTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/system_xml';
4848

Diff for: ‎dev/tests/Unit/Console/Command/CompareSourceCommandXsdSchemasTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testExecute(
4242
);
4343
}
4444

45-
public function changesDataProvider()
45+
public static function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/xsd-schema';
4848

Diff for: ‎dev/tests/Unit/Console/Command/HierarchyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testExecute(
3939
);
4040
}
4141

42-
public function changesDataProvider()
42+
public static function changesDataProvider()
4343
{
4444
$pathToFixtures = __DIR__ . '/HierarchyTest/_files';
4545
return [

Diff for: ‎dev/tests/Unit/Console/Command/HtmlTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testExecute(
6363
);
6464
}
6565

66-
public function changesDataProvider()
66+
public static function changesDataProvider()
6767
{
6868
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/all';
6969

Diff for: ‎dev/tests/Unit/Filter/AllowedChangeFilter/ComposerVersionFilterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testFilter($dataFolder, $filteredSection, $expectsRemaining)
5151
*
5252
* @return array
5353
*/
54-
public function filterDataProvider()
54+
public static function filterDataProvider()
5555
{
5656
return [
5757
['package_version_name_matches', 'version', false],

Diff for: ‎dev/tests/Unit/Filter/AllowedChangeFilter/PhpCommentFormattingFilterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testFilter($dataFolder, $expectsRemaining)
5050
*
5151
* @return array
5252
*/
53-
public function filterDataProvider()
53+
public static function filterDataProvider()
5454
{
5555
return [
5656
['condensed_comments_match', false],

Diff for: ‎dev/tests/Unit/Filter/AllowedChangeFilter/PhpIgnoredTagFilterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testFilter($dataFolder, $ignoredTags, $ignoredTagValues, $caseSe
5353
*
5454
* @return array
5555
*/
56-
public function filterDataProvider()
56+
public static function filterDataProvider()
5757
{
5858
return [
5959
['add_ignored_tag_only_comment', ['ignored'], [], true, false],

Diff for: ‎dev/tests/Unit/Filter/AllowedChangeFilter/PhpWhitespaceFilterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testFilter($dataFolder, $expectsRemaining)
5050
*
5151
* @return array
5252
*/
53-
public function filterDataProvider()
53+
public static function filterDataProvider()
5454
{
5555
return [
5656
['filtered_changes_remain', true],

Diff for: ‎dev/tests/Unit/Reporter/HtmlTargetDecoratorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function testUrl(bool $hasOption, string $target, string $context, string
2323
$this->assertEquals($expected, $result);
2424
}
2525

26-
public function dataProviderTestUrl()
26+
public static function dataProviderTestUrl()
2727
{
2828
return [
2929
'target-context-class' => [

0 commit comments

Comments
 (0)