Add support for PHPUnit10 and remove support for PHPUnit8

composer.json

@@ -14,8 +14,8 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
-        "phpunit/phpunit": "^8.0 || ^9.3",
+        "php": "^7.3 || ^8.0",
+        "phpunit/phpunit": "^9.3 || ^10.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {

src/BaseTest.php

@@ -5,12 +5,18 @@
 use GuzzleHttp\Psr7\Stream as GuzzleStream;
 use GuzzleHttp\Psr7\UploadedFile as GuzzleUploadedFile;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
+use GuzzleHttp\Psr7\Utils;
+use Http\Message\StreamFactory;
+use Http\Message\UriFactory;
+use Laminas\Diactoros\Stream as ZendStream;
+use Laminas\Diactoros\Uri as ZendUri;
+use Laminas\Diactoros\UploadedFile as ZendUploadedFile;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
 use Slim\Psr7\Uri as SlimUri;
-use Zend\Diactoros\Stream as ZendStream;
-use Zend\Diactoros\Uri as ZendUri;
-use Zend\Diactoros\UploadedFile as ZendUploadedFile;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -27,10 +33,10 @@ protected function buildUri($uri)
         if (defined('URI_FACTORY')) {
             $factoryClass = URI_FACTORY;
             $factory = new $factoryClass();
-            if ($factory instanceof \Http\Message\UriFactory) {
+            if ($factory instanceof UriFactory) {
                 return $factory->createUri($uri);
             }
-            if ($factory instanceof \Psr\Http\Message\UriFactoryInterface) {
+            if ($factory instanceof UriFactoryInterface) {
                 if ($uri instanceof UriInterface) {
                     return $uri;
                 }
@@ -61,10 +67,10 @@ protected function buildStream($data)
         if (defined('STREAM_FACTORY')) {
             $factoryClass = STREAM_FACTORY;
             $factory = new $factoryClass();
-            if ($factory instanceof \Http\Message\StreamFactory) {
+            if ($factory instanceof StreamFactory) {
                 return $factory->createStream($data);
             }
-            if ($factory instanceof \Psr\Http\Message\StreamFactoryInterface) {
+            if ($factory instanceof StreamFactoryInterface) {
                 if (is_string($data)) {
                     return $factory->createStream($data);
                 } else {
@@ -76,7 +82,7 @@ protected function buildStream($data)
         }
 
         if (class_exists(GuzzleStream::class)) {
-            return \GuzzleHttp\Psr7\Utils::streamFor($data);
+            return Utils::streamFor($data);
         }
 
         if (class_exists(ZendStream::class)) {
@@ -91,7 +97,7 @@ protected function buildUploadableFile($data)
         if (defined('UPLOADED_FILE_FACTORY')) {
             $factoryClass = UPLOADED_FILE_FACTORY;
             $factory = new $factoryClass();
-            if (!$factory instanceof \Psr\Http\Message\UploadedFileFactoryInterface) {
+            if (!$factory instanceof UploadedFileFactoryInterface) {
                 throw new \RuntimeException('Constant "UPLOADED_FILE_FACTORY" must be a reference to a Psr\Http\Message\UploadedFileFactoryInterface');
             }
 

src/MessageTrait.php

@@ -141,7 +141,7 @@ public function testWithHeaderInvalidArguments($name, $value)
         $initialMessage->withHeader($name, $value);
     }
 
-    public function getInvalidHeaderArguments()
+    public static function getInvalidHeaderArguments()
     {
         return [
             [[], 'foo'],
@@ -254,11 +254,6 @@ public function testBody()
 
     private function assertMatchesRegexp(string $pattern, string $string, string $message = ''): void
     {
-        // @TODO remove when package require phpunit 9.1
-        if (function_exists('PHPUnit\Framework\assertMatchesRegularExpression')) {
-            $this->assertMatchesRegularExpression($pattern, $string, $message);
-        } else {
-            $this->assertRegExp($pattern, $string, $message);
-        }
+        $this->assertMatchesRegularExpression($pattern, $string, $message);
     }
 }

src/RequestIntegrationTest.php

@@ -100,7 +100,7 @@ public function testMethodWithInvalidArguments($method)
         $this->request->withMethod($method);
     }
 
-    public function getInvalidMethods()
+    public static function getInvalidMethods()
     {
         return [
             [null],

src/ResponseIntegrationTest.php

@@ -62,7 +62,7 @@ public function testStatusCodeInvalidArgument($statusCode)
         $this->response->withStatus($statusCode);
     }
 
-    public function getInvalidStatusCodeArguments()
+    public static function getInvalidStatusCodeArguments()
     {
         return [
             [true],

src/ServerRequestIntegrationTest.php

@@ -103,7 +103,7 @@ public function testGetParsedBody($value)
         $this->assertEquals($value, $new->getParsedBody());
     }
 
-    public function validParsedBodyParams()
+    public static function validParsedBodyParams()
     {
         return [
             [null],
@@ -129,7 +129,7 @@ public function testGetParsedBodyInvalid($value)
         }
     }
 
-    public function invalidParsedBodyParams()
+    public static function invalidParsedBodyParams()
     {
         return [
             [4711],

src/UploadedFileIntegrationTest.php

@@ -103,12 +103,7 @@ public function testGetSize()
         $file = $this->createSubject();
         $size = $file->getSize();
         if ($size) {
-            // @TODO remove when package require phpunit 9.1
-            if (function_exists('PHPUnit\Framework\assertMatchesRegularExpression')) {
-                $this->assertMatchesRegularExpression('|^[0-9]+$|', (string) $size);
-            } else {
-                $this->assertRegExp('|^[0-9]+$|', (string) $size);
-            }
+            $this->assertMatchesRegularExpression('|^[0-9]+$|', (string) $size);
         } else {
             $this->assertNull($size);
         }

src/UriIntegrationTest.php

@@ -51,7 +51,7 @@ public function testWithSchemeInvalidArguments($schema)
         $this->createUri('/')->withScheme($schema);
     }
 
-    public function getInvalidSchemaArguments()
+    public static function getInvalidSchemaArguments()
     {
         return [
             [true],
@@ -134,69 +134,69 @@ public function testPort()
     /**
      * @dataProvider getPaths
      */
-    public function testPath(UriInterface $uri, $expected)
+    public function testPath(string $uri, string $expected)
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->assertSame($expected, $uri->getPath());
+        $this->assertSame($expected, $this->createUri($uri)->getPath());
     }
 
-    public function getPaths()
+    public static function getPaths()
     {
         return [
-            [$this->createUri('http://www.foo.com/'), '/'],
-            [$this->createUri('http://www.foo.com'), ''],
-            [$this->createUri('foo/bar'), 'foo/bar'],
-            [$this->createUri('http://www.foo.com/foo bar'), '/foo%20bar'],
-            [$this->createUri('http://www.foo.com/foo%20bar'), '/foo%20bar'],
-            [$this->createUri('http://www.foo.com/foo%2fbar'), '/foo%2fbar'],
+            ['http://www.foo.com/', '/'],
+            ['http://www.foo.com', ''],
+            ['foo/bar', 'foo/bar'],
+            ['http://www.foo.com/foo bar', '/foo%20bar'],
+            ['http://www.foo.com/foo%20bar', '/foo%20bar'],
+            ['http://www.foo.com/foo%2fbar', '/foo%2fbar'],
         ];
     }
 
     /**
      * @dataProvider getQueries
      */
-    public function testQuery(UriInterface $uri, $expected)
+    public function testQuery(string $uri, string $expected)
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->assertSame($expected, $uri->getQuery());
+        $this->assertSame($expected, $this->createUri($uri)->getQuery());
     }
 
-    public function getQueries()
+    public static function getQueries()
     {
         return [
-            [$this->createUri('http://www.foo.com'), ''],
-            [$this->createUri('http://www.foo.com?'), ''],
-            [$this->createUri('http://www.foo.com?foo=bar'), 'foo=bar'],
-            [$this->createUri('http://www.foo.com?foo=bar%26baz'), 'foo=bar%26baz'],
-            [$this->createUri('http://www.foo.com?foo=bar&baz=biz'), 'foo=bar&baz=biz'],
+            ['http://www.foo.com', ''],
+            ['http://www.foo.com?', ''],
+            ['http://www.foo.com?foo=bar', 'foo=bar'],
+            ['http://www.foo.com?foo=bar%26baz', 'foo=bar%26baz'],
+            ['http://www.foo.com?foo=bar&baz=biz', 'foo=bar&baz=biz'],
         ];
     }
 
     /**
      * @dataProvider getFragments
      */
-    public function testFragment(UriInterface $uri, $expected)
+    public function testFragment(string $uri, string $expected)
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $this->assertEquals($expected, $uri->getFragment());
+        $this->assertEquals($expected, $this->createUri($uri)->getFragment());
     }
 
-    public function getFragments()
+    public static function getFragments()
     {
         return [
-            [$this->createUri('http://www.foo.com'), ''],
-            [$this->createUri('http://www.foo.com#'), ''],
-            [$this->createUri('http://www.foo.com#foo'), 'foo'],
-            [$this->createUri('http://www.foo.com#foo%20bar'), 'foo%20bar'],
+            ['http://www.foo.com', ''],
+            ['http://www.foo.com#', ''],
+            ['http://www.foo.com#foo', 'foo'],
+            ['http://www.foo.com#foo%20bar', 'foo%20bar'],
         ];
     }
 

tests/Guzzle/RequestTest.php

@@ -16,7 +16,7 @@ public function createSubject()
         return new Request('GET', '/');
     }
 
-    public function getInvalidHeaderArguments()
+    public static function getInvalidHeaderArguments()
     {
         $testCases = parent::getInvalidHeaderArguments();
 

tests/Guzzle/ResponseTest.php

@@ -12,7 +12,7 @@ public function createSubject()
         return new Response();
     }
 
-    public function getInvalidHeaderArguments()
+    public static function getInvalidHeaderArguments()
     {
         $testCases = parent::getInvalidHeaderArguments();