Merge pull request #2 from lmc-eu/feature/add-initiator-to-response-d…

…ecoders Add inititator to response decoders supports method
lmc-eu · Aug 10, 2021 · cbdc42c · cbdc42c
2 parents e4051fd + 19bd4ab
commit cbdc42c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 <!-- There should always be "Unreleased" section at the beginning. -->
 
 ## Unreleased
+- [**BC**] Add an `$initiator` to `ResponseDecoders` `supports` method
+- Fix HttpProfilerFormatter test to work with cloned response
 
 ## 1.0.0 - 2021-05-13
 - Initial implementation
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "fig/http-message-util": "^1.1",
-        "lmc/cqrs-types": "^1.0",
+        "lmc/cqrs-types": "^2.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0"

diff --git a/src/Decoder/HttpMessageResponseDecoder.php b/src/Decoder/HttpMessageResponseDecoder.php
@@ -11,7 +11,7 @@
  */
 class HttpMessageResponseDecoder implements ResponseDecoderInterface
 {
-    public function supports($response): bool
+    public function supports($response, $initiator): bool
     {
         return $response instanceof MessageInterface;
     }

diff --git a/src/Decoder/StreamResponseDecoder.php b/src/Decoder/StreamResponseDecoder.php
@@ -10,7 +10,7 @@
  */
 class StreamResponseDecoder implements ResponseDecoderInterface
 {
-    public function supports($response): bool
+    public function supports($response, $initiator): bool
     {
         return $response instanceof StreamInterface;
     }

diff --git a/tests/Decoder/HttpMessageResponseDecoderTest.php b/tests/Decoder/HttpMessageResponseDecoderTest.php
@@ -26,7 +26,7 @@ public function shouldDecodeNyholmMessage($message, bool $isSupported, $expected
     {
         $decoded = $this->decoder->decode($message);
 
-        $this->assertSame($isSupported, $this->decoder->supports($message));
+        $this->assertSame($isSupported, $this->decoder->supports($message, null));
         $this->assertEquals($expected, $decoded);
     }
 

diff --git a/tests/Decoder/StreamResponseDecoderTest.php b/tests/Decoder/StreamResponseDecoderTest.php
@@ -26,7 +26,7 @@ public function shouldDecodeNyholmMessage($message, bool $isSupported, $expected
     {
         $decoded = $this->decoder->decode($message);
 
-        $this->assertSame($isSupported, $this->decoder->supports($message));
+        $this->assertSame($isSupported, $this->decoder->supports($message, null));
         $this->assertEquals($expected, $decoded);
     }
 

diff --git a/tests/Formatter/HttpProfilerFormatterTest.php b/tests/Formatter/HttpProfilerFormatterTest.php
@@ -69,6 +69,7 @@ public function provideNyholmItems(): iterable
                 'test',
                 '',
                 $request = (new \Nyholm\Psr7\Request('get', 'url'))
+                    ->withBody(\Nyholm\Psr7\Stream::create())
             ),
             new ProfilerItem(
                 'id',
@@ -251,6 +252,7 @@ public function provideGuzzleItems(): iterable
                 'test',
                 '',
                 $request = (new \GuzzleHttp\Psr7\Request('post', 'url'))
+                    ->withBody(Utils::streamFor(null))
             ),
             new ProfilerItem(
                 'id',