Add support for phpunit 10 (#11532)

* Use static test data providers Using non-static methods as a data providers was deprecated in phpunit 10. * Rename abstract test class Abstract test case classes with Test suffix are deprecated in PHPUnit 10. We also change the ArchiverTest file name to match the new class name (ArchiverTestCase). * sebastianbergmann/phpunit#5132
composer · Jul 21, 2023 · 4b210d9 · 4b210d9
1 parent e7016b0
commit 4b210d9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/tests/Composer/Test/Command/HomeCommandTest.php b/tests/Composer/Test/Command/HomeCommandTest.php
@@ -57,7 +57,7 @@ public function testHomeCommandWithShowFlag(
         $this->assertSame(trim($expected), trim($appTester->getDisplay(true)));
     }
 
-    public function useCaseProvider(): Generator
+    public static function useCaseProvider(): Generator
     {
         yield 'Invalid or missing repository URL' => [
             [

diff --git a/tests/Composer/Test/Command/SuggestsCommandTest.php b/tests/Composer/Test/Command/SuggestsCommandTest.php
@@ -129,7 +129,7 @@ public function testSuggest(bool $hasLockFile, array $command, string $expected)
         self::assertSame(trim($expected), trim($appTester->getDisplay(true)));
     }
 
-    public function provideSuggest(): \Generator
+    public static function provideSuggest(): \Generator
     {
         yield 'with lockfile, show suggested' => [
             true,

diff --git a/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php b/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
@@ -21,7 +21,7 @@
 use Composer\Util\Platform;
 use Composer\Util\ProcessExecutor;
 
-class ArchiveManagerTest extends ArchiverTest
+class ArchiveManagerTest extends ArchiverTestCase
 {
     /**
      * @var ArchiveManager

diff --git a/...er/Test/Package/Archiver/ArchiverTest.php → ...est/Package/Archiver/ArchiverTestCase.php b/...er/Test/Package/Archiver/ArchiverTest.php → ...est/Package/Archiver/ArchiverTestCase.php
@@ -17,7 +17,7 @@
 use Composer\Util\ProcessExecutor;
 use Composer\Package\CompletePackage;
 
-abstract class ArchiverTest extends TestCase
+abstract class ArchiverTestCase extends TestCase
 {
     /**
      * @var \Composer\Util\Filesystem

diff --git a/tests/Composer/Test/Package/Archiver/PharArchiverTest.php b/tests/Composer/Test/Package/Archiver/PharArchiverTest.php
@@ -15,7 +15,7 @@
 use Composer\Package\Archiver\PharArchiver;
 use Composer\Util\Platform;
 
-class PharArchiverTest extends ArchiverTest
+class PharArchiverTest extends ArchiverTestCase
 {
     public function testTarArchive(): void
     {

diff --git a/tests/Composer/Test/Package/Archiver/ZipArchiverTest.php b/tests/Composer/Test/Package/Archiver/ZipArchiverTest.php
@@ -16,7 +16,7 @@
 use ZipArchive;
 use Composer\Package\Archiver\ZipArchiver;
 
-class ZipArchiverTest extends ArchiverTest
+class ZipArchiverTest extends ArchiverTestCase
 {
     /**
      * @dataProvider provideGitignoreExcludeNegationTestCases