diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 810ad907d..23508eb93 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\Release; use App\Models\UsersRelease; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -28,9 +29,11 @@ class CartController extends BasePageController } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse * @throws \Exception */ - public function store(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function store(Request $request): RedirectResponse { $this->setPreferences(); $guids = explode(',', $request->input('id')); @@ -52,9 +55,11 @@ class CartController extends BasePageController } /** + * @param array|string $id + * @return \Illuminate\Http\RedirectResponse * @throws \Exception */ - public function destroy(array|string $id): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function destroy(array|string $id): RedirectResponse { $this->setPreferences(); $ids = null; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 25ca6d369..ec3b1c50b 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -11,18 +11,19 @@ use Illuminate\Support\Arr; class ConsoleController extends BasePageController { /** + * @param \Illuminate\Http\Request $request + * @param string $id * @return void - * * @throws \Exception */ - public function show(Request $request, string $id = '') + public function show(Request $request, string $id = ''): void { $this->setPreferences(); if ($id === 'WiiVare') { $id = 'WiiVareVC'; } - $console = new Console(['Settings' => $this->settings]); - $gen = new Genres(['Settings' => $this->settings]); + $console = new Console(); + $gen = new Genres(); $concats = Category::getChildren(Category::GAME_ROOT); $ctmp = []; diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index eaf26c4af..694dfd88e 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -8,9 +8,11 @@ use App\Jobs\SendContactUsEmail; class ContactUsController extends BasePageController { /** + * @param \App\Http\Requests\ContactContactURequest $request + * @return null * @throws \Illuminate\Validation\ValidationException */ - public function contact(ContactContactURequest $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|null + public function contact(ContactContactURequest $request) { $this->setPreferences(); @@ -43,9 +45,11 @@ class ContactUsController extends BasePageController } /** + * @param string $msg + * @return void * @throws \Exception */ - public function showContactForm(string $msg = ''): void + public function showContactForm(string $msg = '') { $this->setPreferences(); $title = 'Contact '.config('app.name'); diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 803b36fec..9e731af97 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -26,9 +26,10 @@ use Illuminate\Http\Request; class DetailsController extends BasePageController { /** + * @param \Illuminate\Http\Request $request + * @param string $guid * @return \Illuminate\Http\RedirectResponse|void - * - * @throws \Exception + * @throws \GuzzleHttp\Exception\GuzzleException */ public function show(Request $request, string $guid) { diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php index 91bb51e7f..f10c6201f 100644 --- a/app/Http/Controllers/FailedReleasesController.php +++ b/app/Http/Controllers/FailedReleasesController.php @@ -4,14 +4,18 @@ namespace App\Http\Controllers; use App\Models\Release; use App\Models\User; +use Illuminate\Contracts\Routing\ResponseFactory; +use Illuminate\Foundation\Application; use Illuminate\Http\Request; +use Illuminate\Http\Response; class FailedReleasesController extends BasePageController { /** - * @throws \Exception + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Foundation\Application|\Illuminate\Http\Response */ - public function failed(Request $request): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Contracts\Foundation\Application|\Illuminate\Http\Response + public function failed(Request $request): Application|Response|\Illuminate\Contracts\Foundation\Application|ResponseFactory { 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/ForumController.php b/app/Http/Controllers/ForumController.php index 15a56fa78..acb0b5c45 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -65,11 +65,12 @@ class ForumController extends BasePageController } /** - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void - * + * @param $id + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void * @throws \Exception */ - public function getPosts($id, Request $request): RedirectResponse + public function getPosts($id, Request $request) { $this->setPreferences(); @@ -104,7 +105,11 @@ class ForumController extends BasePageController $this->pagerender(); } - public function deleteTopic(Request $request): \Illuminate\Routing\Redirector|RedirectResponse|\Illuminate\Contracts\Foundation\Application + /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse + */ + public function deleteTopic(Request $request): RedirectResponse { $id = $request->input('id') + 0; diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index df5b3c28a..b12ce9405 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -125,9 +125,10 @@ class MovieController extends BasePageController } /** - * @throws \Exception + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|void */ - public function showTrailer(Request $request): \Illuminate\Http\JsonResponse + public function showTrailer(Request $request) { $movie = new Movie; diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index f9c85dad7..5906aac18 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -12,8 +12,8 @@ use Illuminate\Http\Request; class MyMoviesController extends BasePageController { /** + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|void - * * @throws \Exception */ public function show(Request $request) diff --git a/app/Http/Controllers/NfoController.php b/app/Http/Controllers/NfoController.php index 1f8ded980..e7398c97c 100644 --- a/app/Http/Controllers/NfoController.php +++ b/app/Http/Controllers/NfoController.php @@ -10,6 +10,9 @@ use Illuminate\Http\Request; class NfoController extends BasePageController { /** + * @param \Illuminate\Http\Request $request + * @param string $id + * @return void * @throws \Exception */ public function showNfo(Request $request, string $id = ''): void diff --git a/app/Http/Controllers/PasswordSecurityController.php b/app/Http/Controllers/PasswordSecurityController.php index cb04f5585..6153acb22 100644 --- a/app/Http/Controllers/PasswordSecurityController.php +++ b/app/Http/Controllers/PasswordSecurityController.php @@ -4,12 +4,20 @@ namespace App\Http\Controllers; use App\Http\Requests\Disable2faPasswordSecurityRequest; use App\Models\PasswordSecurity; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Foundation\Application; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; class PasswordSecurityController extends Controller { - public function show2faForm(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Contracts\Foundation\Application + /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application + */ + public function show2faForm(Request $request): Application|View|Factory|\Illuminate\Contracts\Foundation\Application { $user = $request->user(); @@ -30,11 +38,13 @@ class PasswordSecurityController extends Controller } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException */ - public function generate2faSecret(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function generate2faSecret(Request $request): RedirectResponse { $user = $request->user(); @@ -51,11 +61,13 @@ class PasswordSecurityController extends Controller } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException */ - public function enable2fa(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function enable2fa(Request $request): RedirectResponse { $user = $request->user(); $secret = $request->input('verify-code'); @@ -70,7 +82,7 @@ class PasswordSecurityController extends Controller return redirect()->to('2fa')->with('error', 'Invalid Verification Code, Please try again.'); } - public function disable2fa(Disable2faPasswordSecurityRequest $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function disable2fa(Disable2faPasswordSecurityRequest $request): \Illuminate\Routing\Redirector|RedirectResponse|\Illuminate\Contracts\Foundation\Application { if (! (Hash::check($request->get('current-password'), $request->user()->password))) { // The passwords matches diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index f2e2d5dda..cd89c8b7a 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -9,6 +9,9 @@ use App\Models\User; use App\Models\UserDownload; use App\Models\UserRequest; use Blacklight\utility\Utility; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Foundation\Application; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; @@ -19,9 +22,11 @@ use Jrean\UserVerification\Facades\UserVerification; class ProfileController extends BasePageController { /** + * @param \Illuminate\Http\Request $request + * @return void * @throws \Throwable */ - public function show(Request $request) + public function show(Request $request): void { $this->setPreferences(); @@ -100,9 +105,9 @@ class ProfileController extends BasePageController } /** + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse|void - * - * @throws \Jrean\UserVerification\Exceptions\ModelNotCompliantException + * @throws \Exception */ public function edit(Request $request) { @@ -265,9 +270,11 @@ class ProfileController extends BasePageController } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application|\Illuminate\Http\RedirectResponse * @throws \Exception */ - public function destroy(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Routing\Redirector|\Illuminate\View\View|RedirectResponse + public function destroy(Request $request): Application|View|Factory|RedirectResponse|\Illuminate\Contracts\Foundation\Application { $this->setPreferences(); $userId = $request->input('id'); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 935912ec7..162358353 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -15,8 +15,8 @@ use Illuminate\Support\Carbon; class RssController extends BasePageController { /** - * @return JsonResponse|void - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|void * @throws \Throwable */ public function myMoviesRss(Request $request) @@ -40,13 +40,13 @@ class RssController extends BasePageController } /** - * @return JsonResponse|void - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|void * @throws \Throwable */ public function myShowsRss(Request $request) { - $rss = new RSS(['Settings' => $this->settings]); + $rss = new RSS(); $offset = 0; $user = $this->userCheck($request); if (is_object($user)) { @@ -61,13 +61,13 @@ class RssController extends BasePageController } /** - * @return JsonResponse|void - * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|void * @throws \Throwable */ public function fullFeedRss(Request $request) { - $rss = new RSS(['Settings' => $this->settings]); + $rss = new RSS(); $offset = 0; $user = $this->userCheck($request); if (is_object($user)) { @@ -88,12 +88,13 @@ class RssController extends BasePageController } /** + * @return void * @throws \Exception */ public function showRssDesc(): void { $this->setPreferences(); - $rss = new RSS(['Settings' => $this->settings]); + $rss = new RSS(); $title = 'Rss Info'; $meta_title = 'Rss Nzb Info'; @@ -132,12 +133,14 @@ class RssController extends BasePageController } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|array * @throws \Throwable */ public function cartRss(Request $request): JsonResponse|array { $this->setPreferences(); - $rss = new RSS(['Settings' => $this->settings]); + $rss = new RSS(); $offset = 0; $user = $this->userCheck($request); if (is_object($user)) { @@ -159,12 +162,14 @@ class RssController extends BasePageController } /** + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse|array * @throws \Throwable */ public function categoryFeedRss(Request $request): JsonResponse|array { $this->setPreferences(); - $rss = new RSS(['Settings' => $this->settings]); + $rss = new RSS(); $offset = 0; if ($request->missing('id')) { return response()->json(['error' => 'Category ID is missing'], '403'); @@ -190,6 +195,8 @@ class RssController extends BasePageController } /** + * @param \Illuminate\Http\Request $request + * @return array|\Illuminate\Http\JsonResponse * @throws \Throwable */ private function userCheck(Request $request): JsonResponse|array