@@ -16,7 +16,7 @@ trait ExceptionHandlerTrait
1616 * Report or log an exception.
1717 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
1818 *
19- * @param \Exception $e
19+ * @param \Exception $e
2020 * @return void
2121 * @throws Exception
2222 */
@@ -36,41 +36,11 @@ public function render($request, Exception $e)
3636 {
3737 $ e = $ this ->resolveException ($ e );
3838
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 ());
4240
4341 return $ response ->withException ($ e );
4442 }
4543
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-
7444 /**
7545 * Define exception.
7646 *
0 commit comments