Update phpunit

.github/workflows/continuous-integration.yml

@@ -23,6 +23,7 @@ jobs:
         php-version:
           - "8.1"
           - "8.2"
+          - "8.3"
         dependencies:
           - "lowest"
           - "highest"

composer.json

@@ -25,8 +25,9 @@
         "amphp/http-client": "^v5.0.0-beta.8",
         "amphp/process": "^2",
         "mockery/mockery": "^1.5",
-        "phpunit/php-code-coverage": "^9",
-        "phpunit/phpunit": "^9"
+        "phpunit/php-code-coverage": "^10",
+        "phpunit/phpunit": "^10",
+        "seec/phpunit-consecutive-params": "^1.1"
     },
     "minimum-stability": "beta",
     "autoload": {

phpunit.xml.dist

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
-  <coverage>
-    <include>
-      <file>bin/stdinho</file>
-      <directory>src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
   <testsuites>
     <testsuite name="stdinho">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <file>bin/stdinho</file>
+      <directory>src</directory>
+    </include>
+  </source>
 </phpunit>

tests/IntegrationTest.php

@@ -17,13 +17,16 @@
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use SEEC\PhpUnit\Helper\ConsecutiveParams;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use function Amp\async;
 
 class IntegrationTest extends TestCase
 {
+    use ConsecutiveParams;
+
     public function testBufferOverflow(): void
     {
         $buffererInput = $this->createMock(ReadableStream::class);
@@ -54,7 +57,7 @@ public function testBufferOverflow(): void
         $socket
             ->expects(static::exactly(4))
             ->method('write')
-            ->withConsecutive([Assert::stringContains('HTTP/1.1 200 OK')], [$foo], [$bar], [$baz])
+            ->with(...$this->withConsecutive([Assert::stringContains('HTTP/1.1 200 OK')], [$foo], [$bar], [$baz]))
         ;
 
         $logger->expects(self::once())->method('warning')->with(self::stringStartsWith('Max buffer size reached'));

tests/ResponderTest.php

@@ -7,20 +7,21 @@
 use Amp\ByteStream\ReadableStream;
 use Amp\ByteStream\WritableResourceStream;
 use Amp\DeferredFuture;
-use Amp\Future;
-use Psr\Log\LoggerInterface;
-use function Amp\Promise\wait;
 use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Ostrolucky\Stdinho\Bufferer\ResolvedBufferer;
 use Ostrolucky\Stdinho\Responder;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use SEEC\PhpUnit\Helper\ConsecutiveParams;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\ConsoleSectionOutput;
 
 class ResponderTest extends TestCase
 {
+    use ConsecutiveParams;
+
     public function testResponderHandlesClientAbruptDisconnect(): void
     {
         $responder = new Responder(
@@ -31,10 +32,10 @@ public function testResponderHandlesClientAbruptDisconnect(): void
             $this->createMock(ReadableStream::class),
             new DeferredFuture()
         );
-        $logger->expects(self::exactly(2))->method('debug')->withConsecutive(
+        $logger->expects(self::exactly(2))->method('debug')->with(...$this->withConsecutive(
                 [self::stringStartsWith('Accepted connection')],
                 [self::stringContains('aborted download')],
-        );
+        ));
         $outputFormatter = $this->createMock(OutputFormatterInterface::class);
         $outputFormatter->method('isDecorated')->willReturn(false);
         $outputFormatter->method('format')->willReturn('');
@@ -46,9 +47,7 @@ public function testResponderHandlesClientAbruptDisconnect(): void
 
         $socket->method('getRemoteAddress')->willReturn($this->createMock(SocketAddress::class));
         $socket->method('read')->willReturn('');
-        $socket->method('write')->willReturnCallback(function(string $data) use ($writer) {
-            return $writer->write($data);
-        });
+        $socket->method('write')->willReturnCallback(fn(string $data) => $writer->write($data));
 
         fclose($resource);