Merge pull request #73 from laminas/renovate/psr-http-message-2.x

Verify `psr/http-message:^2` compatibility
laminas · Jul 24, 2023 · f07ff33 · f07ff33
2 parents 32076e2 + 4e0a599
commit f07ff33
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "laminas/laminas-validator": "^2.30.1",
         "phpunit/phpunit": "^9.6.10",
         "psalm/plugin-phpunit": "^0.18.4",
-        "psr/http-message": "^1.1",
+        "psr/http-message": "^2.0",
         "vimeo/psalm": "^5.13.1"
     },
     "conflict": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/Reader/Http/Psr7ResponseDecoratorTest.php b/test/Reader/Http/Psr7ResponseDecoratorTest.php
@@ -7,9 +7,9 @@
 use Laminas\Feed\Reader\Http\HeaderAwareResponseInterface;
 use Laminas\Feed\Reader\Http\Psr7ResponseDecorator;
 use Laminas\Feed\Reader\Http\ResponseInterface;
-use LaminasTest\Feed\Reader\TestAsset\Psr7Stream;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface as Psr7ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * @covers \Laminas\Feed\Reader\Http\Psr7ResponseDecorator
@@ -56,21 +56,13 @@ public function testProxiesToDecoratedResponseToRetrieveStatusCode(): void
 
     public function testProxiesToDecoratedResponseToRetrieveBody(): void
     {
-        $originalResponse = $this->createMock(Psr7ResponseInterface::class);
-        $originalResponse
-            ->method('getBody')
+        $body = $this->createMock(StreamInterface::class);
+        $body->method('__toString')
             ->willReturn('BODY');
-        $decorator = new Psr7ResponseDecorator($originalResponse);
-        $this->assertSame('BODY', $decorator->getBody());
-    }
-
-    public function testCastsStreamToStringWhenReturningPsr7Body(): void
-    {
-        $stream           = new Psr7Stream('BODY');
         $originalResponse = $this->createMock(Psr7ResponseInterface::class);
         $originalResponse
             ->method('getBody')
-            ->willReturn($stream);
+            ->willReturn($body);
         $decorator = new Psr7ResponseDecorator($originalResponse);
         $this->assertSame('BODY', $decorator->getBody());
     }

diff --git a/test/Reader/TestAsset/Psr7Stream.php b/test/Reader/TestAsset/Psr7Stream.php
@@ -12,18 +12,12 @@
  */
 class Psr7Stream
 {
-    /** @var mixed */
-    private $streamValue;
-
-    /** @param mixed $streamValue */
-    public function __construct($streamValue)
+    public function __construct(private string $streamValue)
     {
-        $this->streamValue = $streamValue;
     }
 
-    /** @return string */
-    public function __toString()
+    public function __toString(): string
     {
-        return (string) $this->streamValue;
+        return $this->streamValue;
     }
 }