From bc12b73b62c921b614edecd392cc30f770dd10e3 Mon Sep 17 00:00:00 2001 From: Chuoke Date: Thu, 11 Sep 2025 17:41:45 +0800 Subject: [PATCH] feat: Support custom response classes without modifying the exception handler --- src/Illuminate/Foundation/Exceptions/Handler.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php index cdd7b7d16736..57dfc30f480e 100644 --- a/src/Illuminate/Foundation/Exceptions/Handler.php +++ b/src/Illuminate/Foundation/Exceptions/Handler.php @@ -22,7 +22,6 @@ use Illuminate\Database\RecordsNotFoundException; use Illuminate\Foundation\Exceptions\Renderer\Renderer; use Illuminate\Http\Exceptions\HttpResponseException; -use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Response; use Illuminate\Routing\Exceptions\BackedEnumCaseNotFoundException; @@ -985,7 +984,7 @@ protected function toIlluminateResponse($response, Throwable $e) $response->getTargetUrl(), $response->getStatusCode(), $response->headers->all() ); } else { - $response = new Response( + $response = response( $response->getContent(), $response->getStatusCode(), $response->headers->all() ); } @@ -1002,7 +1001,7 @@ protected function toIlluminateResponse($response, Throwable $e) */ protected function prepareJsonResponse($request, Throwable $e) { - return new JsonResponse( + return response()->json( $this->convertExceptionToArray($e), $this->isHttpException($e) ? $e->getStatusCode() : 500, $this->isHttpException($e) ? $e->getHeaders() : [],