Skip to content

Commit a1c5a05

Browse files
committed
Merge pull request #2 from activecollab/support-more-response
Add support for PSR7 Response and custom status/body array
2 parents 2bb3fd2 + a0a599c commit a1c5a05

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/ResultEncoder/ResultEncoder.php

+8
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public function &setDisplayErrorDetails($value)
4949
*/
5050
public function encode($action_result, ServerRequestInterface $request, ResponseInterface $response)
5151
{
52+
if ($action_result instanceof ResponseInterface) {
53+
return $result;
54+
}
55+
5256
if ($action_result instanceof FileDownloadResponse) {
5357
foreach ($action_result->getHeaders() as $header => $value) {
5458
$response = $response->withHeader($header, $value);
@@ -75,6 +79,10 @@ public function encode($action_result, ServerRequestInterface $request, Response
7579

7680
// Array
7781
} elseif (is_array($action_result)) {
82+
if (isset($action_result['status']) && isset($action_result['body'])) {
83+
return $this->encodeArray($action_result['body'], $response, $action_result['status']);
84+
}
85+
7886
return $this->encodeArray($action_result, $response);
7987

8088
// Scalar

0 commit comments

Comments
 (0)