From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Tue, 18 Feb 2025 08:16:15 +0100
Subject: Modernize PHPUnit syntax

---
 tests/AppendStreamTest.php         |  5 ++---
 tests/FnStreamTest.php             |  5 ++---
 tests/HeaderTest.php               | 13 ++++---------
 tests/PumpStreamTest.php           |  5 ++---
 tests/QueryTest.php                | 11 ++++-------
 tests/RequestTest.php              | 21 ++++++---------------
 tests/ResponseTest.php             | 21 +++++++--------------
 tests/ServerRequestTest.php        |  9 +++------
 tests/StreamDecoratorTraitTest.php |  5 ++---
 tests/StreamTest.php               | 12 ++++--------
 tests/UploadedFileTest.php         | 21 ++++++---------------
 tests/UriComparatorTest.php        |  5 ++---
 tests/UriNormalizerTest.php        | 13 ++++---------
 tests/UriResolverTest.php          | 13 ++++---------
 tests/UriTest.php                  | 21 ++++++---------------
 tests/UtilsTest.php                |  9 ++++-----
 16 files changed, 62 insertions(+), 127 deletions(-)

diff --git a/tests/AppendStreamTest.php b/tests/AppendStreamTest.php
index 302470a..b0c6a2e 100644
--- a/tests/AppendStreamTest.php
+++ b/tests/AppendStreamTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\AppendStream;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -176,9 +177,7 @@ class AppendStreamTest extends TestCase
         self::assertNull($a->getSize());
     }
 
-    /**
-     * @requires PHP < 7.4
-     */
+    #[RequiresPhp('< 7.4')]
     public function testCatchesExceptionsWhenCastingToString(): void
     {
         $s = $this->createMock(StreamInterface::class);
diff --git a/tests/FnStreamTest.php b/tests/FnStreamTest.php
index 33651ac..6a8579d 100644
--- a/tests/FnStreamTest.php
+++ b/tests/FnStreamTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\FnStream;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -102,9 +103,7 @@ class FnStreamTest extends TestCase
         unserialize($b);
     }
 
-    /**
-     * @requires PHP < 7.4
-     */
+    #[RequiresPhp('< 7.4')]
     public function testThatConvertingStreamToStringWillTriggerErrorAndWillReturnEmptyString(): void
     {
         $a = new FnStream([
diff --git a/tests/HeaderTest.php b/tests/HeaderTest.php
index 8e4440d..6e17a8f 100644
--- a/tests/HeaderTest.php
+++ b/tests/HeaderTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class HeaderTest extends TestCase
@@ -56,9 +57,7 @@ class HeaderTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider parseParamsProvider
-     */
+    #[DataProvider('parseParamsProvider')]
     public function testParseParams($header, $result): void
     {
         self::assertSame($result, Psr7\Header::parse($header));
@@ -142,18 +141,14 @@ class HeaderTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider normalizeProvider
-     */
+    #[DataProvider('normalizeProvider')]
     public function testNormalize($header, $result): void
     {
         self::assertSame($result, Psr7\Header::normalize([$header]));
         self::assertSame($result, Psr7\Header::normalize($header));
     }
 
-    /**
-     * @dataProvider normalizeProvider
-     */
+    #[DataProvider('normalizeProvider')]
     public function testSplitList($header, $result): void
     {
         self::assertSame($result, Psr7\Header::splitList($header));
diff --git a/tests/PumpStreamTest.php b/tests/PumpStreamTest.php
index a4f3f2c..52ded59 100644
--- a/tests/PumpStreamTest.php
+++ b/tests/PumpStreamTest.php
@@ -7,6 +7,7 @@ namespace GuzzleHttp\Tests\Psr7;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\LimitStream;
 use GuzzleHttp\Psr7\PumpStream;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 
 class PumpStreamTest extends TestCase
@@ -80,9 +81,7 @@ class PumpStreamTest extends TestCase
         }
     }
 
-    /**
-     * @requires PHP < 7.4
-     */
+    #[RequiresPhp('< 7.4')]
     public function testThatConvertingStreamToStringWillTriggerErrorAndWillReturnEmptyString(): void
     {
         $p = Psr7\Utils::streamFor(function ($size): void {
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
index 389fb28..baa0ade 100644
--- a/tests/QueryTest.php
+++ b/tests/QueryTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class QueryTest extends TestCase
@@ -50,9 +51,7 @@ class QueryTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider parseQueryProvider
-     */
+    #[DataProvider('parseQueryProvider')]
     public function testParsesQueries($input, $output): void
     {
         $result = Psr7\Query::parse($input);
@@ -66,10 +65,8 @@ class QueryTest extends TestCase
         self::assertSame(['foo%20' => 'bar'], $data);
     }
 
-    /**
-     * @dataProvider parseQueryProvider
-     */
-    public function testParsesAndBuildsQueries($input): void
+    #[DataProvider('parseQueryProvider')]
+    public function testParsesAndBuildsQueries($input, $output): void
     {
         $result = Psr7\Query::parse($input, false);
         self::assertSame($input, Psr7\Query::build($result, false));
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index 8c8e924..1662c0c 100644
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -7,6 +7,7 @@ namespace GuzzleHttp\Tests\Psr7;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -95,18 +96,14 @@ class RequestTest extends TestCase
         self::assertSame($u1, $r1->getUri());
     }
 
-    /**
-     * @dataProvider invalidMethodsProvider
-     */
+    #[DataProvider('invalidMethodsProvider')]
     public function testConstructWithInvalidMethods($method): void
     {
         $this->expectException(\TypeError::class);
         new Request($method, '/');
     }
 
-    /**
-     * @dataProvider invalidMethodsProvider
-     */
+    #[DataProvider('invalidMethodsProvider')]
     public function testWithInvalidMethods($method): void
     {
         $r = new Request('get', '/');
@@ -205,9 +202,7 @@ class RequestTest extends TestCase
         self::assertSame('', $r->getHeaderLine('Bar'));
     }
 
-    /**
-     * @dataProvider provideHeadersContainingNotAllowedChars
-     */
+    #[DataProvider('provideHeadersContainingNotAllowedChars')]
     public function testContainsNotAllowedCharsOnHeaderField($header): void
     {
         $this->expectExceptionMessage(
@@ -230,9 +225,7 @@ class RequestTest extends TestCase
         return [[' key '], ['key '], [' key'], ['key/'], ['key('], ['key\\'], [' ']];
     }
 
-    /**
-     * @dataProvider provideHeadersContainsAllowedChar
-     */
+    #[DataProvider('provideHeadersContainsAllowedChar')]
     public function testContainsAllowedCharsOnHeaderField($header): void
     {
         $r = new Request(
@@ -314,9 +307,7 @@ class RequestTest extends TestCase
         self::assertSame('foo.com:8125', $r->getHeaderLine('host'));
     }
 
-    /**
-     * @dataProvider provideHeaderValuesContainingNotAllowedChars
-     */
+    #[DataProvider('provideHeaderValuesContainingNotAllowedChars')]
     public function testContainsNotAllowedCharsOnHeaderValue(string $value): void
     {
         $this->expectException(\InvalidArgumentException::class);
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index 7607d63..22631f6 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -261,9 +262,7 @@ class ResponseTest extends TestCase
         self::assertSame(['Foo' => []], $r->getHeaders());
     }
 
-    /**
-     * @dataProvider invalidHeaderProvider
-     */
+    #[DataProvider('invalidHeaderProvider')]
     public function testConstructResponseInvalidHeader($header, $headerValue, $expectedMessage): void
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -279,9 +278,7 @@ class ResponseTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider invalidWithHeaderProvider
-     */
+    #[DataProvider('invalidWithHeaderProvider')]
     public function testWithInvalidHeader($header, $headerValue, $expectedMessage): void
     {
         $r = new Response();
@@ -330,10 +327,9 @@ class ResponseTest extends TestCase
     }
 
     /**
-     * @dataProvider nonIntegerStatusCodeProvider
-     *
      * @param mixed $invalidValues
      */
+    #[DataProvider('nonIntegerStatusCodeProvider')]
     public function testConstructResponseWithNonIntegerStatusCode($invalidValues): void
     {
         $this->expectException(\TypeError::class);
@@ -341,10 +337,9 @@ class ResponseTest extends TestCase
     }
 
     /**
-     * @dataProvider nonIntegerStatusCodeProvider
-     *
      * @param mixed $invalidValues
      */
+    #[DataProvider('nonIntegerStatusCodeProvider')]
     public function testResponseChangeStatusCodeWithNonInteger($invalidValues): void
     {
         $response = new Response();
@@ -364,10 +359,9 @@ class ResponseTest extends TestCase
     }
 
     /**
-     * @dataProvider invalidStatusCodeRangeProvider
-     *
      * @param mixed $invalidValues
      */
+    #[DataProvider('invalidStatusCodeRangeProvider')]
     public function testConstructResponseWithInvalidRangeStatusCode($invalidValues): void
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -376,10 +370,9 @@ class ResponseTest extends TestCase
     }
 
     /**
-     * @dataProvider invalidStatusCodeRangeProvider
-     *
      * @param mixed $invalidValues
      */
+    #[DataProvider('invalidStatusCodeRangeProvider')]
     public function testResponseChangeStatusCodeWithWithInvalidRange($invalidValues): void
     {
         $response = new Response();
diff --git a/tests/ServerRequestTest.php b/tests/ServerRequestTest.php
index f770078..50d173b 100644
--- a/tests/ServerRequestTest.php
+++ b/tests/ServerRequestTest.php
@@ -7,6 +7,7 @@ namespace GuzzleHttp\Tests\Psr7;
 use GuzzleHttp\Psr7\ServerRequest;
 use GuzzleHttp\Psr7\UploadedFile;
 use GuzzleHttp\Psr7\Uri;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -276,9 +277,7 @@ class ServerRequestTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider dataNormalizeFiles
-     */
+    #[DataProvider('dataNormalizeFiles')]
     public function testNormalizeFiles($files, $expected): void
     {
         $result = ServerRequest::normalizeFiles($files);
@@ -369,9 +368,7 @@ class ServerRequestTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider dataGetUriFromGlobals
-     */
+    #[DataProvider('dataGetUriFromGlobals')]
     public function testGetUriFromGlobals($expected, $serverParams): void
     {
         $_SERVER = $serverParams;
diff --git a/tests/StreamDecoratorTraitTest.php b/tests/StreamDecoratorTraitTest.php
index aaa9f28..11e699c 100644
--- a/tests/StreamDecoratorTraitTest.php
+++ b/tests/StreamDecoratorTraitTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\StreamDecoratorTrait;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -38,9 +39,7 @@ class StreamDecoratorTraitTest extends TestCase
         $this->b = new Str($this->a);
     }
 
-    /**
-     * @requires PHP < 7.4
-     */
+    #[RequiresPhp('< 7.4')]
     public function testCatchesExceptionsWhenCastingToString(): void
     {
         $s = $this->createMock(Str::class);
diff --git a/tests/StreamTest.php b/tests/StreamTest.php
index 2bf909a..e634af5 100644
--- a/tests/StreamTest.php
+++ b/tests/StreamTest.php
@@ -7,6 +7,7 @@ namespace GuzzleHttp\Tests\Psr7;
 use GuzzleHttp\Psr7\FnStream;
 use GuzzleHttp\Psr7\Stream;
 use GuzzleHttp\Psr7\StreamWrapper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -303,9 +304,8 @@ class StreamTest extends TestCase
 
     /**
      * @requires extension zlib
-     *
-     * @dataProvider gzipModeProvider
      */
+    #[DataProvider('gzipModeProvider')]
     public function testGzipStreamModes(string $mode, bool $readable, bool $writable): void
     {
         $r = gzopen('php://temp', $mode);
@@ -325,9 +325,7 @@ class StreamTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider readableModeProvider
-     */
+    #[DataProvider('readableModeProvider')]
     public function testReadableStream(string $mode): void
     {
         $r = fopen('php://temp', $mode);
@@ -371,9 +369,7 @@ class StreamTest extends TestCase
         $stream->close();
     }
 
-    /**
-     * @dataProvider writableModeProvider
-     */
+    #[DataProvider('writableModeProvider')]
     public function testWritableStream(string $mode): void
     {
         $r = fopen('php://temp', $mode);
diff --git a/tests/UploadedFileTest.php b/tests/UploadedFileTest.php
index 247c32d..d5717b8 100644
--- a/tests/UploadedFileTest.php
+++ b/tests/UploadedFileTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Stream;
 use GuzzleHttp\Psr7\UploadedFile;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
@@ -43,9 +44,7 @@ class UploadedFileTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider invalidStreams
-     */
+    #[DataProvider('invalidStreams')]
     public function testRaisesExceptionOnInvalidStreamOrFile($streamOrFile): void
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -113,9 +112,7 @@ class UploadedFileTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider invalidMovePaths
-     */
+    #[DataProvider('invalidMovePaths')]
     public function testMoveRaisesExceptionForInvalidPath($path): void
     {
         $stream = \GuzzleHttp\Psr7\Utils::streamFor('Foo bar!');
@@ -167,18 +164,14 @@ class UploadedFileTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider nonOkErrorStatus
-     */
+    #[DataProvider('nonOkErrorStatus')]
     public function testConstructorDoesNotRaiseExceptionForInvalidStreamWhenErrorStatusPresent($status): void
     {
         $uploadedFile = new UploadedFile('not ok', 0, $status);
         self::assertSame($status, $uploadedFile->getError());
     }
 
-    /**
-     * @dataProvider nonOkErrorStatus
-     */
+    #[DataProvider('nonOkErrorStatus')]
     public function testMoveToRaisesExceptionWhenErrorStatusPresent($status): void
     {
         $uploadedFile = new UploadedFile('not ok', 0, $status);
@@ -187,9 +180,7 @@ class UploadedFileTest extends TestCase
         $uploadedFile->moveTo(__DIR__.'/'.bin2hex(random_bytes(20)));
     }
 
-    /**
-     * @dataProvider nonOkErrorStatus
-     */
+    #[DataProvider('nonOkErrorStatus')]
     public function testGetStreamRaisesExceptionWhenErrorStatusPresent($status): void
     {
         $uploadedFile = new UploadedFile('not ok', 0, $status);
diff --git a/tests/UriComparatorTest.php b/tests/UriComparatorTest.php
index 4cd9909..13d4734 100644
--- a/tests/UriComparatorTest.php
+++ b/tests/UriComparatorTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\Psr7\UriComparator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -13,9 +14,7 @@ use PHPUnit\Framework\TestCase;
  */
 class UriComparatorTest extends TestCase
 {
-    /**
-     * @dataProvider getCrossOriginExamples
-     */
+    #[DataProvider('getCrossOriginExamples')]
     public function testIsCrossOrigin(string $original, string $modified, bool $expected): void
     {
         self::assertSame($expected, UriComparator::isCrossOrigin(new Uri($original), new Uri($modified)));
diff --git a/tests/UriNormalizerTest.php b/tests/UriNormalizerTest.php
index 167e5a0..12dfe47 100644
--- a/tests/UriNormalizerTest.php
+++ b/tests/UriNormalizerTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\Psr7\UriNormalizer;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UriInterface;
 
@@ -28,9 +29,7 @@ class UriNormalizerTest extends TestCase
         self::assertSame("/$expectEncoding?$expectEncoding", (string) $normalizedUri);
     }
 
-    /**
-     * @dataProvider getUnreservedCharacters
-     */
+    #[DataProvider('getUnreservedCharacters')]
     public function testDecodeUnreservedCharacters(string $char): void
     {
         $percentEncoded = '%'.bin2hex($char);
@@ -56,9 +55,7 @@ class UriNormalizerTest extends TestCase
         }, $unreservedChars);
     }
 
-    /**
-     * @dataProvider getEmptyPathTestCases
-     */
+    #[DataProvider('getEmptyPathTestCases')]
     public function testConvertEmptyPath($uri, $expected): void
     {
         $normalizedUri = UriNormalizer::normalize(new Uri($uri), UriNormalizer::CONVERT_EMPTY_PATH);
@@ -152,9 +149,7 @@ class UriNormalizerTest extends TestCase
         self::assertSame('?a&a=a&a=b&a=c&a=d&b=a&b=b&b=c', (string) $normalizedUri);
     }
 
-    /**
-     * @dataProvider getEquivalentTestCases
-     */
+    #[DataProvider('getEquivalentTestCases')]
     public function testIsEquivalent(string $uri1, string $uri2, bool $expected): void
     {
         $equivalent = UriNormalizer::isEquivalent(new Uri($uri1), new Uri($uri2));
diff --git a/tests/UriResolverTest.php b/tests/UriResolverTest.php
index c4b235b..b2d481a 100644
--- a/tests/UriResolverTest.php
+++ b/tests/UriResolverTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\Psr7\UriResolver;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UriInterface;
 
@@ -16,9 +17,7 @@ class UriResolverTest extends TestCase
 {
     private const RFC3986_BASE = 'http://a/b/c/d;p?q';
 
-    /**
-     * @dataProvider getResolveTestCases
-     */
+    #[DataProvider('getResolveTestCases')]
     public function testResolveUri(string $base, string $rel, string $expectedTarget): void
     {
         $baseUri = new Uri($base);
@@ -32,9 +31,7 @@ class UriResolverTest extends TestCase
         self::assertSame($expectedTarget, (string) UriResolver::resolve($baseUri, $targetUri));
     }
 
-    /**
-     * @dataProvider getResolveTestCases
-     */
+    #[DataProvider('getResolveTestCases')]
     public function testRelativizeUri(string $base, string $expectedRelativeReference, string $target): void
     {
         $baseUri = new Uri($base);
@@ -53,9 +50,7 @@ class UriResolverTest extends TestCase
         );
     }
 
-    /**
-     * @dataProvider getRelativizeTestCases
-     */
+    #[DataProvider('getRelativizeTestCases')]
     public function testRelativizeUriWithUniqueTests(string $base, string $target, string $expectedRelativeReference): void
     {
         $baseUri = new Uri($base);
diff --git a/tests/UriTest.php b/tests/UriTest.php
index 185b7f1..b0b39a4 100644
--- a/tests/UriTest.php
+++ b/tests/UriTest.php
@@ -6,6 +6,7 @@ namespace GuzzleHttp\Tests\Psr7;
 
 use GuzzleHttp\Psr7\Exception\MalformedUriException;
 use GuzzleHttp\Psr7\Uri;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UriInterface;
 
@@ -51,9 +52,7 @@ class UriTest extends TestCase
         self::assertSame('https://user:pass@example.com:8080/path/123?q=abc#test', (string) $uri);
     }
 
-    /**
-     * @dataProvider getValidUris
-     */
+    #[DataProvider('getValidUris')]
     public function testValidUrisStayValid(string $input): void
     {
         $uri = new Uri($input);
@@ -61,9 +60,7 @@ class UriTest extends TestCase
         self::assertSame($input, (string) $uri);
     }
 
-    /**
-     * @dataProvider getValidUris
-     */
+    #[DataProvider('getValidUris')]
     public function testFromParts(string $input): void
     {
         $uri = Uri::fromParts(parse_url($input));
@@ -100,9 +97,7 @@ class UriTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider getInvalidUris
-     */
+    #[DataProvider('getInvalidUris')]
     public function testInvalidUrisThrowException(string $invalidUri): void
     {
         $this->expectException(MalformedUriException::class);
@@ -205,9 +200,7 @@ class UriTest extends TestCase
         self::assertSame('0://0:0@0/0?0#0', (string) $uri);
     }
 
-    /**
-     * @dataProvider getPortTestCases
-     */
+    #[DataProvider('getPortTestCases')]
     public function testIsDefaultPort(string $scheme, ?int $port, bool $isDefaultPort): void
     {
         $uri = $this->createMock(UriInterface::class);
@@ -553,9 +546,7 @@ class UriTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider uriComponentsEncodingProvider
-     */
+    #[DataProvider('uriComponentsEncodingProvider')]
     public function testUriComponentsGetEncodedProperly(string $input, string $path, string $query, string $fragment, string $output): void
     {
         $uri = new Uri($input);
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index a30ebc2..3d1a314 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -7,6 +7,8 @@ namespace GuzzleHttp\Tests\Psr7;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\FnStream;
 use GuzzleHttp\Psr7\NoSeekStream;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;
 
@@ -210,9 +212,7 @@ class UtilsTest extends TestCase
         Psr7\Utils::tryFopen('', 'r');
     }
 
-    /**
-     * @requires PHP 7.4
-     */
+    #[RequiresPhp('7.4')]
     public function testGetsContentsThrowExceptionWhenNotReadable(): void
     {
         $r = fopen(tempnam(sys_get_temp_dir(), 'guzzle-psr7-'), 'w');
@@ -540,10 +540,9 @@ class UtilsTest extends TestCase
     }
 
     /**
-     * @dataProvider providesCaselessRemoveCases
-     *
      * @param string[] $keys
      */
+    #[DataProvider('providesCaselessRemoveCases')]
     public function testCaselessRemove(array $keys, array $data, array $expected): void
     {
         self::assertSame($expected, Psr7\Utils::caselessRemove($keys, $data));