Support PHPUnit 10

Author: GrahamCampbell

phpunit.xml.dist

@@ -1,29 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertDeprecationsToExceptions="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
 </phpunit>

tests/Api/ProjectsTest.php

@@ -2082,7 +2082,7 @@ protected function getMultipleProjectsDataWithNamespace()
         ];
     }
 
-    public function possibleAccessLevels()
+    public static function possibleAccessLevels(): array
     {
         return [
             [10],

tests/Api/RepositoriesTest.php

@@ -380,7 +380,7 @@ public function shouldGetCommitRefsWithParams(string $type, array $expectedArray
         $this->assertEquals($expectedArray, $api->commitRefs(1, 'abcd1234', ['type' => $type]));
     }
 
-    public function dataGetCommitRefsWithParams()
+    public static function dataGetCommitRefsWithParams(): array
     {
         return [
             'type_tag' => [

tests/Api/TagsTest.php

@@ -140,7 +140,7 @@ public function shouldUpdateRelease(string $releaseName, string $description, ar
         $this->assertEquals($expectedResult, $api->updateRelease(1, $releaseName, $params));
     }
 
-    public function releaseDataProvider()
+    public static function releaseDataProvider(): array
     {
         return [
             [

tests/Api/TestCase.php

@@ -33,7 +33,7 @@ abstract protected function getApiClass();
     protected function getApiMock(array $methods = [])
     {
         $httpClient = $this->getMockBuilder(ClientInterface::class)
-            ->setMethods(['sendRequest'])
+            ->onlyMethods(['sendRequest'])
             ->getMock();
         $httpClient
             ->expects($this->any())
@@ -42,7 +42,7 @@ protected function getApiMock(array $methods = [])
         $client = Client::createWithHttpClient($httpClient);
 
         return $this->getMockBuilder($this->getApiClass())
-            ->setMethods(\array_merge(['getAsResponse', 'get', 'post', 'postRaw', 'patch', 'delete', 'put', 'head'], $methods))
+            ->onlyMethods(\array_merge(['getAsResponse', 'get', 'post', 'delete', 'put'], $methods))
             ->setConstructorArgs([$client, null])
             ->getMock();
     }

tests/Api/UsersTest.php

@@ -259,7 +259,7 @@ public function shouldGetOwnedUsersProjects(): void
         $this->assertEquals($expectedArray, $api->usersProjects(1, ['owned' => true]));
     }
 
-    public function possibleAccessLevels()
+    public static function possibleAccessLevels(): array
     {
         return [
             [10],

tests/HttpClient/Util/QueryStringBuilderTest.php

@@ -14,6 +14,7 @@
 
 namespace Gitlab\Tests\HttpClient\Util;
 
+use Generator;
 use Gitlab\HttpClient\Util\QueryStringBuilder;
 use PHPUnit\Framework\TestCase;
 
@@ -30,7 +31,7 @@ public function testBuild(array $query, string $expected): void
         $this->assertSame(\sprintf('?%s', $expected), QueryStringBuilder::build($query));
     }
 
-    public function queryStringProvider()
+    public static function queryStringProvider(): Generator
     {
         yield 'indexed array' => [
             [

vendor-bin/phpunit/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4.15 || ^8.0.2",
-        "phpunit/phpunit": "^9.5.12"
+        "phpunit/phpunit": "^9.6.3 || ^10.0.12"
     },
     "config": {
         "preferred-install": "dist"