eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

ControllerResponseTrait: Better error response

Browse Source
This commit is contained in:
Matias Griese
2019-08-24 12:31:04 +03:00
parent 3e34d54b9a
commit 8e82056afa
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php
View File

@@ -87,10 +87,10 @@ trait ControllerResponseTrait
}
/**
* @param \Exception $e
* @return Response
* @param \Throwable $e
* @return \Throwable
*/
protected function createErrorResponse(\Exception $e): ResponseInterface
protected function createErrorResponse(\Throwable $e): ResponseInterface
{
$validCodes = [
400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418,
@@ -113,7 +113,15 @@ trait ControllerResponseTrait
$response = [
'code' => $code,
'status' => 'error',
'message' => $message
'message' => $message,
'error' => [
'type' => \get_class($e),
'code' => $code,
'message' => $message,
'file' => $e->getFile(),
'line' => $e->getLine(),
'trace' => explode("\n", $e->getTraceAsString()),
]
];
$accept = $this->getAccept(['application/json', 'text/html']);
@@ -130,7 +138,7 @@ trait ControllerResponseTrait
}
// TODO: improve error page
return $this->createHtmlResponse($response['message']);
return $this->createHtmlResponse($response['message'], $code);
}
return new Response($code, ['Content-Type' => 'application/json'], json_encode($response), '1.1', $reason);