diff --git a/app/Http/Controllers/Admin/AdminAjaxController.php b/app/Http/Controllers/Admin/AdminAjaxController.php index 887101e26..220887b44 100644 --- a/app/Http/Controllers/Admin/AdminAjaxController.php +++ b/app/Http/Controllers/Admin/AdminAjaxController.php @@ -18,7 +18,7 @@ class AdminAjaxController extends BasePageController * * @throws \Throwable */ - public function ajaxAction(Request $request) + public function ajaxAction(Request $request): void { if ($request->missing('action')) { exit(); diff --git a/app/Http/Controllers/Admin/AdminAnidbController.php b/app/Http/Controllers/Admin/AdminAnidbController.php index db7ceb28e..177555a58 100644 --- a/app/Http/Controllers/Admin/AdminAnidbController.php +++ b/app/Http/Controllers/Admin/AdminAnidbController.php @@ -11,7 +11,7 @@ class AdminAnidbController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -36,12 +36,12 @@ class AdminAnidbController extends BasePageController } /** - * @param $id + * @param int $id * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws \Exception */ - public function edit($id) + public function edit(int $id): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); @@ -94,11 +94,11 @@ class AdminAnidbController extends BasePageController /** * Remove the specified resource from storage. * - * @param int $id + * @param int $id * * @throws \Exception */ - public function destroy($id) + public function destroy(int $id): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminBlacklistController.php b/app/Http/Controllers/Admin/AdminBlacklistController.php index 6499c2b33..dcf2e8efb 100644 --- a/app/Http/Controllers/Admin/AdminBlacklistController.php +++ b/app/Http/Controllers/Admin/AdminBlacklistController.php @@ -12,7 +12,7 @@ class AdminBlacklistController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); $binaries = new Binaries(); @@ -33,7 +33,7 @@ class AdminBlacklistController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $binaries = new Binaries(['Settings' => null]); diff --git a/app/Http/Controllers/Admin/AdminBookController.php b/app/Http/Controllers/Admin/AdminBookController.php index c208dde75..4e3121716 100644 --- a/app/Http/Controllers/Admin/AdminBookController.php +++ b/app/Http/Controllers/Admin/AdminBookController.php @@ -13,7 +13,7 @@ class AdminBookController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -36,7 +36,7 @@ class AdminBookController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $book = new Books(); diff --git a/app/Http/Controllers/Admin/AdminCategoryController.php b/app/Http/Controllers/Admin/AdminCategoryController.php index b99c879fa..738083c00 100644 --- a/app/Http/Controllers/Admin/AdminCategoryController.php +++ b/app/Http/Controllers/Admin/AdminCategoryController.php @@ -11,7 +11,7 @@ class AdminCategoryController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); $meta_title = $title = 'Category List'; @@ -32,7 +32,7 @@ class AdminCategoryController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminCategoryRegexesController.php b/app/Http/Controllers/Admin/AdminCategoryRegexesController.php index 939c9e448..5d3a9ac3a 100644 --- a/app/Http/Controllers/Admin/AdminCategoryRegexesController.php +++ b/app/Http/Controllers/Admin/AdminCategoryRegexesController.php @@ -14,7 +14,7 @@ class AdminCategoryRegexesController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); $regexes = new Regexes(['Settings' =>null, 'Table_Name' => 'category_regexes']); @@ -39,8 +39,8 @@ class AdminCategoryRegexesController extends BasePageController } /** - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void * @throws \Exception */ public function edit(Request $request) @@ -112,10 +112,10 @@ class AdminCategoryRegexesController extends BasePageController ->orderBy('c.id') ->get(); $categories = ['category_names', 'category_ids']; - if ($categories_db) { + if (count($categories_db) !== 0) { foreach ($categories_db as $category_db) { - $categories['category_names'][] = $category_db->parent_title.' '.$category_db->title.': '.$category_db->id; - $categories['category_ids'][] = $category_db->id; + $categories['category_names'] = $category_db->parent_title.' '.$category_db->title.': '.$category_db->id; + $categories['category_ids'] = $category_db->id; } } $this->smarty->assign('category_names', $categories['category_names']); diff --git a/app/Http/Controllers/Admin/AdminCollectionRegexesController.php b/app/Http/Controllers/Admin/AdminCollectionRegexesController.php index 74e01dc09..1e1d5505e 100644 --- a/app/Http/Controllers/Admin/AdminCollectionRegexesController.php +++ b/app/Http/Controllers/Admin/AdminCollectionRegexesController.php @@ -14,7 +14,7 @@ class AdminCollectionRegexesController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'collection_regexes']); @@ -38,7 +38,7 @@ class AdminCollectionRegexesController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'collection_regexes']); @@ -104,7 +104,7 @@ class AdminCollectionRegexesController extends BasePageController * * @throws \Exception */ - public function testRegex(Request $request) + public function testRegex(Request $request): void { $this->setAdminPrefs(); $meta_title = $title = 'Collections Regex Test'; diff --git a/app/Http/Controllers/Admin/AdminCommentsController.php b/app/Http/Controllers/Admin/AdminCommentsController.php index f05eaf36b..4d54a2d9b 100644 --- a/app/Http/Controllers/Admin/AdminCommentsController.php +++ b/app/Http/Controllers/Admin/AdminCommentsController.php @@ -10,7 +10,7 @@ class AdminCommentsController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -25,10 +25,10 @@ class AdminCommentsController extends BasePageController } /** - * @param $id - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @param int $id + * @return \Illuminate\Http\RedirectResponse */ - public function destroy($id) + public function destroy(int $id): \Illuminate\Http\RedirectResponse { if ($id) { ReleaseComment::deleteComment($id); diff --git a/app/Http/Controllers/Admin/AdminConsoleController.php b/app/Http/Controllers/Admin/AdminConsoleController.php index a460405b6..6b7da38f2 100644 --- a/app/Http/Controllers/Admin/AdminConsoleController.php +++ b/app/Http/Controllers/Admin/AdminConsoleController.php @@ -13,7 +13,7 @@ class AdminConsoleController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -36,7 +36,7 @@ class AdminConsoleController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $console = new Console(['Settings' => null]); diff --git a/app/Http/Controllers/Admin/AdminContentController.php b/app/Http/Controllers/Admin/AdminContentController.php index a13a7fbf9..aa1980745 100644 --- a/app/Http/Controllers/Admin/AdminContentController.php +++ b/app/Http/Controllers/Admin/AdminContentController.php @@ -12,7 +12,7 @@ class AdminContentController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); $contentList = (new Contents())->getAll(); @@ -33,7 +33,7 @@ class AdminContentController extends BasePageController * * @throws \Exception */ - public function create(Request $request) + public function create(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $contents = new Contents(); @@ -113,7 +113,7 @@ class AdminContentController extends BasePageController * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request) + public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { if ($request->has('id')) { $contents = new Contents(); diff --git a/app/Http/Controllers/Admin/AdminFailedReleasesController.php b/app/Http/Controllers/Admin/AdminFailedReleasesController.php index 818ff8c28..710a43909 100644 --- a/app/Http/Controllers/Admin/AdminFailedReleasesController.php +++ b/app/Http/Controllers/Admin/AdminFailedReleasesController.php @@ -10,7 +10,7 @@ class AdminFailedReleasesController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminGameController.php b/app/Http/Controllers/Admin/AdminGameController.php index a0d3b30f4..fb37b95c4 100644 --- a/app/Http/Controllers/Admin/AdminGameController.php +++ b/app/Http/Controllers/Admin/AdminGameController.php @@ -13,7 +13,7 @@ class AdminGameController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); $game = new Games(['Settings' => null]); @@ -37,7 +37,7 @@ class AdminGameController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $games = new Games(['Settings' => null]); diff --git a/app/Http/Controllers/Admin/AdminGroupController.php b/app/Http/Controllers/Admin/AdminGroupController.php index 7f88196f8..ffd779efc 100644 --- a/app/Http/Controllers/Admin/AdminGroupController.php +++ b/app/Http/Controllers/Admin/AdminGroupController.php @@ -13,7 +13,7 @@ class AdminGroupController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); @@ -39,7 +39,7 @@ class AdminGroupController extends BasePageController * * @throws \Exception */ - public function createBulk(Request $request) + public function createBulk(Request $request): void { $this->setAdminPrefs(); @@ -72,7 +72,7 @@ class AdminGroupController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); @@ -138,7 +138,7 @@ class AdminGroupController extends BasePageController * * @throws \Exception */ - public function active(Request $request) + public function active(Request $request): void { $this->setAdminPrefs(); $gname = ''; @@ -168,7 +168,7 @@ class AdminGroupController extends BasePageController * * @throws \Exception */ - public function inactive(Request $request) + public function inactive(Request $request): void { $this->setAdminPrefs(); $gname = ''; diff --git a/app/Http/Controllers/Admin/AdminMovieController.php b/app/Http/Controllers/Admin/AdminMovieController.php index e3baa6aa3..7b7f1a76a 100644 --- a/app/Http/Controllers/Admin/AdminMovieController.php +++ b/app/Http/Controllers/Admin/AdminMovieController.php @@ -14,7 +14,7 @@ class AdminMovieController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -36,7 +36,7 @@ class AdminMovieController extends BasePageController * * @throws \Exception */ - public function create(Request $request) + public function create(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { if (! \defined('STDOUT')) { \define('STDOUT', fopen('php://stdout', 'wb')); @@ -84,7 +84,7 @@ class AdminMovieController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminMusicController.php b/app/Http/Controllers/Admin/AdminMusicController.php index 3bf2e0284..aebd7a259 100644 --- a/app/Http/Controllers/Admin/AdminMusicController.php +++ b/app/Http/Controllers/Admin/AdminMusicController.php @@ -13,7 +13,7 @@ class AdminMusicController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -34,7 +34,7 @@ class AdminMusicController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $music = new Music(); diff --git a/app/Http/Controllers/Admin/AdminNzbController.php b/app/Http/Controllers/Admin/AdminNzbController.php index 6f85c8cb3..a10158dfe 100644 --- a/app/Http/Controllers/Admin/AdminNzbController.php +++ b/app/Http/Controllers/Admin/AdminNzbController.php @@ -16,7 +16,7 @@ class AdminNzbController extends BasePageController * * @throws \Exception */ - public function import(Request $request) + public function import(Request $request): void { $this->setAdminPrefs(); @@ -48,7 +48,7 @@ class AdminNzbController extends BasePageController } // Get the files from the user specified path. - $filesToProcess = glob($path.'*.nzb'); + $filesToProcess = glob($path.'*.nzb', GLOB_NOSORT); } if (\count($filesToProcess) > 0) { @@ -74,7 +74,7 @@ class AdminNzbController extends BasePageController * * @throws \Exception */ - public function export(Request $request) + public function export(Request $request): void { if (Utility::isCLI()) { exit('This script is only for exporting from the web, use the script in misc/testing'. diff --git a/app/Http/Controllers/Admin/AdminPageController.php b/app/Http/Controllers/Admin/AdminPageController.php index 497db26d8..818895be1 100644 --- a/app/Http/Controllers/Admin/AdminPageController.php +++ b/app/Http/Controllers/Admin/AdminPageController.php @@ -9,7 +9,7 @@ class AdminPageController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->adminBasePage(); } diff --git a/app/Http/Controllers/Admin/AdminPredbController.php b/app/Http/Controllers/Admin/AdminPredbController.php index 84b29990d..74fe338f2 100644 --- a/app/Http/Controllers/Admin/AdminPredbController.php +++ b/app/Http/Controllers/Admin/AdminPredbController.php @@ -13,7 +13,7 @@ class AdminPredbController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php b/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php index 8f40c7a1c..63660d3c1 100644 --- a/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php +++ b/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php @@ -14,7 +14,7 @@ class AdminReleaseNamingRegexesController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'release_naming_regexes']); @@ -39,7 +39,7 @@ class AdminReleaseNamingRegexesController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'release_naming_regexes']); @@ -106,7 +106,7 @@ class AdminReleaseNamingRegexesController extends BasePageController * * @throws \Exception */ - public function testRegex(Request $request) + public function testRegex(Request $request): void { $this->setAdminPrefs(); $meta_title = $title = 'Release Naming Regex Test'; diff --git a/app/Http/Controllers/Admin/AdminReleasesController.php b/app/Http/Controllers/Admin/AdminReleasesController.php index a438bf87d..88ffd9e01 100644 --- a/app/Http/Controllers/Admin/AdminReleasesController.php +++ b/app/Http/Controllers/Admin/AdminReleasesController.php @@ -30,9 +30,8 @@ class AdminReleasesController 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|void * @throws \Exception */ public function edit(Request $request) @@ -90,11 +89,10 @@ class AdminReleasesController extends BasePageController /** * @param $id - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * + * @return \Illuminate\Http\RedirectResponse * @throws \Exception */ - public function destroy($id) + public function destroy($id): \Illuminate\Http\RedirectResponse { if ($id) { $releases = new Releases(); diff --git a/app/Http/Controllers/Admin/AdminRoleController.php b/app/Http/Controllers/Admin/AdminRoleController.php index 32df8269e..b5ab23e2e 100644 --- a/app/Http/Controllers/Admin/AdminRoleController.php +++ b/app/Http/Controllers/Admin/AdminRoleController.php @@ -11,7 +11,7 @@ class AdminRoleController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setAdminPrefs(); @@ -241,7 +241,7 @@ class AdminRoleController extends BasePageController * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request) + public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { if ($request->has('id')) { Role::query()->where('id', $request->input('id'))->delete(); diff --git a/app/Http/Controllers/Admin/AdminSharingController.php b/app/Http/Controllers/Admin/AdminSharingController.php index f83083ade..c962e74d5 100644 --- a/app/Http/Controllers/Admin/AdminSharingController.php +++ b/app/Http/Controllers/Admin/AdminSharingController.php @@ -14,7 +14,7 @@ class AdminSharingController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminShowsController.php b/app/Http/Controllers/Admin/AdminShowsController.php index 471c6b28c..eab69e8e0 100644 --- a/app/Http/Controllers/Admin/AdminShowsController.php +++ b/app/Http/Controllers/Admin/AdminShowsController.php @@ -14,7 +14,7 @@ class AdminShowsController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setAdminPrefs(); @@ -39,7 +39,7 @@ class AdminShowsController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): void { $this->setAdminPrefs(); @@ -75,7 +75,7 @@ class AdminShowsController extends BasePageController * * @throws \Exception */ - public function destroy($id) + public function destroy($id): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminSiteController.php b/app/Http/Controllers/Admin/AdminSiteController.php index df2533f78..90d10ce1f 100644 --- a/app/Http/Controllers/Admin/AdminSiteController.php +++ b/app/Http/Controllers/Admin/AdminSiteController.php @@ -15,8 +15,8 @@ use Spatie\Permission\Models\Role; class AdminSiteController extends BasePageController { /** - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void * @throws \Exception */ public function edit(Request $request) @@ -168,7 +168,7 @@ class AdminSiteController extends BasePageController $this->smarty->assign('themelist', Utility::getThemesList()); - if (strpos(env('NNTP_SERVER'), 'astra') === false) { + if (! str_contains(env('NNTP_SERVER'), 'astra')) { $this->smarty->assign('compress_headers_warning', 'compress_headers_warning'); } @@ -182,7 +182,7 @@ class AdminSiteController extends BasePageController /** * @throws \Exception */ - public function stats() + public function stats(): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminTmuxController.php b/app/Http/Controllers/Admin/AdminTmuxController.php index 5b0d4f05d..397dfe70e 100644 --- a/app/Http/Controllers/Admin/AdminTmuxController.php +++ b/app/Http/Controllers/Admin/AdminTmuxController.php @@ -13,7 +13,7 @@ class AdminTmuxController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): void { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 0fb5c031e..abf98a24e 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -82,7 +82,7 @@ class AdminUserController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setAdminPrefs(); @@ -220,7 +220,7 @@ class AdminUserController extends BasePageController * * @throws \Exception */ - public function destroy(Request $request) + public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { if ($request->has('id')) { $user = User::find($request->input('id')); @@ -243,7 +243,7 @@ class AdminUserController extends BasePageController * * @throws \Jrean\UserVerification\Exceptions\ModelNotCompliantException */ - public function resendVerification(Request $request) + public function resendVerification(Request $request): \Illuminate\Http\RedirectResponse { if ($request->has('id')) { $user = User::find($request->input('id')); @@ -257,15 +257,19 @@ class AdminUserController extends BasePageController } } - public function verify(Request $request) + /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse + */ + public function verify(Request $request): \Illuminate\Http\RedirectResponse { if ($request->has('id')) { $user = User::find($request->input('id')); User::query()->where('id', $request->input('id'))->update(['verified' => 1, 'email_verified_at' => now()]); return redirect()->back()->with('success', 'Email verification for '.$user->username.' sent'); - } else { - return redirect()->back()->with('error', 'User is invalid'); } + + return redirect()->back()->with('error', 'User is invalid'); } } diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index 26a1b2d89..450a920a0 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -11,11 +11,11 @@ class AdultController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @param string $id + * @param string $id * * @throws \Exception */ - public function show(Request $request, $id = '') + public function show(Request $request, string $id = ''): void { $this->setPrefs(); $adult = new XXX(); diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index ccc71f614..4f7832573 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -12,7 +12,7 @@ class AjaxController extends BasePageController * * @throws \Exception */ - public function profile(Request $request) + public function profile(Request $request): void { $this->setPrefs(); if ($request->has('action') && (int) $request->input('action') === 1 && $request->has('emailto')) { diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php index b54841631..7c255844f 100644 --- a/app/Http/Controllers/AnimeController.php +++ b/app/Http/Controllers/AnimeController.php @@ -36,7 +36,7 @@ class AnimeController extends BasePageController * * @throws \Exception */ - public function showAnime(Request $request) + public function showAnime(Request $request): void { $this->setPrefs(); @@ -87,7 +87,7 @@ class AnimeController extends BasePageController * * @throws \Exception */ - public function showList(Request $request) + public function showList(Request $request): void { $this->setPrefs(); $letter = ($request->has('id') && preg_match('/^(0\-9|[A-Z])$/i', $request->input('id'))) ? $request->input('id') : '0-9'; diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index d6694751d..6ee5e3a21 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -24,7 +24,7 @@ class ApiController extends BasePageController * * @throws \Throwable */ - public function api(Request $request) + public function api(Request $request): \Symfony\Component\HttpFoundation\StreamedResponse|\Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { // API functions. $function = 's'; diff --git a/app/Http/Controllers/Api/ApiInformController.php b/app/Http/Controllers/Api/ApiInformController.php index 317c40653..b58abab8e 100644 --- a/app/Http/Controllers/Api/ApiInformController.php +++ b/app/Http/Controllers/Api/ApiInformController.php @@ -19,7 +19,7 @@ class ApiInformController extends Controller * * @throws \Exception */ - public function release(Request $request) + public function release(Request $request): \Illuminate\Http\JsonResponse { $releaseObName = $request->has('relo') && ! empty($request->input('relo')) ? $request->input('relo') : ''; $releasePrName = $request->has('relp') && ! empty($request->input('relp')) ? $request->input('relp') : ''; diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php index 70f12d79c..7ca01516e 100644 --- a/app/Http/Controllers/Api/ApiV2Controller.php +++ b/app/Http/Controllers/Api/ApiV2Controller.php @@ -56,10 +56,12 @@ class ApiV2Controller extends BasePageController } /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse - * - * @throws \Exception + * @throws \Foolz\SphinxQL\Exception\ConnectionException + * @throws \Foolz\SphinxQL\Exception\DatabaseException + * @throws \Foolz\SphinxQL\Exception\SphinxQLException + * @throws \Throwable */ public function movie(Request $request): \Illuminate\Http\JsonResponse { diff --git a/app/Http/Controllers/ApiHelpController.php b/app/Http/Controllers/ApiHelpController.php index 333e5aa75..cb8aca2a1 100644 --- a/app/Http/Controllers/ApiHelpController.php +++ b/app/Http/Controllers/ApiHelpController.php @@ -14,7 +14,7 @@ class ApiHelpController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setPrefs(); $title = 'Api Help'; @@ -30,7 +30,7 @@ class ApiHelpController extends BasePageController /** * @throws \Exception */ - public function apiv2() + public function apiv2(): void { $this->setPrefs(); $title = 'Api V2 Help'; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index fcce26fa0..c6b98fa69 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -40,7 +40,7 @@ class ForgotPasswordController extends Controller * * @throws \Exception */ - public function showLinkRequestForm(Request $request) + public function showLinkRequestForm(Request $request): void { $sent = ''; $email = request()->input('email') ?? ''; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index bc833592d..e4713d6e6 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -28,15 +28,22 @@ class LoginController extends Controller use AuthenticatesUsers; - protected $maxAttempts = 3; // Default is 5 - protected $decayMinutes = 2; // Default is 1 + /** + * @var int + */ + protected int $maxAttempts = 3; // Default is 5 + + /** + * @var int + */ + protected int $decayMinutes = 2; // Default is 1 /** * Where to redirect users after login. * * @var string */ - protected $redirectTo = '/'; + protected string $redirectTo = '/'; /** * Create a new controller instance. @@ -49,9 +56,9 @@ class LoginController extends Controller } /** - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|void - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse|null + * @throws \Illuminate\Auth\AuthenticationException * @throws \Illuminate\Validation\ValidationException */ public function login(Request $request) @@ -121,7 +128,10 @@ class LoginController extends Controller return $this->showLoginForm(); } - public function showLoginForm() + /** + * @return void + */ + public function showLoginForm(): void { $theme = Settings::settingValue('site.main.style'); @@ -137,7 +147,7 @@ class LoginController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function logout(Request $request) + public function logout(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->guard()->logout(); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 54fd48dd8..1e341ea3b 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -42,12 +42,12 @@ class RegisterController extends Controller * * @var string */ - protected $redirectTo = '/'; + protected string $redirectTo = '/'; /** * @var string */ - private $inviteCodeQuery; + private string $inviteCodeQuery; /** * Create a new controller instance. @@ -212,10 +212,10 @@ class RegisterController extends Controller /** * @param Request $request - * @param string $error - * @param int $showRegister + * @param string $error + * @param int $showRegister */ - public function showRegistrationForm(Request $request, $error = '', $showRegister = 0) + public function showRegistrationForm(Request $request, string $error = '', int $showRegister = 0): void { $inviteCode = ''; if ($request->has('invitecode')) { diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index cc3584972..1931caec1 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -29,7 +29,7 @@ class ResetPasswordController extends Controller * * @var string */ - protected $redirectTo = '/'; + protected string $redirectTo = '/'; /** * Create a new controller instance. @@ -46,7 +46,7 @@ class ResetPasswordController extends Controller * * @throws \Exception */ - public function reset(Request $request) + public function reset(Request $request): void { $error = ''; $confirmed = ''; diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index db1fa3551..0f1a02c98 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -18,56 +18,56 @@ class BasePageController extends Controller /** * @var \App\Models\Settings */ - public $settings; + public Settings $settings; /** * @var string */ - public $title = ''; + public string $title = ''; /** * @var string */ - public $content = ''; + public string $content = ''; /** * @var string */ - public $meta_keywords = ''; + public string $meta_keywords = ''; /** * @var string */ - public $meta_title = ''; + public string $meta_title = ''; /** * @var string */ - public $meta_description = ''; + public string $meta_description = ''; /** * Current page the user is browsing. ie browse. * * @var string */ - public $page = ''; + public string $page = ''; /** * @var string */ - public $page_template = ''; + public string $page_template = ''; /** * @var User */ - public $userdata; + public User $userdata; /** * User's theme. * * @var string */ - protected $theme = 'Gentele'; + protected string $theme = 'Gentele'; /** * @var \Illuminate\Foundation\Application|mixed @@ -216,7 +216,7 @@ class BasePageController extends Controller abort(429, $retry); } - public function render() + public function render(): void { $this->smarty->display($this->page_template); } @@ -307,7 +307,7 @@ class BasePageController extends Controller /** * Set admin preferences. */ - public function setAdminPrefs() + public function setAdminPrefs(): void { // Tell Smarty which directories to use for templates $this->smarty->setTemplateDir( diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index f503360c1..a1c2bff80 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -11,11 +11,11 @@ class BooksController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @param string $id + * @param string $id * * @throws \Exception */ - public function index(Request $request, $id = '') + public function index(Request $request, string $id = ''): void { $this->setPrefs(); $book = new Books(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 4438eed2f..03bbdaa9a 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -62,7 +62,7 @@ class BrowseController extends BasePageController * * @throws \Exception */ - public function show(string $parentCategory, string $id = 'All') + public function show(string $parentCategory, string $id = 'All'): void { $this->setPrefs(); $releases = new Releases(); @@ -158,7 +158,7 @@ class BrowseController extends BasePageController * * @throws \Exception */ - public function group(Request $request) + public function group(Request $request): void { $this->setPrefs(); $releases = new Releases(); @@ -199,7 +199,7 @@ class BrowseController extends BasePageController * * @throws \Exception */ - public function tags(Request $request) + public function tags(Request $request): void { $this->setPrefs(); $releases = new Releases(); diff --git a/app/Http/Controllers/BrowseGroupController.php b/app/Http/Controllers/BrowseGroupController.php index 9969ee331..1017253ef 100644 --- a/app/Http/Controllers/BrowseGroupController.php +++ b/app/Http/Controllers/BrowseGroupController.php @@ -9,7 +9,7 @@ class BrowseGroupController extends BasePageController /** * @throws \Exception */ - public function show() + public function show(): void { $this->setPrefs(); $groupList = UsenetGroup::getGroupsRange('', true); diff --git a/app/Http/Controllers/BtcPaymentController.php b/app/Http/Controllers/BtcPaymentController.php index 9a080a1b2..9090699f7 100644 --- a/app/Http/Controllers/BtcPaymentController.php +++ b/app/Http/Controllers/BtcPaymentController.php @@ -15,7 +15,7 @@ class BtcPaymentController extends BasePageController * * @throws \Exception */ - public function show(Request $request) + public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $gateway_id = env('MYCELIUM_GATEWAY_ID'); @@ -64,7 +64,7 @@ class BtcPaymentController extends BasePageController /** * Callback data from Mycelium Gear. */ - public function callback() + public function callback(): void { $gateway_id = env('MYCELIUM_GATEWAY_ID'); $gateway_secret = env('MYCELIUM_GATEWAY_SECRET'); diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index c0bcd52eb..f612eb4fe 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -12,7 +12,7 @@ class CartController extends BasePageController /** * @throws \Exception */ - public function index() + public function index(): void { $this->setPrefs(); $meta_title = 'My Download Basket'; @@ -33,7 +33,7 @@ class CartController extends BasePageController * * @throws \Exception */ - public function store(Request $request) + public function store(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $guids = explode(',', $request->input('id')); @@ -55,12 +55,12 @@ class CartController extends BasePageController } /** - * @param string|array $id + * @param array|string $id * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws \Exception */ - public function destroy($id) + public function destroy(array|string $id): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $ids = null; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 997322dad..2e820f450 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -12,12 +12,12 @@ class ConsoleController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @param string $id + * @param string $id * @return \Illuminate\Http\JsonResponse * * @throws \Exception */ - public function show(Request $request, $id = '') + public function show(Request $request, string $id = ''): \Illuminate\Http\JsonResponse { $this->setPrefs(); if ($id === 'WiiVare') { diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index ec4ab951b..da4f79e65 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -8,12 +8,12 @@ use Illuminate\Http\Request; class ContactUsController extends BasePageController { /** - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|null * - * @throws \Exception + * @throws \Illuminate\Validation\ValidationException */ - public function contact(Request $request) + public function contact(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|null { $this->setPrefs(); $this->validate($request, [ @@ -50,11 +50,11 @@ class ContactUsController extends BasePageController } /** - * @param string $msg + * @param string $msg * * @throws \Exception */ - public function showContactForm($msg = '') + public function showContactForm(string $msg = ''): void { $this->setPrefs(); $title = 'Contact '.config('app.name'); diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index 3d98cd5ab..1ceaca79c 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -13,7 +13,7 @@ class ContentController extends BasePageController * * @throws \Exception */ - public function show(Request $request) + public function show(Request $request): \Illuminate\Http\JsonResponse { $this->setPrefs(); $contents = new Contents(); diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 5d9318371..0f726e483 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -27,12 +27,12 @@ use Illuminate\Support\Facades\Auth; class DetailsController extends BasePageController { /** - * @param $guid + * @param string $guid * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws \Exception */ - public function show($guid) + public function show(string $guid): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php index 4aa985250..9d15df9de 100644 --- a/app/Http/Controllers/FailedReleasesController.php +++ b/app/Http/Controllers/FailedReleasesController.php @@ -10,11 +10,11 @@ class FailedReleasesController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @return mixed + * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Http\Response * * @throws \Exception */ - public function failed(Request $request) + public function failed(Request $request): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Http\Response { if ($request->missing('api_token')) { return response('Bad request, please supply all parameters!', 400)->withHeaders(['X-DNZB-RCode' => 400, 'X-DNZB-RText' => 'Bad request, please supply all parameters!']); diff --git a/app/Http/Controllers/FileListController.php b/app/Http/Controllers/FileListController.php index b2ebb76a0..1be6dde25 100644 --- a/app/Http/Controllers/FileListController.php +++ b/app/Http/Controllers/FileListController.php @@ -8,11 +8,11 @@ use Blacklight\NZB; class FileListController extends BasePageController { /** - * @param $guid + * @param string $guid * * @throws \Exception */ - public function show($guid) + public function show(string $guid): void { $this->setPrefs(); $nzb = new NZB(); @@ -31,8 +31,7 @@ class FileListController extends BasePageController ob_start(); @readgzfile($nzbpath); - $nzbfile = ob_get_contents(); - ob_end_clean(); + $nzbfile = ob_get_clean(); $ret = $nzb->nzbFileList($nzbfile); diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 37c3d26ea..80be77eed 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -15,7 +15,7 @@ class ForumController extends BasePageController * * @throws \Exception */ - public function forum(Request $request) + public function forum(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); if ($this->isPostBack() && $request->has('addMessage') && $request->has('addSubject')) { @@ -71,7 +71,7 @@ class ForumController extends BasePageController * * @throws \Exception */ - public function getPosts($id, Request $request) + public function getPosts($id, Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); @@ -110,7 +110,7 @@ class ForumController extends BasePageController * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function deleteTopic(Request $request) + public function deleteTopic(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $id = $request->input('id') + 0; @@ -128,7 +128,7 @@ class ForumController extends BasePageController * * @throws \Exception */ - public function edit(Request $request) + public function edit(Request $request): void { $this->setPrefs(); @@ -163,7 +163,7 @@ class ForumController extends BasePageController * * @throws \Exception */ - public function destroy($id) + public function destroy($id): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index b92774ea7..913acd695 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -14,7 +14,7 @@ class GamesController extends BasePageController * * @throws \Exception */ - public function show(Request $request) + public function show(Request $request): void { $this->setPrefs(); $games = new Games(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index 9d4269b0c..d0a41fbe0 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -18,12 +18,11 @@ use Symfony\Component\HttpFoundation\StreamedResponse; class GetNzbController extends BasePageController { /** - * @param \Illuminate\Http\Request $request - * @return StreamedResponse|BinaryFileResponse|JsonResponse - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|\STS\ZipStream\ZipStream|\Symfony\Component\HttpFoundation\StreamedResponse * @throws \Exception */ - public function getNzb(Request $request) + public function getNzb(Request $request): \STS\ZipStream\ZipStream|StreamedResponse|JsonResponse { $this->setPrefs(); diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 5e9cb415b..1dec41977 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -11,11 +11,11 @@ class MovieController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @param string $id + * @param string $id * * @throws \Exception */ - public function showMovies(Request $request, $id = '') + public function showMovies(Request $request, string $id = ''): void { $this->setPrefs(); $movie = new Movie(['Settings' => $this->settings]); @@ -133,7 +133,7 @@ class MovieController extends BasePageController * * @throws \Exception */ - public function showTrailer(Request $request) + public function showTrailer(Request $request): \Illuminate\Http\JsonResponse { $movie = new Movie; diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 29f3c8dd9..34fcd0d65 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -12,11 +12,11 @@ class MusicController extends BasePageController { /** * @param \Illuminate\Http\Request $request - * @param string $id + * @param string $id * * @throws \Exception */ - public function show(Request $request, $id = '') + public function show(Request $request, string $id = ''): void { $this->setPrefs(); $music = new Music(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index bf3559f01..6c59b8ba7 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -17,7 +17,7 @@ class MyMoviesController extends BasePageController * * @throws \Exception */ - public function show(Request $request) + public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $mv = new Movie(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index 5f5bf9232..9ee0bc641 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -17,7 +17,7 @@ class MyShowsController extends BasePageController * * @throws \Exception */ - public function show(Request $request) + public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $action = $request->input('action') ?? ''; @@ -168,7 +168,7 @@ class MyShowsController extends BasePageController * * @throws \Exception */ - public function browse(Request $request) + public function browse(Request $request): void { $this->setPrefs(); $title = 'Browse My Shows'; diff --git a/app/Http/Controllers/NfoController.php b/app/Http/Controllers/NfoController.php index e249255df..ffd8a5391 100644 --- a/app/Http/Controllers/NfoController.php +++ b/app/Http/Controllers/NfoController.php @@ -10,12 +10,12 @@ use Illuminate\Http\Request; class NfoController extends BasePageController { /** - * @param string $id + * @param string $id * @param \Illuminate\Http\Request $request * * @throws \Exception */ - public function showNfo(Request $request, $id = '') + public function showNfo(Request $request, string $id = ''): void { $this->setPrefs(); diff --git a/app/Http/Controllers/PasswordSecurityController.php b/app/Http/Controllers/PasswordSecurityController.php index 7d3e924f3..1db422289 100644 --- a/app/Http/Controllers/PasswordSecurityController.php +++ b/app/Http/Controllers/PasswordSecurityController.php @@ -13,7 +13,7 @@ class PasswordSecurityController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View */ - public function show2faForm(Request $request) + public function show2faForm(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Contracts\Foundation\Application { $user = Auth::user(); @@ -41,7 +41,7 @@ class PasswordSecurityController extends Controller * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException */ - public function generate2faSecret(Request $request) + public function generate2faSecret(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application { $user = Auth::user(); @@ -65,7 +65,7 @@ class PasswordSecurityController extends Controller * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException */ - public function enable2fa(Request $request) + public function enable2fa(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application { $user = Auth::user(); $secret = $request->input('verify-code'); @@ -84,7 +84,7 @@ class PasswordSecurityController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function disable2fa(Request $request) + public function disable2fa(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application { if (! (Hash::check($request->get('current-password'), Auth::user()->password))) { // The passwords matches diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index de9e1f1be..f78dffece 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -357,7 +357,7 @@ class ProfileController extends BasePageController * * @throws \Exception */ - public function destroy(Request $request) + public function destroy(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Routing\Redirector|\Illuminate\View\View|\Illuminate\Http\RedirectResponse { $this->setPrefs(); $userId = $request->input('id'); diff --git a/app/Http/Controllers/QueueController.php b/app/Http/Controllers/QueueController.php index d955c0801..cb164b033 100644 --- a/app/Http/Controllers/QueueController.php +++ b/app/Http/Controllers/QueueController.php @@ -15,7 +15,7 @@ class QueueController extends BasePageController * * @throws \Exception */ - public function index(Request $request) + public function index(Request $request): void { $this->setPrefs(); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 8f742f23b..19d1801a4 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -19,7 +19,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - public function myMoviesRss(Request $request) + public function myMoviesRss(Request $request): \Illuminate\Http\JsonResponse|array { $rss = new RSS(['Settings' => $this->settings]); $offset = 0; @@ -45,7 +45,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - public function myShowsRss(Request $request) + public function myShowsRss(Request $request): \Illuminate\Http\JsonResponse|array { $rss = new RSS(['Settings' => $this->settings]); $offset = 0; @@ -67,7 +67,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - public function fullFeedRss(Request $request) + public function fullFeedRss(Request $request): \Illuminate\Http\JsonResponse|array { $rss = new RSS(['Settings' => $this->settings]); $offset = 0; @@ -92,7 +92,7 @@ class RssController extends BasePageController /** * @throws \Exception */ - public function showRssDesc() + public function showRssDesc(): void { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); @@ -139,7 +139,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - public function cartRss(Request $request) + public function cartRss(Request $request): \Illuminate\Http\JsonResponse|array { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); @@ -169,7 +169,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - public function categoryFeedRss(Request $request) + public function categoryFeedRss(Request $request): \Illuminate\Http\JsonResponse|array { $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); @@ -203,7 +203,7 @@ class RssController extends BasePageController * * @throws \Throwable */ - private function userCheck(Request $request) + private function userCheck(Request $request): \Illuminate\Http\JsonResponse|array { if ($request->missing('api_token')) { return response()->json(['error' => 'API key is required for viewing the RSS!'], 403); diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 5dd88069c..a6c6e81a0 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -14,7 +14,7 @@ class SearchController extends BasePageController * * @throws \Exception */ - public function search(Request $request) + public function search(Request $request): void { $this->setPrefs(); $releases = new Releases(); diff --git a/app/Http/Controllers/SendReleaseController.php b/app/Http/Controllers/SendReleaseController.php index 27c911428..c3b027db0 100644 --- a/app/Http/Controllers/SendReleaseController.php +++ b/app/Http/Controllers/SendReleaseController.php @@ -16,7 +16,7 @@ class SendReleaseController extends BasePageController * * @throws \Exception */ - public function couchPotato(Request $request) + public function couchPotato(Request $request): void { $this->setPrefs(); if (empty($request->input('id'))) { @@ -68,7 +68,7 @@ class SendReleaseController extends BasePageController * * @throws \Exception */ - public function nzbGet(Request $request) + public function nzbGet(Request $request): void { $this->setPrefs(); if (empty($request->input('id'))) { @@ -99,7 +99,7 @@ class SendReleaseController extends BasePageController * * @throws \Exception */ - public function queue(Request $request) + public function queue(Request $request): void { $this->setPrefs(); if (empty($request->input('id'))) { diff --git a/app/Http/Controllers/SeriesController.php b/app/Http/Controllers/SeriesController.php index d1d2c8461..c5c999714 100644 --- a/app/Http/Controllers/SeriesController.php +++ b/app/Http/Controllers/SeriesController.php @@ -11,12 +11,12 @@ use Illuminate\Support\Arr; class SeriesController extends BasePageController { /** - * @param string $id + * @param string $id * @param \Illuminate\Http\Request $request * * @throws \Exception */ - public function index(Request $request, $id = '') + public function index(Request $request, string $id = ''): void { $this->setPrefs(); $releases = new Releases(); diff --git a/app/Http/Controllers/TermsController.php b/app/Http/Controllers/TermsController.php index c42b1c396..eb9d7b210 100644 --- a/app/Http/Controllers/TermsController.php +++ b/app/Http/Controllers/TermsController.php @@ -7,7 +7,7 @@ class TermsController extends BasePageController /** * @throws \Exception */ - public function terms() + public function terms(): void { $this->setPrefs(); $title = 'Terms and Conditions';