From 2c98254bb494e75e695fad44a52ff01da3dfdf51 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Tue, 3 Jan 2023 11:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Middleware/JsonResponse.php | 4 ++-- app/Http/Middleware/ValidateUserIfBanned.php | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/JsonResponse.php b/app/Http/Middleware/JsonResponse.php index bafd5c3..8fb6a0f 100644 --- a/app/Http/Middleware/JsonResponse.php +++ b/app/Http/Middleware/JsonResponse.php @@ -15,9 +15,9 @@ class JsonResponse * @param Request $request * @param Closure(Request): (Response|RedirectResponse) $next * - * @return Response|RedirectResponse + * @return Response|RedirectResponse|\Illuminate\Http\JsonResponse */ - public function handle(Request $request, Closure $next) + public function handle(Request $request, Closure $next): Response|\Illuminate\Http\JsonResponse|RedirectResponse { // accept json $request->headers->set('Accept', 'application/json'); diff --git a/app/Http/Middleware/ValidateUserIfBanned.php b/app/Http/Middleware/ValidateUserIfBanned.php index 3f65675..feb1f9d 100644 --- a/app/Http/Middleware/ValidateUserIfBanned.php +++ b/app/Http/Middleware/ValidateUserIfBanned.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -12,12 +13,12 @@ class ValidateUserIfBanned /** * Handle an incoming request. * - * @param Request $request - * @param Closure(Request): (Response|RedirectResponse) $next + * @param Request $request + * @param Closure $next * - * @return Response|RedirectResponse + * @return Response|RedirectResponse|JsonResponse */ - public function handle(Request $request, Closure $next): Response|RedirectResponse + public function handle(Request $request, Closure $next): Response|RedirectResponse|JsonResponse { $user = $request->user(); if ($user) if ($user->banned_at !== null) {