chore: phpunit 10 support by yenfryherrerafeliz · Pull Request #3242 · aws/aws-sdk-php

yenfryherrerafeliz · 2026-01-27T12:06:05Z

Description of changes:

Make data provider static functions
Use class attributes instead of annotations for @dataProvider and @Covers.
Remove/Replace the usage of expectDeprecation, expectDeprecationMessage, expectDeprecationMessageMatches, expectError, expectErrorMessage, expectNotice, expectNoticeMessage, expectWarning, and expectWarningMessage.
Migrate phpunit xml config file.
Add XDEBUG_MODE set to coverage in the Make file definition step for running tests.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Instead of using expectDeprecation now we use expectException but we do use the set_error_handler to throw that expected exceptions when expecting warnings or user notices.

Enhance data providers within test cases to avoid the usage of instance members since they become now static functions.

- expectWarning, expectError, expectError, etc. were removed in PHPUnit 10, and a workaround was used in order to replace the usage of those APIs. The replacement is to use set_error_handler to catch the alert, throw a RuntimeException, and then expect this thrown exception.

- Remove constructor override for TestCase extension. - Remove CoverClass from methods.

stobrien89

Looks good for the most part, mostly minor things that are easy to miss in such a large PR

stobrien89 · 2026-02-18T20:59:05Z

tests/Credentials/EcsCredentialProviderTest.php

        )->wait();
        $this->assertSame('foo', $c->getAccessKeyId());
        $this->assertSame('baz', $c->getSecretKey());
        $this->assertNull($c->getSecurityToken());
        $this->assertSame($t, $c->getExpiration());
    }

-    /** @doesNotPerformAssertions */
+    #[CoversNothing]


We should use #[DoesNotPerformAssertions] for these cases and remove the assertTrue(true)

stobrien89 · 2026-02-18T21:05:07Z

tests/Api/Serializer/RestJsonSerializerTest.php

@@ -260,6 +260,7 @@ public function testPreparesRequestsWithJsonValueTraitString(): void
        $this->assertSame('POST', $request->getMethod());
        $this->assertSame('http://foo.com/', (string) $request->getUri());
        $this->assertSame('', $request->getHeaderLine('Content-Type'));
+        $this->assertTrue(true);


This line should be removed. I would audit anywhere we've added this- chances are, they will need to be removed

stobrien89 · 2026-02-18T21:05:50Z

tests/Api/Serializer/ComplianceTest.php

@@ -182,6 +188,7 @@ public function testPassesComplianceTest(
                $this->assertNotTrue($request->hasHeader($header));
            }
        }
+        $this->assertTrue(true);


should be removed

stobrien89 · 2026-02-18T21:07:34Z

tests/Api/ShapeTest.php


-/**
- * @covers Aws\Api\Shape
- * @covers Aws\Api\AbstractModel


need to add this coverage back

stobrien89 · 2026-02-18T21:22:45Z

tests/Credentials/InstanceProfileProviderTest.php

-     */
+
+ */
+    #[DataProvider('returnsExpiredCredsProvider')]
    public function testExtendsExpirationAndSendsRequestIfImdsYieldsExpiredCreds($client)


Pretty sure the behavior change here short-circuits this test

stobrien89 · 2026-02-18T22:04:13Z

tests/S3/S3EndpointMiddlewareTest.php

+        }, array_keys($s3Operations));
+
+        foreach ($commands as $command) {
+            $command = new Command('CreateBucket', ['Bucket' => 'bucket']);


This overwrites $command and uses CreateBucket every time

stobrien89 · 2026-02-18T22:05:43Z

tests/S3/S3ClientTest.php


-/**
- * @covers Aws\S3\S3Client
- * @covers Aws\S3\S3ClientTrait


dropped coverage here

stobrien89 · 2026-02-18T22:06:47Z

tests/S3/StreamWrapperTest.php

@@ -40,6 +41,7 @@ public function tear_down()
    {
        stream_wrapper_unregister('s3');
        $this->client = null;
+        restore_exception_handler(); // In case it was not restored


Should probably be restore_error_handler()

stobrien89 · 2026-02-18T22:15:29Z

tests/Script/ComposerTest.php

-    /**
-     * @dataProvider retryProvider
-     */
+    #[DataProvider('retryProvider')]
    public function testRetriesOnException($success, $writeCalls)


The success test case changed writeCalls from 3 to 1- the retry-then-succeed path is no longer tested. The original test verified the retry mechanism actually works (fail twice, succeed third time).

stobrien89 · 2026-02-18T22:16:39Z

tests/S3/TransferTest.php

-
-        $this->expectDeprecation();
-        $this->expectDeprecationMessage('S3 no longer supports MD5 checksums.');
+        set_error_handler(function ($err, $message) {


no restoration of error handler

stobrien89 · 2026-02-19T14:30:41Z

Makefile

 	AWS_ENDPOINT_URL= \
 	AWS_SUPPRESS_PHP_DEPRECATION_WARNING=true \
-	vendor/bin/phpunit --testsuite=unit $(TEST)
+	vendor/bin/phpunit --no-coverage --testsuite=unit $(TEST)


What's the rationale for skipping coverage here?

I meant to use this locally to get faster results when testing. Will revert it.

yenfryherrerafeliz added 12 commits January 20, 2026 08:20

chore: replace expect deprecation with expectException

deae7fc

Instead of using expectDeprecation now we use expectException but we do use the set_error_handler to throw that expected exceptions when expecting warnings or user notices.

chore: make data provider static functions

3f29272

chore: enhance data providers

ef91a51

Enhance data providers within test cases to avoid the usage of instance members since they become now static functions.

chore: update essential files

641e45a

chore: minor fixes

bb88223

- Remove constructor override for TestCase extension. - Remove CoverClass from methods.

chore: update phpunit version requirement

1302689

chore: assert true on cover nothing test

648bde1

fix: missing breakline symbol

664108c

chore: fixed multiple warnings and errors

3141e83

fix: code duplication

063e1c3

chore: bulk tests fix

ac41a42

yenfryherrerafeliz force-pushed the chore_php_unit_10 branch from ef2a511 to ac41a42 Compare January 30, 2026 19:41

yenfryherrerafeliz added 7 commits January 30, 2026 11:58

fix: format issues

0927f79

fix: format issues v2

dac8a36

fix: format issues v3

e1fb202

fix: format issues v4

6a3c601

chore: remove XDEBUG_MODE

a0812f2

chore: skip tests coverage report

d83228e

fix: remove call to removed method

9c0eb84

yenfryherrerafeliz marked this pull request as ready for review January 30, 2026 21:25

yenfryherrerafeliz requested a review from stobrien89 January 30, 2026 21:25

stobrien89 requested changes Feb 18, 2026

View reviewed changes

stobrien89 reviewed Feb 19, 2026

View reviewed changes

Conversation

yenfryherrerafeliz commented Jan 27, 2026

Uh oh!

stobrien89 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments