@@ -16,7 +16,7 @@ trait ExceptionHandlerTrait
16
16
* Report or log an exception.
17
17
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
18
18
*
19
- * @param \Exception $e
19
+ * @param \Exception $e
20
20
* @return void
21
21
* @throws Exception
22
22
*/
@@ -36,41 +36,11 @@ public function render($request, Exception $e)
36
36
{
37
37
$ e = $ this ->resolveException ($ e );
38
38
39
- $ response = $ request ->expectsJson () || ! function_exists ('view ' )
40
- ? $ this ->renderForApi ($ e , $ request )
41
- : $ this ->renderForHtml ($ e , $ request );
39
+ $ response = response ()->json ($ this ->formatApiResponse ($ e ), $ e ->getCode (), $ e ->getHeaders ());
42
40
43
41
return $ response ->withException ($ e );
44
42
}
45
43
46
- /**
47
- * Render exceptions for json API.
48
- *
49
- * @param ApiException $e
50
- * @param \Illuminate\Http\Request $request
51
- * @return \Illuminate\Http\JsonResponse
52
- */
53
- protected function renderForApi (ApiException $ e , $ request )
54
- {
55
- return response ()->json ($ this ->formatApiResponse ($ e ), $ e ->getCode (), $ e ->getHeaders ());
56
- }
57
-
58
- /**
59
- * Render exception for common html request.
60
- *
61
- * @param ApiException $e
62
- * @param \Illuminate\Http\Request $request
63
- * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
64
- */
65
- protected function renderForHtml (ApiException $ e , $ request )
66
- {
67
- $ status = $ e ->getCode ();
68
-
69
- return view ()->exists ("errors. {$ status }" )
70
- ? response (view ("errors. {$ status }" , ['exception ' => $ e ]), $ status , $ e ->getHeaders ())
71
- : $ this ->renderForApi ($ e , $ request );
72
- }
73
-
74
44
/**
75
45
* Define exception.
76
46
*
0 commit comments