Fix using a formatter with a custom body (#58)

devanych · web-flow · commit 22d7076156ea · 2021-06-20T16:34:09.000+03:00
diff --git a/src/DataResponse.php b/src/DataResponse.php
@@ -186,6 +186,7 @@ public function withBody(StreamInterface $body): self
         $new->dataStream = $body;
         $new->forcedBody = true;
         $new->formatted = false;
+        $new->data = null;
         return $new;
     }
 
diff --git a/tests/DataResponseTest.php b/tests/DataResponseTest.php
@@ -241,6 +241,29 @@ public function testWithBody(): void
         $this->assertSame('test2', $dataResponse->getBody()->getContents());
     }
 
+    public function testWithBodyAndWithResponseFormatter(): void
+    {
+        $dataResponse = $this->createDataResponse('test1')
+            ->withResponseFormatter(new JsonDataResponseFormatter())
+            ->withBody($this->createStream('test2'))
+        ;
+
+        $dataResponse->getBody()->rewind();
+
+        $this->assertSame(['application/json; charset=UTF-8'], $dataResponse->getHeader(Header::CONTENT_TYPE));
+        $this->assertSame('test2', $dataResponse->getBody()->getContents());
+
+        $dataResponse = $dataResponse
+            ->withBody($this->createStream('test3'))
+            ->withResponseFormatter(new XmlDataResponseFormatter())
+        ;
+
+        $dataResponse->getBody()->rewind();
+
+        $this->assertSame(['application/xml; charset=UTF-8'], $dataResponse->getHeader(Header::CONTENT_TYPE));
+        $this->assertSame('test3', $dataResponse->getBody()->getContents());
+    }
+
     public function testWithBodyIfDataIsNull(): void
     {
         $dataResponse = $this->createDataResponse(null)->withBody($this->createStream('test'));
diff --git a/tests/Stub/CustomDataResponseFormatter.php b/tests/Stub/CustomDataResponseFormatter.php
@@ -9,7 +9,7 @@
 use Yiisoft\DataResponse\DataResponse;
 use Yiisoft\DataResponse\DataResponseFormatterInterface;
 
-class CustomDataResponseFormatter implements DataResponseFormatterInterface
+final class CustomDataResponseFormatter implements DataResponseFormatterInterface
 {
     private int $statusCode = 200;
     private array $headers = [];

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ public function withBody(StreamInterface $body): self`
`186`	`186`	`$new->dataStream = $body;`
`187`	`187`	`$new->forcedBody = true;`
`188`	`188`	`$new->formatted = false;`
	`189`	`+ $new->data = null;`
`189`	`190`	`return $new;`
`190`	`191`	`}`
`191`	`192`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Yiisoft\DataResponse\DataResponse;`
`10`	`10`	`use Yiisoft\DataResponse\DataResponseFormatterInterface;`
`11`	`11`
`12`		`-class CustomDataResponseFormatter implements DataResponseFormatterInterface`
	`12`	`+final class CustomDataResponseFormatter implements DataResponseFormatterInterface`
`13`	`13`	`{`
`14`	`14`	`private int $statusCode = 200;`
`15`	`15`	`private array $headers = [];`