Skip to content

Remove views support. Let it be API everywhere #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2020
Merged

Remove views support. Let it be API everywhere #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 2 additions & 32 deletions src/ExceptionHandlerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trait ExceptionHandlerTrait
* Report or log an exception.
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Exception $e
* @return void
* @throws Exception
*/
Expand All @@ -36,41 +36,11 @@ public function render($request, Exception $e)
{
$e = $this->resolveException($e);

$response = $request->expectsJson() || ! function_exists('view')
? $this->renderForApi($e, $request)
: $this->renderForHtml($e, $request);
$response = response()->json($this->formatApiResponse($e), $e->getCode(), $e->getHeaders());

return $response->withException($e);
}

/**
* Render exceptions for json API.
*
* @param ApiException $e
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
protected function renderForApi(ApiException $e, $request)
{
return response()->json($this->formatApiResponse($e), $e->getCode(), $e->getHeaders());
}

/**
* Render exception for common html request.
*
* @param ApiException $e
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
protected function renderForHtml(ApiException $e, $request)
{
$status = $e->getCode();

return view()->exists("errors.{$status}")
? response(view("errors.{$status}", ['exception' => $e]), $status, $e->getHeaders())
: $this->renderForApi($e, $request);
}

/**
* Define exception.
*
Expand Down