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

Allow `psr/http-message:^2`
laminas · May 19, 2023 · 7dc274a · 7dc274a
2 parents 48b755f + 490f16a
commit 7dc274a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "php": "~8.1.0 || ~8.2.0",
         "laminas/laminas-servicemanager": "^3.21.0",
         "laminas/laminas-stdlib": "^3.13",
-        "psr/http-message": "^1.0.1"
+        "psr/http-message": "^1.0.1 || ^2.0.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "^2.5",

diff --git a/composer.lock b/composer.lock
diff --git a/test/UndisclosedPasswordTest.php b/test/UndisclosedPasswordTest.php
@@ -15,6 +15,7 @@
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 use ReflectionClass;
 use stdClass;
 
@@ -26,16 +27,11 @@
 
 final class UndisclosedPasswordTest extends TestCase
 {
-    /** @var ClientInterface&MockObject */
-    private ClientInterface $httpClient;
-
-    /** @var RequestFactoryInterface&MockObject */
-    private RequestFactoryInterface $httpRequest;
-
-    /** @var ResponseInterface&MockObject */
-    private ResponseInterface $httpResponse;
-
+    private ClientInterface&MockObject $httpClient;
+    private RequestFactoryInterface&MockObject $httpRequest;
+    private ResponseInterface&MockObject $httpResponse;
     private UndisclosedPassword $validator;
+    private StreamInterface&MockObject $stream;
 
     /** {@inheritDoc} */
     protected function setUp(): void
@@ -45,8 +41,8 @@ protected function setUp(): void
         $this->httpClient   = $this->createMock(ClientInterface::class);
         $this->httpRequest  = $this->createMock(RequestFactoryInterface::class);
         $this->httpResponse = $this->createMock(ResponseInterface::class);
-
-        $this->validator = new UndisclosedPassword($this->httpClient, $this->httpRequest);
+        $this->validator    = new UndisclosedPassword($this->httpClient, $this->httpRequest);
+        $this->stream       = $this->createMock(StreamInterface::class);
     }
 
     /**
@@ -114,7 +110,7 @@ public function testStrongUnseenPasswordsPassValidation(string $password): void
         $this->httpResponse
             ->expects(self::once())
             ->method('getBody')
-            ->willReturnCallback(function (): string {
+            ->willReturnCallback(function (): StreamInterface {
                 $hash = sha1('laminas-validator');
 
                 $constant = $this->getConstant(
@@ -123,11 +119,14 @@ public function testStrongUnseenPasswordsPassValidation(string $password): void
                 );
                 self::assertIsInt($constant);
 
-                return sprintf(
-                    '%s:%d',
-                    strtoupper(substr($hash, $constant)),
-                    random_int(0, 100000)
-                );
+                $this->stream->method('__toString')
+                    ->willReturn(sprintf(
+                        '%s:%d',
+                        strtoupper(substr($hash, $constant)),
+                        random_int(0, 100000)
+                    ));
+
+                return $this->stream;
             });
 
         $this->httpClient
@@ -148,7 +147,7 @@ public function testBreachedPasswordsDoNotPassValidation(string $password): void
         $this->httpResponse
             ->expects(self::once())
             ->method('getBody')
-            ->willReturnCallback(function () use ($password): string {
+            ->willReturnCallback(function () use ($password): StreamInterface {
                 $hash = sha1($password);
 
                 $constant = $this->getConstant(
@@ -158,11 +157,14 @@ public function testBreachedPasswordsDoNotPassValidation(string $password): void
 
                 self::assertIsInt($constant);
 
-                return sprintf(
-                    '%s:%d',
-                    strtoupper(substr($hash, $constant)),
-                    random_int(0, 100000)
-                );
+                $this->stream->method('__toString')
+                    ->willReturn(sprintf(
+                        '%s:%d',
+                        strtoupper(substr($hash, $constant)),
+                        random_int(0, 100000)
+                    ));
+
+                return $this->stream;
             });
 
         $this->httpClient