From e17dbc12d2c66f2f91b8b412d3d097e77a8fbd38 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 30 Nov 2022 20:48:34 +0100 Subject: [PATCH] Fix return type declarations --- .../Admin/AdminContentController.php | 13 +++++----- .../Controllers/Admin/AdminUserController.php | 24 ++++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminContentController.php b/app/Http/Controllers/Admin/AdminContentController.php index aa1980745..eb1f71e79 100644 --- a/app/Http/Controllers/Admin/AdminContentController.php +++ b/app/Http/Controllers/Admin/AdminContentController.php @@ -28,12 +28,11 @@ class AdminContentController extends BasePageController } /** - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void * @throws \Exception */ - public function create(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function create(Request $request) { $this->setAdminPrefs(); $contents = new Contents(); @@ -110,10 +109,10 @@ class AdminContentController extends BasePageController } /** - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application { if ($request->has('id')) { $contents = new Contents(); diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 356449f88..86b31b10f 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -13,8 +13,8 @@ use Spatie\Permission\Models\Role; class AdminUserController extends BasePageController { /** - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request + * @return void * @throws \Throwable */ public function index(Request $request): void @@ -77,12 +77,11 @@ class AdminUserController extends BasePageController } /** - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void * @throws \Exception */ - public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function edit(Request $request) { $this->setAdminPrefs(); @@ -215,12 +214,10 @@ class AdminUserController extends BasePageController } /** - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * - * @throws \Exception + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application { if ($request->has('id')) { $user = User::find($request->input('id')); @@ -238,9 +235,8 @@ class AdminUserController extends BasePageController } /** - * @param Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse - * * @throws \Jrean\UserVerification\Exceptions\ModelNotCompliantException */ public function resendVerification(Request $request): \Illuminate\Http\RedirectResponse @@ -258,7 +254,7 @@ class AdminUserController extends BasePageController } /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse */ public function verify(Request $request): \Illuminate\Http\RedirectResponse