Add support for psr/http-message version ^2.0 (#40)

vjik · web-flow · commit bfa566b98bd5 · 2024-05-29T14:13:46.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 ## 1.0.1 under development
 
-- no changes in this release.
+- Enh #40: Add support for `psr/http-message` version `^2.0` (@vjik)
 
 ## 1.0.0 June 30, 2023
 
-- Initial release.
+- Initial release.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     "require": {
         "php": "^8.0",
         "ext-filter": "*",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^1.0|^2.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "yiisoft/http": "^1.2",
diff --git a/tests/TrustedHeaderProtocolResolverTest.php b/tests/TrustedHeaderProtocolResolverTest.php
@@ -192,30 +192,26 @@ public function testArraySchemeFailure(array $schemeValues, string $errorMessage
     public function schemeCallableFailureDataProvider(): array
     {
         return [
-            'int' => [1],
-            'float' => [1.1],
-            'true' => [true],
-            'false' => [false],
-            'array' => [['https']],
+            'int' => [[1]],
+            'float' => [[1.1]],
+            'true' => [[true]],
+            'false' => [[false]],
+            'array' => [[['https']]],
             'empty-array' => [[]],
-            'empty-string' => [''],
-            'object' => [new StdClass()],
-            'callable' => [static fn () => 'https'],
+            'empty-string' => [['']],
+            'object' => [[new StdClass()]],
+            'callable' => [[static fn () => 'https']],
         ];
     }
 
     /**
      * @dataProvider schemeCallableFailureDataProvider
      */
-    public function testCallableSchemeFailure(mixed $scheme): void
+    public function testCallableSchemeFailure(array $scheme): void
     {
         $request = $this->createMock(ServerRequestInterface::class);
-        $request
-            ->method('hasHeader')
-            ->willReturn(true);
-        $request
-            ->method('getHeader')
-            ->willReturn($scheme);
+        $request->method('hasHeader')->willReturn(true);
+        $request->method('getHeader')->willReturn($scheme);
 
         $middleware = (new TrustedHeaderProtocolResolver())
             ->withAddedProtocolHeader('x-forwarded-proto', static fn () => $scheme)
