Migrate the testsuite to PHPUnit 11 (#1977)

Author: stof

.github/workflows/ci.yml

@@ -28,8 +28,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

composer.json

@@ -15,6 +15,11 @@
         "php": "^8.2",
         "async-aws/dynamo-db": "^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"
+    },
     "autoload": {
         "psr-4": {
             "AsyncAws\\DynamoDbSession\\": "src"

phpunit.xml.dist

@@ -1,17 +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/9.3/phpunit.xsd"
+         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"
 >
-  <coverage>
+  <source ignoreSuppressionOfDeprecations="true">
     <include>
       <directory>./src</directory>
     </include>
-  </coverage>
+    <deprecationTrigger>
+      <function>trigger_deprecation</function>
+    </deprecationTrigger>
+  </source>
   <php>
     <ini name="error_reporting" value="-1"/>
   </php>
@@ -20,4 +25,7 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
+  <extensions>
+    <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension"/>
+  </extensions>
 </phpunit>

tests/SessionHandlerTest.php

@@ -181,35 +181,42 @@ public function testWriteTwice()
             ->willReturn(ResultMockFactory::create(GetItemOutput::class, [
                 'Item' => [
                     'data' => new AttributeValue(['S' => 'previous data']),
-                    'expires' => new AttributeValue(['N' => time() + 86400]),
+                    'expires' => new AttributeValue(['N' => (string) (time() + 86400)]),
                 ],
             ]));
 
+        $expectedFirstData = [
+            'TableName' => 'testTable',
+            'Key' => [
+                'id' => ['S' => 'PHPSESSID_123456789'],
+            ],
+            'AttributeUpdates' => [
+                'expires' => ['Value' => ['N' => (string) (time() + 86400)]],
+                'data' => ['Value' => ['S' => 'new data']],
+            ],
+        ];
+        $expectedSecondData = [
+            'TableName' => 'testTable',
+            'Key' => [
+                'id' => ['S' => 'PHPSESSID_123456789'],
+            ],
+            'AttributeUpdates' => [
+                'expires' => ['Value' => ['N' => (string) (time() + 86400)]],
+                'data' => ['Value' => ['S' => 'previous data']],
+            ],
+        ];
+
         $this->client
             ->expects(self::exactly(2))
             ->method('updateItem')
-            ->withConsecutive(
-                [self::equalTo([
-                    'TableName' => 'testTable',
-                    'Key' => [
-                        'id' => ['S' => 'PHPSESSID_123456789'],
-                    ],
-                    'AttributeUpdates' => [
-                        'expires' => ['Value' => ['N' => time() + 86400]],
-                        'data' => ['Value' => ['S' => 'new data']],
-                    ],
-                ], 10)],
-                [self::equalTo([
-                    'TableName' => 'testTable',
-                    'Key' => [
-                        'id' => ['S' => 'PHPSESSID_123456789'],
-                    ],
-                    'AttributeUpdates' => [
-                        'expires' => ['Value' => ['N' => time() + 86400]],
-                        'data' => ['Value' => ['S' => 'previous data']],
-                    ],
-                ], 10)]
-            );
+            ->with(self::callback(function (array $data) use ($expectedFirstData, $expectedSecondData): bool {
+                static $i = 0;
+
+                return match (++$i) {
+                    1 => $data === $expectedFirstData,
+                    2 => $data === $expectedSecondData,
+                };
+            }));
 
         $this->handler->read('123456789');
         $this->handler->write('123456789', 'new data');