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

Update dependency psr/http-message to v2
laminas · Dec 6, 2023 · 7c9f049 · 7c9f049
2 parents eb3a7d7 + 6023582
commit 7c9f049
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "psr/container": "^1.1.2 || ^2.0.2",
         "psr/event-dispatcher": "^1.0",
         "psr/http-factory": "^1.0.2",
-        "psr/http-message": "^1.1.0",
+        "psr/http-message": "^2.0.0",
         "psr/http-server-handler": "^1.0.2",
         "psr/http-server-middleware": "^1.0.2",
         "psr/log": "^1.1 || ^2.0 || ^3.0"

diff --git a/composer.lock b/composer.lock
diff --git a/test/GitHub/Listener/DocsBuildActionListenerTest.php b/test/GitHub/Listener/DocsBuildActionListenerTest.php
@@ -10,6 +10,7 @@
 use App\Slack\Domain\SlashResponseMessage;
 use App\Slack\Response\SlackResponse;
 use App\Slack\SlackClientInterface;
+use AppTest\Psr7Helper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -81,7 +82,7 @@ public function testLogsErrorAndReportsViaSlackIfGitHubRequestFails(int $httpSta
 
         $response = $this->prophesize(ResponseInterface::class);
         $response->getStatusCode()->willReturn($httpStatus)->shouldBeCalled();
-        $response->getBody()->willReturn('error message from github')->shouldBeCalled();
+        $response->getBody()->willReturn(Psr7Helper::stream('error message from github'))->shouldBeCalled();
 
         $this->githubClient->send($request->reveal())->will([$response, 'reveal'])->shouldBeCalled();
 

diff --git a/test/GitHub/Listener/GitHubReleaseWebsiteUpdateListenerTest.php b/test/GitHub/Listener/GitHubReleaseWebsiteUpdateListenerTest.php
@@ -7,6 +7,7 @@
 use App\GitHub\Event\GitHubRelease;
 use App\GitHub\Listener\GitHubReleaseWebsiteUpdateListener;
 use App\HttpClientInterface;
+use AppTest\Psr7Helper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -128,7 +129,7 @@ public function testLogsErrorUpdatingWebsite(): void
 
         $response = $this->prophesize(ResponseInterface::class);
         $response->getStatusCode()->willReturn(400);
-        $response->getBody()->willReturn('');
+        $response->getBody()->willReturn(Psr7Helper::stream(''));
 
         $this->httpClient->send($request->reveal())->will([$response, 'reveal'])->shouldBeCalled();
 

diff --git a/test/GitHub/Listener/GitHubStatusListenerTest.php b/test/GitHub/Listener/GitHubStatusListenerTest.php
@@ -13,6 +13,7 @@
 use App\Slack\Domain\WebAPIMessage;
 use App\Slack\Response\SlackResponseInterface;
 use App\Slack\SlackClientInterface;
+use AppTest\Psr7Helper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -103,7 +104,7 @@ public function testLogsErrorAndNotifiesSlackWithGenericMessageForPullRequestWhe
         $ghRequest  = $this->prophesize(RequestInterface::class);
         $ghResponse = $this->prophesize(ResponseInterface::class);
         $ghResponse->getStatusCode()->willReturn(400)->shouldBeCalled();
-        $ghResponse->getBody()->willReturn('')->shouldBeCalled();
+        $ghResponse->getBody()->willReturn(Psr7Helper::stream(''))->shouldBeCalled();
 
         $this->githubClient
             ->createRequest(
@@ -246,7 +247,7 @@ public function testNotifesSlackWithPullRequestBuildStatusWhenSearchHasAtLeastOn
 
         $ghRequest = $this->prophesize(RequestInterface::class);
 
-        $ghResponsePayload = json_encode([
+        $ghResponsePayload = Psr7Helper::stream(json_encode([
             'incomplete_results' => false,
             'items'              => [
                 [
@@ -255,7 +256,7 @@ public function testNotifesSlackWithPullRequestBuildStatusWhenSearchHasAtLeastOn
                     'html_url' => 'pull-request-url',
                 ],
             ],
-        ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
 
         $ghResponse = $this->prophesize(ResponseInterface::class);
         $ghResponse->getStatusCode()->willReturn(200)->shouldBeCalled();

diff --git a/test/GitHub/Listener/RegisterWebhookListenerTest.php b/test/GitHub/Listener/RegisterWebhookListenerTest.php
@@ -11,6 +11,7 @@
 use App\Slack\Response\SlackResponseInterface;
 use App\Slack\SlackClientInterface;
 use App\UrlHelper;
+use AppTest\Psr7Helper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -153,7 +154,7 @@ public function testLogsErrorAndNotifiesSlackWhenWebhookRegistrationFails(): voi
 
         $response = $this->prophesize(ResponseInterface::class);
         $response->getStatusCode()->willReturn(400)->shouldBeCalled();
-        $response->getBody()->willReturn('');
+        $response->getBody()->willReturn(Psr7Helper::stream(''));
 
         $this->github
             ->createRequest(

diff --git a/test/Psr7Helper.php b/test/Psr7Helper.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppTest;
+
+use Laminas\Diactoros\StreamFactory;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
+
+class Psr7Helper
+{
+    public static ?StreamFactoryInterface $streamFactory = null;
+
+    public static function streamFactory(): StreamFactoryInterface
+    {
+        if (self::$streamFactory === null) {
+            self::$streamFactory = new StreamFactory();
+        }
+
+        return self::$streamFactory;
+    }
+
+    public static function stream(string $content): StreamInterface
+    {
+        return self::streamFactory()->createStream($content);
+    }
+}
diff --git a/test/Slack/SlackClientTest.php b/test/Slack/SlackClientTest.php
@@ -9,6 +9,7 @@
 use App\Slack\Domain\WebAPIMessage;
 use App\Slack\Response\SlackResponse;
 use App\Slack\SlackClient;
+use AppTest\Psr7Helper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -59,9 +60,9 @@ public function testSendReturnsReceivedResponseOnSuccess(): void
         $response = $this->prophesize(ResponseInterface::class);
         $response
             ->getBody()
-            ->willReturn(json_encode([
+            ->willReturn(Psr7Helper::stream(json_encode([
                 'ok' => true,
-            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))
+            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)))
             ->shouldBeCalled();
 
         $this->httpClient
@@ -89,10 +90,10 @@ public function testSendLogsResponseOnFailureBeforeReturning(): void
         $response->getStatusCode()->willReturn(400)->shouldBeCalled();
         $response
             ->getBody()
-            ->willReturn(json_encode([
+            ->willReturn(Psr7Helper::stream(json_encode([
                 'ok'    => false,
                 'error' => 'the error message',
-            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))
+            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)))
             ->shouldBeCalled();
 
         $this->httpClient
@@ -180,9 +181,9 @@ public function testSendWebhookMessageMarshalsRequestFromMessageAndSendsIt(): vo
         $response = $this->prophesize(ResponseInterface::class);
         $response
             ->getBody()
-            ->willReturn(json_encode([
+            ->willReturn(Psr7Helper::stream(json_encode([
                 'ok' => true,
-            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))
+            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)))
             ->shouldBeCalled();
 
         $this->httpClient
@@ -257,9 +258,9 @@ public function testSendWebAPIMessageMarshalsRequestFromMessageAndSendsIt(): voi
         $response = $this->prophesize(ResponseInterface::class);
         $response
             ->getBody()
-            ->willReturn(json_encode([
+            ->willReturn(Psr7Helper::stream(json_encode([
                 'ok' => true,
-            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES))
+            ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)))
             ->shouldBeCalled();
 
         $this->httpClient