Migrate the testsuite to PHPUnit 11 (#1977)

stof · web-flow · commit fbab1ff21be2 · 2025-10-29T19:31:11.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,8 +31,7 @@ jobs:
       - name: Download dependencies
         run: |
           composer config minimum-stability dev
-          composer req symfony/phpunit-bridge --no-update
           composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
 
       - name: Run tests
-        run: ./vendor/bin/simple-phpunit
+        run: ./vendor/bin/phpunit
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ start-docker-s3:
 	docker run -d -p 4569:4569 -p 4570:4569 --name async_aws_s3 asyncaws/testing-s3
 
 test: initialize
-	./vendor/bin/simple-phpunit
+	./vendor/bin/phpunit
 
 clean: stop-docker
 stop-docker:
diff --git a/composer.json b/composer.json
@@ -22,6 +22,11 @@
         "symfony/http-client-contracts": "^1.1.8 || ^2.0 || ^3.0",
         "symfony/service-contracts": "^1.0 || ^2.0 || ^3.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^11.5.42",
+        "symfony/error-handler": "^7.3.2 || ^8.0",
+        "symfony/phpunit-bridge": "^7.3.2 || ^8.0"
+    },
     "conflict": {
         "async-aws/s3": "<1.1",
         "symfony/http-client": "5.2.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnDeprecation="true"
+         failOnNotice="true"
+>
+  <source ignoreSuppressionOfDeprecations="true">
+    <include>
+      <directory>./src</directory>
+    </include>
+    <deprecationTrigger>
+      <function>trigger_deprecation</function>
+    </deprecationTrigger>
+  </source>
   <php>
     <ini name="error_reporting" value="-1"/>
   </php>
@@ -8,9 +25,7 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
-  <source>
-    <include>
-      <directory>./src</directory>
-    </include>
-  </source>
+  <extensions>
+    <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
+  </extensions>
 </phpunit>
diff --git a/tests/HttpClient/AwsRetryStrategyTest.php b/tests/HttpClient/AwsRetryStrategyTest.php
@@ -4,17 +4,16 @@
 
 use AsyncAws\Core\HttpClient\AwsRetryStrategy;
 use AsyncAws\Core\Test\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\AsyncContext;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 
 class AwsRetryStrategyTest extends TestCase
 {
-    /**
-     * @dataProvider provideRetries
-     */
-    public function testShoudRetry(?bool $expected, int $statusCode, ?string $response): void
+    #[DataProvider('provideRetries')]
+    public function testShouldRetry(?bool $expected, int $statusCode, ?string $response): void
     {
         if (!class_exists(GenericRetryStrategy::class)) {
             self::markTestSkipped('AwsRetryStrategy requires symfony/http-client 5.2');
@@ -25,7 +24,7 @@ public function testShoudRetry(?bool $expected, int $statusCode, ?string $respon
         self::assertSame($expected, $strategy->shouldRetry($context, $response, null));
     }
 
-    public function provideRetries(): iterable
+    public static function provideRetries(): iterable
     {
         yield [false, 200, null];
         yield [true, 429, null];
diff --git a/tests/Unit/ConfigurationTest.php b/tests/Unit/ConfigurationTest.php
@@ -5,13 +5,12 @@
 namespace AsyncAws\Core\Tests\Unit;
 
 use AsyncAws\Core\Configuration;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ConfigurationTest extends TestCase
 {
-    /**
-     * @dataProvider provideConfiguration
-     */
+    #[DataProvider('provideConfiguration')]
     public function testCreate($config, $env, $expected)
     {
         foreach ($env as $key => $value) {
@@ -61,7 +60,7 @@ public function testIsDefaultWhenPassingNull()
         self::assertNull($config->get('accessKeySecret'));
     }
 
-    public function provideConfiguration(): iterable
+    public static function provideConfiguration(): iterable
     {
         yield 'simple config' => [['endpoint' => 'foo'], [], ['endpoint' => 'foo']];
         yield 'empty config' => [['endpoint' => ''], [], ['endpoint' => '']];
diff --git a/tests/Unit/Signer/SignerV4Test.php b/tests/Unit/Signer/SignerV4Test.php
@@ -9,6 +9,7 @@
 use AsyncAws\Core\RequestContext;
 use AsyncAws\Core\Signer\SignerV4;
 use AsyncAws\Core\Stream\StringStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class SignerV4Test extends TestCase
@@ -60,9 +61,7 @@ public function testPresign()
         self::assertEqualsCanonicalizing($expectedQuery, $request->getQuery());
     }
 
-    /**
-     * @dataProvider provideRequests
-     */
+    #[DataProvider('provideRequests')]
     public function testSignsRequests($rawRequest, $rawExpected)
     {
         $request = $this->parseRequest($rawRequest);
@@ -140,9 +139,7 @@ public static function provideRequests()
         ];
     }
 
-    /**
-     * @dataProvider provideRequestsWithQueryParams
-     */
+    #[DataProvider('provideRequestsWithQueryParams')]
     public function testSignsRequestsWithArrayInQueryParams($rawRequestWithoutQuery, $rawExpected, $queryParams)
     {
         $request = $this->parseRequest($rawRequestWithoutQuery, $queryParams);
diff --git a/tests/Unit/Stream/CallableStreamTest.php b/tests/Unit/Stream/CallableStreamTest.php
@@ -5,48 +5,43 @@
 namespace AsyncAws\Core\Tests\Unit\Stream;
 
 use AsyncAws\Core\Stream\CallableStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class CallableStreamTest extends TestCase
 {
-    /**
-     * @dataProvider provideLengths
-     */
+    #[DataProvider('provideLengths')]
     public function testLength(callable $content, ?int $expected): void
     {
         $stream = CallableStream::create($content);
 
         self::assertSame($expected, $stream->length());
     }
 
-    /**
-     * @dataProvider provideStrings
-     */
+    #[DataProvider('provideStrings')]
     public function testStringify(callable $content, string $expected): void
     {
         $stream = CallableStream::create($content);
 
         self::assertSame($expected, $stream->stringify());
     }
 
-    /**
-     * @dataProvider provideChunks
-     */
+    #[DataProvider('provideChunks')]
     public function testChunk(callable $content, array $expected): void
     {
         $stream = CallableStream::create($content);
 
         self::assertSame($expected, iterator_to_array($stream));
     }
 
-    public function provideLengths(): iterable
+    public static function provideLengths(): iterable
     {
         yield [function () {
             return 'Hello world';
         }, null];
     }
 
-    public function provideStrings(): iterable
+    public static function provideStrings(): iterable
     {
         $f = static function (string ...$items) {
             return static function () use (&$items) {
@@ -58,7 +53,7 @@ public function provideStrings(): iterable
         yield [$f('Hello', ' ', '', 'world'), 'Hello '];
     }
 
-    public function provideChunks(): iterable
+    public static function provideChunks(): iterable
     {
         $f = static function (string ...$items) {
             return static function () use (&$items) {
diff --git a/tests/Unit/Stream/FixedSizeStreamTest.php b/tests/Unit/Stream/FixedSizeStreamTest.php
@@ -9,63 +9,56 @@
 use AsyncAws\Core\Stream\IterableStream;
 use AsyncAws\Core\Stream\RequestStream;
 use AsyncAws\Core\Stream\StringStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class FixedSizeStreamTest extends TestCase
 {
-    /**
-     * @dataProvider provideLengths
-     */
+    #[DataProvider('provideLengths')]
     public function testLength(RequestStream $content, ?int $expected): void
     {
         $stream = FixedSizeStream::create($content);
 
         self::assertSame($expected, $stream->length());
     }
 
-    /**
-     * @dataProvider provideStrings
-     */
+    #[DataProvider('provideStrings')]
     public function testStringify(RequestStream $content, string $expected): void
     {
         $stream = FixedSizeStream::create($content);
 
         self::assertSame($expected, $stream->stringify());
     }
 
-    /**
-     * @dataProvider provideChunks
-     */
+    #[DataProvider('provideChunks')]
     public function testChunk(RequestStream $content, int $size, array $expected): void
     {
         $stream = FixedSizeStream::create($content, $size);
 
         self::assertSame($expected, iterator_to_array($stream));
     }
 
-    /**
-     * @dataProvider provideChunks
-     */
+    #[DataProvider('provideChunks')]
     public function testDecoratingFixedSize(RequestStream $content, int $size, array $expected): void
     {
         $stream = FixedSizeStream::create(FixedSizeStream::create($content, 5), $size);
 
         self::assertSame($expected, iterator_to_array($stream));
     }
 
-    public function provideLengths(): iterable
+    public static function provideLengths(): iterable
     {
         yield [StringStream::create('Hello world'), 11];
         yield [CallableStream::create(function () {}), null];
     }
 
-    public function provideStrings(): iterable
+    public static function provideStrings(): iterable
     {
         yield [StringStream::create('Hello world'), 'Hello world'];
         yield [IterableStream::create((function () { yield 'Hello world'; })()), 'Hello world'];
     }
 
-    public function provideChunks(): iterable
+    public static function provideChunks(): iterable
     {
         yield [StringStream::create('Hello world'), 3, ['Hel', 'lo ', 'wor', 'ld']];
         yield [IterableStream::create((function () {
diff --git a/tests/Unit/Stream/IterableStreamTest.php b/tests/Unit/Stream/IterableStreamTest.php
@@ -5,48 +5,43 @@
 namespace AsyncAws\Core\Tests\Unit\Stream;
 
 use AsyncAws\Core\Stream\IterableStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class IterableStreamTest extends TestCase
 {
-    /**
-     * @dataProvider provideLengths
-     */
+    #[DataProvider('provideLengths')]
     public function testLength(iterable $content, ?int $expected): void
     {
         $stream = IterableStream::create($content);
 
         self::assertSame($expected, $stream->length());
     }
 
-    /**
-     * @dataProvider provideStrings
-     */
+    #[DataProvider('provideStrings')]
     public function testStringify(iterable $content, string $expected): void
     {
         $stream = IterableStream::create($content);
 
         self::assertSame($expected, $stream->stringify());
     }
 
-    /**
-     * @dataProvider provideChunks
-     */
+    #[DataProvider('provideChunks')]
     public function testChunk(iterable $content, array $expected): void
     {
         $stream = IterableStream::create($content);
 
         self::assertSame($expected, iterator_to_array($stream));
     }
 
-    public function provideLengths(): iterable
+    public static function provideLengths(): iterable
     {
         yield [(function () {
             yield 'Hello world';
         })(), null];
     }
 
-    public function provideStrings(): iterable
+    public static function provideStrings(): iterable
     {
         yield [(function () {
             yield 'Hello world';
@@ -65,7 +60,7 @@ public function provideStrings(): iterable
         })(), 'Hello world'];
     }
 
-    public function provideChunks(): iterable
+    public static function provideChunks(): iterable
     {
         yield [(function () {
             yield 'Hello world';
diff --git a/tests/Unit/Stream/ResourceStreamTest.php b/tests/Unit/Stream/ResourceStreamTest.php
diff --git a/tests/Unit/Stream/RewindableStreamTest.php b/tests/Unit/Stream/RewindableStreamTest.php
diff --git a/tests/Unit/Stream/StringStreamTest.php b/tests/Unit/Stream/StringStreamTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,12 @@`
`5`	`5`	`namespace AsyncAws\Core\Tests\Unit;`
`6`	`6`
`7`	`7`	`use AsyncAws\Core\Configuration;`
	`8`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`8`	`9`	`use PHPUnit\Framework\TestCase;`
`9`	`10`
`10`	`11`	`class ConfigurationTest extends TestCase`
`11`	`12`	`{`
`12`		`- /**`
`13`		`- * @dataProvider provideConfiguration`
`14`		`- */`
	`13`	`+ #[DataProvider('provideConfiguration')]`
`15`	`14`	`public function testCreate($config, $env, $expected)`
`16`	`15`	`{`
`17`	`16`	`foreach ($env as $key => $value) {`
`@@ -61,7 +60,7 @@ public function testIsDefaultWhenPassingNull()`
`61`	`60`	`self::assertNull($config->get('accessKeySecret'));`
`62`	`61`	`}`
`63`	`62`
`64`		`- public function provideConfiguration(): iterable`
	`63`	`+ public static function provideConfiguration(): iterable`
`65`	`64`	`{`
`66`	`65`	`yield 'simple config' => [['endpoint' => 'foo'], [], ['endpoint' => 'foo']];`
`67`	`66`	`yield 'empty config' => [['endpoint' => ''], [], ['endpoint' => '']];`
Original file line number	Diff line number	Diff line change
`@@ -5,48 +5,43 @@`
`5`	`5`	`namespace AsyncAws\Core\Tests\Unit\Stream;`
`6`	`6`
`7`	`7`	`use AsyncAws\Core\Stream\CallableStream;`
	`8`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`8`	`9`	`use PHPUnit\Framework\TestCase;`
`9`	`10`
`10`	`11`	`class CallableStreamTest extends TestCase`
`11`	`12`	`{`
`12`		`- /**`
`13`		`- * @dataProvider provideLengths`
`14`		`- */`
	`13`	`+ #[DataProvider('provideLengths')]`
`15`	`14`	`public function testLength(callable $content, ?int $expected): void`
`16`	`15`	`{`
`17`	`16`	`$stream = CallableStream::create($content);`
`18`	`17`
`19`	`18`	`self::assertSame($expected, $stream->length());`
`20`	`19`	`}`
`21`	`20`
`22`		`- /**`
`23`		`- * @dataProvider provideStrings`
`24`		`- */`
	`21`	`+ #[DataProvider('provideStrings')]`
`25`	`22`	`public function testStringify(callable $content, string $expected): void`
`26`	`23`	`{`
`27`	`24`	`$stream = CallableStream::create($content);`
`28`	`25`
`29`	`26`	`self::assertSame($expected, $stream->stringify());`
`30`	`27`	`}`
`31`	`28`
`32`		`- /**`
`33`		`- * @dataProvider provideChunks`
`34`		`- */`
	`29`	`+ #[DataProvider('provideChunks')]`
`35`	`30`	`public function testChunk(callable $content, array $expected): void`
`36`	`31`	`{`
`37`	`32`	`$stream = CallableStream::create($content);`
`38`	`33`
`39`	`34`	`self::assertSame($expected, iterator_to_array($stream));`
`40`	`35`	`}`
`41`	`36`
`42`		`- public function provideLengths(): iterable`
	`37`	`+ public static function provideLengths(): iterable`
`43`	`38`	`{`
`44`	`39`	`yield [function () {`
`45`	`40`	`return 'Hello world';`
`46`	`41`	`}, null];`
`47`	`42`	`}`
`48`	`43`
`49`		`- public function provideStrings(): iterable`
	`44`	`+ public static function provideStrings(): iterable`
`50`	`45`	`{`
`51`	`46`	`$f = static function (string ...$items) {`
`52`	`47`	`return static function () use (&$items) {`
`@@ -58,7 +53,7 @@ public function provideStrings(): iterable`
`58`	`53`	`yield [$f('Hello', ' ', '', 'world'), 'Hello '];`
`59`	`54`	`}`
`60`	`55`
`61`		`- public function provideChunks(): iterable`
	`56`	`+ public static function provideChunks(): iterable`
`62`	`57`	`{`
`63`	`58`	`$f = static function (string ...$items) {`
`64`	`59`	`return static function () use (&$items) {`
Original file line number	Diff line number	Diff line change
`@@ -9,63 +9,56 @@`
`9`	`9`	`use AsyncAws\Core\Stream\IterableStream;`
`10`	`10`	`use AsyncAws\Core\Stream\RequestStream;`
`11`	`11`	`use AsyncAws\Core\Stream\StringStream;`
	`12`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`12`	`13`	`use PHPUnit\Framework\TestCase;`
`13`	`14`
`14`	`15`	`class FixedSizeStreamTest extends TestCase`
`15`	`16`	`{`
`16`		`- /**`
`17`		`- * @dataProvider provideLengths`
`18`		`- */`
	`17`	`+ #[DataProvider('provideLengths')]`
`19`	`18`	`public function testLength(RequestStream $content, ?int $expected): void`
`20`	`19`	`{`
`21`	`20`	`$stream = FixedSizeStream::create($content);`
`22`	`21`
`23`	`22`	`self::assertSame($expected, $stream->length());`
`24`	`23`	`}`
`25`	`24`
`26`		`- /**`
`27`		`- * @dataProvider provideStrings`
`28`		`- */`
	`25`	`+ #[DataProvider('provideStrings')]`
`29`	`26`	`public function testStringify(RequestStream $content, string $expected): void`
`30`	`27`	`{`
`31`	`28`	`$stream = FixedSizeStream::create($content);`
`32`	`29`
`33`	`30`	`self::assertSame($expected, $stream->stringify());`
`34`	`31`	`}`
`35`	`32`
`36`		`- /**`
`37`		`- * @dataProvider provideChunks`
`38`		`- */`
	`33`	`+ #[DataProvider('provideChunks')]`
`39`	`34`	`public function testChunk(RequestStream $content, int $size, array $expected): void`
`40`	`35`	`{`
`41`	`36`	`$stream = FixedSizeStream::create($content, $size);`
`42`	`37`
`43`	`38`	`self::assertSame($expected, iterator_to_array($stream));`
`44`	`39`	`}`
`45`	`40`
`46`		`- /**`
`47`		`- * @dataProvider provideChunks`
`48`		`- */`
	`41`	`+ #[DataProvider('provideChunks')]`
`49`	`42`	`public function testDecoratingFixedSize(RequestStream $content, int $size, array $expected): void`
`50`	`43`	`{`
`51`	`44`	`$stream = FixedSizeStream::create(FixedSizeStream::create($content, 5), $size);`
`52`	`45`
`53`	`46`	`self::assertSame($expected, iterator_to_array($stream));`
`54`	`47`	`}`
`55`	`48`
`56`		`- public function provideLengths(): iterable`
	`49`	`+ public static function provideLengths(): iterable`
`57`	`50`	`{`
`58`	`51`	`yield [StringStream::create('Hello world'), 11];`
`59`	`52`	`yield [CallableStream::create(function () {}), null];`
`60`	`53`	`}`
`61`	`54`
`62`		`- public function provideStrings(): iterable`
	`55`	`+ public static function provideStrings(): iterable`
`63`	`56`	`{`
`64`	`57`	`yield [StringStream::create('Hello world'), 'Hello world'];`
`65`	`58`	`yield [IterableStream::create((function () { yield 'Hello world'; })()), 'Hello world'];`
`66`	`59`	`}`
`67`	`60`
`68`		`- public function provideChunks(): iterable`
	`61`	`+ public static function provideChunks(): iterable`
`69`	`62`	`{`
`70`	`63`	`yield [StringStream::create('Hello world'), 3, ['Hel', 'lo ', 'wor', 'ld']];`
`71`	`64`	`yield [IterableStream::create((function () {`