From 4b210d916e859262f20e68998ec8756d8d0a0b09 Mon Sep 17 00:00:00 2001
From: Athos Ribeiro <athoscribeiro@gmail.com>
Date: Fri, 21 Jul 2023 10:39:20 +0200
Subject: [PATCH] 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).

* https://github.com/sebastianbergmann/phpunit/issues/5132
---
 tests/Composer/Test/Command/HomeCommandTest.php                 | 2 +-
 tests/Composer/Test/Command/SuggestsCommandTest.php             | 2 +-
 tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php     | 2 +-
 .../Package/Archiver/{ArchiverTest.php => ArchiverTestCase.php} | 2 +-
 tests/Composer/Test/Package/Archiver/PharArchiverTest.php       | 2 +-
 tests/Composer/Test/Package/Archiver/ZipArchiverTest.php        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/Composer/Test/Package/Archiver/{ArchiverTest.php => ArchiverTestCase.php} (96%)

diff --git a/tests/Composer/Test/Command/HomeCommandTest.php b/tests/Composer/Test/Command/HomeCommandTest.php
index 1755255a5..fd37e2f89 100644
--- a/tests/Composer/Test/Command/HomeCommandTest.php
+++ b/tests/Composer/Test/Command/HomeCommandTest.php
@@ -57,7 +57,7 @@ class HomeCommandTest extends TestCase
         $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
index 217f41157..4d64d4bf6 100644
--- a/tests/Composer/Test/Command/SuggestsCommandTest.php
+++ b/tests/Composer/Test/Command/SuggestsCommandTest.php
@@ -129,7 +129,7 @@ class SuggestsCommandTest extends TestCase
         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
index 1d4a7d4b5..ca07aede4 100644
--- a/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
+++ b/tests/Composer/Test/Package/Archiver/ArchiveManagerTest.php
@@ -21,7 +21,7 @@ use Composer\Test\Mock\FactoryMock;
 use Composer\Util\Platform;
 use Composer\Util\ProcessExecutor;
 
-class ArchiveManagerTest extends ArchiverTest
+class ArchiveManagerTest extends ArchiverTestCase
 {
     /**
      * @var ArchiveManager
diff --git a/tests/Composer/Test/Package/Archiver/ArchiverTest.php b/tests/Composer/Test/Package/Archiver/ArchiverTestCase.php
similarity index 96%
rename from tests/Composer/Test/Package/Archiver/ArchiverTest.php
rename to tests/Composer/Test/Package/Archiver/ArchiverTestCase.php
index 867bf11e7..9e2cb1a3a 100644
--- a/tests/Composer/Test/Package/Archiver/ArchiverTest.php
+++ b/tests/Composer/Test/Package/Archiver/ArchiverTestCase.php
@@ -17,7 +17,7 @@ use Composer\Util\Filesystem;
 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
index 02f779b46..1d6e68e2e 100644
--- a/tests/Composer/Test/Package/Archiver/PharArchiverTest.php
+++ b/tests/Composer/Test/Package/Archiver/PharArchiverTest.php
@@ -15,7 +15,7 @@ namespace Composer\Test\Package\Archiver;
 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
index c672f4f29..80c7bb95e 100644
--- a/tests/Composer/Test/Package/Archiver/ZipArchiverTest.php
+++ b/tests/Composer/Test/Package/Archiver/ZipArchiverTest.php
@@ -16,7 +16,7 @@ use Composer\Util\Platform;
 use ZipArchive;
 use Composer\Package\Archiver\ZipArchiver;
 
-class ZipArchiverTest extends ArchiverTest
+class ZipArchiverTest extends ArchiverTestCase
 {
     /**
      * @dataProvider provideGitignoreExcludeNegationTestCases