From 5e4c8e7212dc1037fa475a9ebb434c8903f3099b Mon Sep 17 00:00:00 2001 From: Thomas Schiet Date: Fri, 25 Aug 2023 17:40:13 +0200 Subject: [PATCH 1/2] Use Symfony Response in exception handler --- src/Illuminate/Foundation/Exceptions/Handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php index d6d92ed60296..28e663001991 100644 --- a/src/Illuminate/Foundation/Exceptions/Handler.php +++ b/src/Illuminate/Foundation/Exceptions/Handler.php @@ -483,7 +483,7 @@ protected function renderViaCallbacks($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Throwable $e - * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse + * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse */ protected function renderExceptionResponse($request, Throwable $e) { @@ -497,7 +497,7 @@ protected function renderExceptionResponse($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Illuminate\Auth\AuthenticationException $exception - * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse + * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse */ protected function unauthenticated($request, AuthenticationException $exception) { @@ -529,7 +529,7 @@ protected function convertValidationExceptionToResponse(ValidationException $e, * * @param \Illuminate\Http\Request $request * @param \Illuminate\Validation\ValidationException $exception - * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse + * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse */ protected function invalid($request, ValidationException $exception) { @@ -570,7 +570,7 @@ protected function shouldReturnJson($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Throwable $e - * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse + * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse */ protected function prepareResponse($request, Throwable $e) { From 184ecd42ecb0ef98d36cd0053df829f781a4eb24 Mon Sep 17 00:00:00 2001 From: Thomas Schiet Date: Tue, 29 Aug 2023 15:13:18 +0200 Subject: [PATCH 2/2] Only use Laravel responses --- src/Illuminate/Foundation/Exceptions/Handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php index 28e663001991..d8ff3a8cbedf 100644 --- a/src/Illuminate/Foundation/Exceptions/Handler.php +++ b/src/Illuminate/Foundation/Exceptions/Handler.php @@ -483,7 +483,7 @@ protected function renderViaCallbacks($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Throwable $e - * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse */ protected function renderExceptionResponse($request, Throwable $e) { @@ -497,7 +497,7 @@ protected function renderExceptionResponse($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Illuminate\Auth\AuthenticationException $exception - * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse */ protected function unauthenticated($request, AuthenticationException $exception) { @@ -529,7 +529,7 @@ protected function convertValidationExceptionToResponse(ValidationException $e, * * @param \Illuminate\Http\Request $request * @param \Illuminate\Validation\ValidationException $exception - * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse */ protected function invalid($request, ValidationException $exception) { @@ -570,7 +570,7 @@ protected function shouldReturnJson($request, Throwable $e) * * @param \Illuminate\Http\Request $request * @param \Throwable $e - * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse */ protected function prepareResponse($request, Throwable $e) {