Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Slim/Handlers/Strategies/ActionStrategy.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Eukles\Slim\Handlers\ApiProblemRendererTrait;
use Exception;
use InvalidArgumentException;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UploadedFileInterface;
Expand Down Expand Up @@ -181,7 +182,7 @@ protected function buildParams(
* @return ResponseInterface
* @throws Exception
*/
protected function buildResponse($result, ResponseInterface $response)
protected function buildResponse($result, ResponseInterface $response, RequestInterface $request)
{

$responseBuilder = $this->container->getResponseBuilder();
Expand All @@ -193,6 +194,9 @@ protected function buildResponse($result, ResponseInterface $response)
if (!is_callable($responseFormatter)) {
throw new ResponseFormatterException('ResponseFormatter must be callable or implements ResponseFormatterInterface');
}
if (method_exists($responseBuilder, 'setRequest')) {
$responseBuilder->setRequest($request);
}

$result = $responseBuilder($result);

Expand Down Expand Up @@ -237,7 +241,7 @@ protected function callHandler(
if (($result instanceof ResponseInterface)) {
$response = $result;
} else {
$response = $this->buildResponse($result, $response);
$response = $this->buildResponse($result, $response, $request);
}

return $response;
Expand Down