From ad05688ac630907e4e32beb8a947d729bc56ea92 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 30 Mar 2023 21:48:07 +0200 Subject: [PATCH] CS fixes --- Blacklight/Books.php | 2 +- Blacklight/Music.php | 1 - Blacklight/NZBImport.php | 1 - Blacklight/Tmux.php | 1 - Blacklight/processing/Videos.php | 25 ------------------- .../Admin/AdminAnidbController.php | 2 +- .../Admin/AdminCategoryRegexesController.php | 2 +- .../Admin/AdminContentController.php | 4 +-- .../Admin/AdminGroupController.php | 2 +- .../Admin/AdminMovieController.php | 4 +-- .../Admin/AdminReleasesController.php | 4 +-- .../Controllers/Admin/AdminUserController.php | 8 +++--- app/Http/Controllers/Api/ApiV2Controller.php | 2 +- .../Auth/ForgotPasswordController.php | 3 +-- app/Http/Controllers/Auth/LoginController.php | 9 +++---- .../Controllers/Auth/RegisterController.php | 2 +- app/Http/Controllers/BasePageController.php | 4 +-- app/Http/Controllers/ContactUsController.php | 1 - app/Http/Controllers/ContentController.php | 3 +-- app/Http/Controllers/DetailsController.php | 4 +-- app/Http/Controllers/ForumController.php | 6 ++--- app/Http/Controllers/GetNzbController.php | 1 - .../PasswordSecurityController.php | 1 - app/Http/Controllers/ProfileController.php | 4 +-- app/Http/Middleware/Authenticate.php | 2 +- app/Http/Middleware/ClearanceMiddleware.php | 5 ++-- app/Http/Middleware/Google2FAMiddleware.php | 4 +-- .../Middleware/RedirectIfAuthenticated.php | 4 +-- .../Requests/Auth/RegisterRegisterRequest.php | 10 ++++---- ...owLinkRequestFormForgotPasswordRequest.php | 6 ++--- app/Http/Requests/ContactContactURequest.php | 6 ++--- .../Disable2faPasswordSecurityRequest.php | 4 +-- app/Jobs/SendAccountChangedEmail.php | 2 +- app/Jobs/SendAccountDeletedEmail.php | 2 +- app/Jobs/SendAccountExpiredEmail.php | 2 +- app/Jobs/SendNewRegisteredAccountMail.php | 2 +- app/Jobs/SendPasswordForgottenEmail.php | 2 +- app/Jobs/SendPasswordResetEmail.php | 2 +- app/Jobs/SendWelcomeEmail.php | 2 +- app/Mail/AccountDeleted.php | 1 - app/Models/AnidbInfo.php | 2 +- app/Models/PredbHash.php | 2 +- app/Models/Release.php | 9 +++---- app/Models/ReleaseComment.php | 2 +- app/Models/TvEpisode.php | 2 +- app/Models/UsenetGroup.php | 4 +-- app/Models/User.php | 7 +++--- app/Models/UserDownload.php | 2 +- app/Models/UserRequest.php | 2 +- app/Models/UserSerie.php | 2 +- app/Models/Video.php | 2 +- app/Models/VideoAlias.php | 2 +- tests/CreatesApplication.php | 2 +- 53 files changed, 77 insertions(+), 115 deletions(-) diff --git a/Blacklight/Books.php b/Blacklight/Books.php index abc579dde..642e820b1 100755 --- a/Blacklight/Books.php +++ b/Blacklight/Books.php @@ -2,7 +2,6 @@ namespace Blacklight; -use Illuminate\Database\Eloquent\Model; use App\Models\BookInfo; use App\Models\Category; use App\Models\Release; @@ -10,6 +9,7 @@ use App\Models\Settings; use DariusIII\ItunesApi\Exceptions\EbookNotFoundException; use DariusIII\ItunesApi\Exceptions\SearchNoResultsException; use DariusIII\ItunesApi\iTunes; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; diff --git a/Blacklight/Music.php b/Blacklight/Music.php index 063a60cc6..8ff872644 100755 --- a/Blacklight/Music.php +++ b/Blacklight/Music.php @@ -401,7 +401,6 @@ class Music } /** - * * @throws \Exception */ public function processMusicReleases(bool $local = false) diff --git a/Blacklight/NZBImport.php b/Blacklight/NZBImport.php index 96177548b..9bd3ac939 100755 --- a/Blacklight/NZBImport.php +++ b/Blacklight/NZBImport.php @@ -241,7 +241,6 @@ class NZBImport } /** - * * @throws \Exception */ protected function scanNZBFile(&$nzbXML, bool $useNzbName = false): bool diff --git a/Blacklight/Tmux.php b/Blacklight/Tmux.php index 6e99b131d..e742903c7 100755 --- a/Blacklight/Tmux.php +++ b/Blacklight/Tmux.php @@ -284,7 +284,6 @@ class Tmux } /** - * * @throws \Exception */ public function proc_query($qry, $bookreqids, string $db_name, string $ppmax = '', string $ppmin = ''): bool|string diff --git a/Blacklight/processing/Videos.php b/Blacklight/processing/Videos.php index 1e22c941b..6c3b1fde7 100755 --- a/Blacklight/processing/Videos.php +++ b/Blacklight/processing/Videos.php @@ -40,9 +40,6 @@ abstract class Videos protected const TYPE_ANIME = 2; // Type of video is a Anime - /** - * @var bool - */ public bool $echooutput; /** @@ -70,19 +67,12 @@ abstract class Videos /** * Main processing director function for scrapers * Calls work query function and initiates processing. - * - * @param int $groupID - * @param string $guidChar - * @param $process - * @param bool $local */ abstract protected function processSite(int $groupID, string $guidChar, int $process, bool $local = false): void; /** * Get video info from a Video ID and column. * - * @param string $siteColumn - * @param int $videoID * @return array|false False if invalid site, or ID not found; Site id value otherwise. */ protected function getSiteIDFromVideoID(string $siteColumn, int $videoID): bool|array @@ -99,7 +89,6 @@ abstract class Videos /** * Get TV show local timezone from a Video ID. * - * @param int $videoID * @return string Empty string if no query return or tz style timezone */ protected function getLocalZoneFromVideoID(int $videoID): string @@ -111,11 +100,6 @@ abstract class Videos /** * Get video info from a Site ID and column. - * - * - * @param string $siteColumn - * @param int $siteID - * @return bool|int */ protected function getVideoIDFromSiteID(string $siteColumn, int $siteID): bool|int { @@ -128,7 +112,6 @@ abstract class Videos } /** - * @param int $source * @return $this|array|bool|false|\Illuminate\Database\Eloquent\Model|mixed|null */ public function getByTitle(string $title, $type, int $source = 0): mixed @@ -199,10 +182,6 @@ abstract class Videos return false; } - /** - * @param int $source - * @return bool|\Illuminate\Database\Eloquent\Model|null|static - */ public function getTitleExact(string $title, int $type, int $source = 0): \Illuminate\Database\Eloquent\Model|bool|null|static { $return = false; @@ -236,7 +215,6 @@ abstract class Videos /** * Supplementary function for getByTitle that queries for a like match. * - * @param int $source * @return array|false */ public function getTitleLoose($title, $type, int $source = 0): bool|array @@ -276,9 +254,6 @@ abstract class Videos /** * Supplementary function for getByTitle that replaces special chars to find an exact match. * Add more ->whereRaw() methods if needed. Might slow TV PP down though. - * - * @param int $source - * @return bool|\Illuminate\Database\Eloquent\Model|null|static */ public function getAlternativeTitleExact(string $title, int $type, int $source = 0): \Illuminate\Database\Eloquent\Model|bool|null|static { diff --git a/app/Http/Controllers/Admin/AdminAnidbController.php b/app/Http/Controllers/Admin/AdminAnidbController.php index 7993cba85..acd2fc4e7 100644 --- a/app/Http/Controllers/Admin/AdminAnidbController.php +++ b/app/Http/Controllers/Admin/AdminAnidbController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\Request; use App\Http\Controllers\BasePageController; use App\Models\Release; use Blacklight\AniDB; +use Illuminate\Http\Request; class AdminAnidbController extends BasePageController { diff --git a/app/Http/Controllers/Admin/AdminCategoryRegexesController.php b/app/Http/Controllers/Admin/AdminCategoryRegexesController.php index fc02a6a0c..bb34870a6 100644 --- a/app/Http/Controllers/Admin/AdminCategoryRegexesController.php +++ b/app/Http/Controllers/Admin/AdminCategoryRegexesController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Models\Category; use Blacklight\Regexes; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminCategoryRegexesController extends BasePageController diff --git a/app/Http/Controllers/Admin/AdminContentController.php b/app/Http/Controllers/Admin/AdminContentController.php index bea646534..12f1f0cfc 100644 --- a/app/Http/Controllers/Admin/AdminContentController.php +++ b/app/Http/Controllers/Admin/AdminContentController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Models\User; use Blacklight\Contents; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminContentController extends BasePageController @@ -109,7 +109,7 @@ class AdminContentController extends BasePageController $this->adminrender(); } - public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function destroy(Request $request): \Illuminate\Routing\Redirector|RedirectResponse|\Illuminate\Contracts\Foundation\Application { if ($request->has('id')) { $contents = new Contents(); diff --git a/app/Http/Controllers/Admin/AdminGroupController.php b/app/Http/Controllers/Admin/AdminGroupController.php index 97b27303b..a4bf1f23a 100644 --- a/app/Http/Controllers/Admin/AdminGroupController.php +++ b/app/Http/Controllers/Admin/AdminGroupController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Models\UsenetGroup; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminGroupController extends BasePageController diff --git a/app/Http/Controllers/Admin/AdminMovieController.php b/app/Http/Controllers/Admin/AdminMovieController.php index 789abc7de..1824cf1b6 100644 --- a/app/Http/Controllers/Admin/AdminMovieController.php +++ b/app/Http/Controllers/Admin/AdminMovieController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Models\MovieInfo; use App\Models\Release; use Blacklight\Movie; use Blacklight\utility\Utility; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminMovieController extends BasePageController @@ -81,7 +81,7 @@ class AdminMovieController extends BasePageController /** * @throws \Exception */ - public function edit(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function edit(Request $request): \Illuminate\Routing\Redirector|RedirectResponse { $this->setAdminPrefs(); diff --git a/app/Http/Controllers/Admin/AdminReleasesController.php b/app/Http/Controllers/Admin/AdminReleasesController.php index cf70e7f24..70740e441 100644 --- a/app/Http/Controllers/Admin/AdminReleasesController.php +++ b/app/Http/Controllers/Admin/AdminReleasesController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Models\Category; use App\Models\Release; use Blacklight\Releases; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminReleasesController extends BasePageController @@ -90,7 +90,7 @@ class AdminReleasesController extends BasePageController /** * @throws \Exception */ - public function destroy($id): \Illuminate\Http\RedirectResponse + public function destroy($id): RedirectResponse { if ($id) { $releases = new Releases(); diff --git a/app/Http/Controllers/Admin/AdminUserController.php b/app/Http/Controllers/Admin/AdminUserController.php index 3fbdb8489..40b6bafa3 100644 --- a/app/Http/Controllers/Admin/AdminUserController.php +++ b/app/Http/Controllers/Admin/AdminUserController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\RedirectResponse; use App\Http\Controllers\BasePageController; use App\Jobs\SendAccountChangedEmail; use App\Models\Invitation; use App\Models\User; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Jrean\UserVerification\Facades\UserVerification; use Spatie\Permission\Models\Role; @@ -212,7 +212,7 @@ class AdminUserController extends BasePageController $this->adminrender(); } - public function destroy(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function destroy(Request $request): \Illuminate\Routing\Redirector|RedirectResponse|\Illuminate\Contracts\Foundation\Application { if ($request->has('id')) { $user = User::find($request->input('id')); @@ -232,7 +232,7 @@ class AdminUserController extends BasePageController /** * @throws \Jrean\UserVerification\Exceptions\ModelNotCompliantException */ - public function resendVerification(Request $request): \Illuminate\Http\RedirectResponse + public function resendVerification(Request $request): RedirectResponse { if ($request->has('id')) { $user = User::find($request->input('id')); @@ -246,7 +246,7 @@ class AdminUserController extends BasePageController return redirect()->back()->with('error', 'User is invalid'); } - public function verify(Request $request): \Illuminate\Http\RedirectResponse + public function verify(Request $request): RedirectResponse { if ($request->has('id')) { $user = User::find($request->input('id')); diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php index 66a8cd0d0..0a8551b1b 100644 --- a/app/Http/Controllers/Api/ApiV2Controller.php +++ b/app/Http/Controllers/Api/ApiV2Controller.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Api; -use Illuminate\Http\RedirectResponse; use App\Events\UserAccessedApi; use App\Http\Controllers\BasePageController; use App\Models\Category; @@ -17,6 +16,7 @@ use App\Transformers\DetailsTransformer; use Blacklight\Releases; use Blacklight\utility\Utility; use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Carbon; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index e208cc81f..c603de616 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -2,14 +2,13 @@ namespace App\Http\Controllers\Auth; -use App\Http\Requests\Auth\ShowLinkRequestFormForgotPasswordRequest; use App\Http\Controllers\Controller; +use App\Http\Requests\Auth\ShowLinkRequestFormForgotPasswordRequest; use App\Jobs\SendPasswordForgottenEmail; use App\Models\Settings; use App\Models\User; use DariusIII\Token\Facades\Token; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; -use Illuminate\Http\Request; class ForgotPasswordController extends Controller { diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a3c0bac2b..a5815b606 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,17 +2,16 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\RedirectResponse; -use App\Http\Requests\Auth\LoginLoginRequest; use App\Events\UserLoggedIn; use App\Http\Controllers\Controller; +use App\Http\Requests\Auth\LoginLoginRequest; use App\Models\Settings; use App\Models\User; use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Validator; class LoginController extends Controller @@ -50,7 +49,6 @@ class LoginController extends Controller } /** - * * @throws \Illuminate\Auth\AuthenticationException * @throws \Illuminate\Validation\ValidationException */ @@ -124,10 +122,11 @@ class LoginController extends Controller $meta_description = 'Login'; $content = app('smarty.view')->fetch($theme.'/login.tpl'); app('smarty.view')->assign(compact('content', 'meta_title', 'meta_keywords', 'meta_description')); + return app('smarty.view')->display($theme.'/basepage.tpl'); } - public function logout(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse + public function logout(Request $request): \Illuminate\Routing\Redirector|RedirectResponse { $this->guard()->logout(); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 5d0a1a945..d1bdf7ead 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Auth; -use App\Http\Requests\Auth\RegisterRegisterRequest; use App\Http\Controllers\Controller; +use App\Http\Requests\Auth\RegisterRegisterRequest; use App\Models\Invitation; use App\Models\Settings; use App\Models\User; diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 92155e4b9..833b4c5c5 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -2,17 +2,17 @@ namespace App\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\Request; use App\Events\UserLoggedIn; use App\Models\Category; use App\Models\Forumpost; use App\Models\Settings; use App\Models\User; use Blacklight\Contents; +use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; +use Illuminate\View\View; class BasePageController extends Controller { diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index 0f8de8606..eaf26c4af 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers; use App\Http\Requests\ContactContactURequest; use App\Jobs\SendContactUsEmail; -use Illuminate\Http\Request; class ContactUsController extends BasePageController { diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index cb03e6e85..3d6f04c2f 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -2,15 +2,14 @@ namespace App\Http\Controllers; -use Illuminate\Http\JsonResponse; use Blacklight\Contents; use Illuminate\Http\Request; class ContentController extends BasePageController { /** - * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\JsonResponse|void + * * @throws \Exception */ public function show(Request $request) diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index bb7e37e20..5bdd03046 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\Http\RedirectResponse; -use Illuminate\Http\Request; use App\Models\DnzbFailure; use App\Models\Predb; use App\Models\Release; @@ -23,6 +21,8 @@ use Blacklight\Music; use Blacklight\ReleaseExtra; use Blacklight\Releases; use Blacklight\XXX; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; class DetailsController extends BasePageController { diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 29896d65d..b27e3404d 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use Illuminate\Http\RedirectResponse; use App\Models\Forumpost; use App\Models\Settings; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -104,7 +104,7 @@ class ForumController extends BasePageController $this->pagerender(); } - public function deleteTopic(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application + public function deleteTopic(Request $request): \Illuminate\Routing\Redirector|RedirectResponse|\Illuminate\Contracts\Foundation\Application { $id = $request->input('id') + 0; @@ -152,7 +152,7 @@ class ForumController extends BasePageController /** * @throws \Exception */ - public function destroy($id): \Illuminate\Http\RedirectResponse + public function destroy($id): RedirectResponse { $this->setPreferences(); diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index 2c5776d1a..3f548e6dc 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -10,7 +10,6 @@ use Blacklight\NZB; use Blacklight\utility\Utility; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\File; use Symfony\Component\HttpFoundation\StreamedResponse; diff --git a/app/Http/Controllers/PasswordSecurityController.php b/app/Http/Controllers/PasswordSecurityController.php index 8f776a3da..cb04f5585 100644 --- a/app/Http/Controllers/PasswordSecurityController.php +++ b/app/Http/Controllers/PasswordSecurityController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers; use App\Http\Requests\Disable2faPasswordSecurityRequest; use App\Models\PasswordSecurity; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; class PasswordSecurityController extends Controller diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 84532da49..b1cf4872e 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use Illuminate\Http\RedirectResponse; use App\Jobs\SendAccountDeletedEmail; use App\Models\ReleaseComment; use App\Models\Settings; @@ -10,6 +9,7 @@ use App\Models\User; use App\Models\UserDownload; use App\Models\UserRequest; use Blacklight\utility\Utility; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Auth; @@ -267,7 +267,7 @@ class ProfileController extends BasePageController /** * @throws \Exception */ - public function destroy(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Routing\Redirector|\Illuminate\View\View|\Illuminate\Http\RedirectResponse + public function destroy(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Routing\Redirector|\Illuminate\View\View|RedirectResponse { $this->setPreferences(); $userId = $request->input('id'); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index eb0a808a0..9b131d0d9 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Illuminate\Http\Request; use Illuminate\Auth\Middleware\Authenticate as Middleware; +use Illuminate\Http\Request; class Authenticate extends Middleware { diff --git a/app/Http/Middleware/ClearanceMiddleware.php b/app/Http/Middleware/ClearanceMiddleware.php index 95a5be662..08390e1d1 100644 --- a/app/Http/Middleware/ClearanceMiddleware.php +++ b/app/Http/Middleware/ClearanceMiddleware.php @@ -2,10 +2,9 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use Closure; -use Illuminate\Support\Facades\Auth; +use Illuminate\Http\Request; +use Symfony\Component\HttpFoundation\Response; class ClearanceMiddleware { diff --git a/app/Http/Middleware/Google2FAMiddleware.php b/app/Http/Middleware/Google2FAMiddleware.php index 6addcd5b0..1d60f3a7f 100644 --- a/app/Http/Middleware/Google2FAMiddleware.php +++ b/app/Http/Middleware/Google2FAMiddleware.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use App\Support\Google2FAAuthenticator; use Closure; +use Illuminate\Http\Request; +use Symfony\Component\HttpFoundation\Response; class Google2FAMiddleware { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 746d05ec5..b9a79ce30 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; -use Symfony\Component\HttpFoundation\Response; -use Illuminate\Http\Request; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Symfony\Component\HttpFoundation\Response; class RedirectIfAuthenticated { diff --git a/app/Http/Requests/Auth/RegisterRegisterRequest.php b/app/Http/Requests/Auth/RegisterRegisterRequest.php index 7371a1715..9f308854a 100644 --- a/app/Http/Requests/Auth/RegisterRegisterRequest.php +++ b/app/Http/Requests/Auth/RegisterRegisterRequest.php @@ -12,10 +12,10 @@ class RegisterRegisterRequest extends FormRequest public function rules(): array { return [ -'g-recaptcha-response' => [ -'required', -'captcha', -], -]; + 'g-recaptcha-response' => [ + 'required', + 'captcha', + ], + ]; } } diff --git a/app/Http/Requests/Auth/ShowLinkRequestFormForgotPasswordRequest.php b/app/Http/Requests/Auth/ShowLinkRequestFormForgotPasswordRequest.php index 701265753..335a350fa 100644 --- a/app/Http/Requests/Auth/ShowLinkRequestFormForgotPasswordRequest.php +++ b/app/Http/Requests/Auth/ShowLinkRequestFormForgotPasswordRequest.php @@ -12,8 +12,8 @@ class ShowLinkRequestFormForgotPasswordRequest extends FormRequest public function rules(): array { return ['g-recaptcha-response' => [ - 'required', - 'captcha', - ],]; + 'required', + 'captcha', + ], ]; } } diff --git a/app/Http/Requests/ContactContactURequest.php b/app/Http/Requests/ContactContactURequest.php index 55711c8a9..1333f02bb 100644 --- a/app/Http/Requests/ContactContactURequest.php +++ b/app/Http/Requests/ContactContactURequest.php @@ -12,8 +12,8 @@ class ContactContactURequest extends FormRequest public function rules(): array { return ['g-recaptcha-response' => [ - 'required', - 'captcha', - ],]; + 'required', + 'captcha', + ], ]; } } diff --git a/app/Http/Requests/Disable2faPasswordSecurityRequest.php b/app/Http/Requests/Disable2faPasswordSecurityRequest.php index 90f3e6613..0016ffe89 100644 --- a/app/Http/Requests/Disable2faPasswordSecurityRequest.php +++ b/app/Http/Requests/Disable2faPasswordSecurityRequest.php @@ -12,7 +12,7 @@ class Disable2faPasswordSecurityRequest extends FormRequest public function rules(): array { return ['current-password' => [ - 'required', - ],]; + 'required', + ], ]; } } diff --git a/app/Jobs/SendAccountChangedEmail.php b/app/Jobs/SendAccountChangedEmail.php index a30fa8244..57eccd3ce 100644 --- a/app/Jobs/SendAccountChangedEmail.php +++ b/app/Jobs/SendAccountChangedEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\AccountChange; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendAccountDeletedEmail.php b/app/Jobs/SendAccountDeletedEmail.php index 3e06cdd31..f8fb6f039 100644 --- a/app/Jobs/SendAccountDeletedEmail.php +++ b/app/Jobs/SendAccountDeletedEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\AccountDeleted; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendAccountExpiredEmail.php b/app/Jobs/SendAccountExpiredEmail.php index 0be956984..4d0590e50 100644 --- a/app/Jobs/SendAccountExpiredEmail.php +++ b/app/Jobs/SendAccountExpiredEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\AccountExpired; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendNewRegisteredAccountMail.php b/app/Jobs/SendNewRegisteredAccountMail.php index 2ca73de2c..b1b43100b 100644 --- a/app/Jobs/SendNewRegisteredAccountMail.php +++ b/app/Jobs/SendNewRegisteredAccountMail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\NewAccountCreatedEmail; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendPasswordForgottenEmail.php b/app/Jobs/SendPasswordForgottenEmail.php index 7103e9cf4..364bf51a8 100644 --- a/app/Jobs/SendPasswordForgottenEmail.php +++ b/app/Jobs/SendPasswordForgottenEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\ForgottenPassword; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendPasswordResetEmail.php b/app/Jobs/SendPasswordResetEmail.php index f7f3f1f15..29f383479 100644 --- a/app/Jobs/SendPasswordResetEmail.php +++ b/app/Jobs/SendPasswordResetEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\PasswordReset; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/SendWelcomeEmail.php b/app/Jobs/SendWelcomeEmail.php index d3ca75db5..09780b1f9 100644 --- a/app/Jobs/SendWelcomeEmail.php +++ b/app/Jobs/SendWelcomeEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Models\User; use App\Mail\WelcomeEmail; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Mail/AccountDeleted.php b/app/Mail/AccountDeleted.php index 3b60680db..da5993307 100644 --- a/app/Mail/AccountDeleted.php +++ b/app/Mail/AccountDeleted.php @@ -36,7 +36,6 @@ class AccountDeleted extends Mailable } /** - * * @throws \Exception */ public function build(): static diff --git a/app/Models/AnidbInfo.php b/app/Models/AnidbInfo.php index 9465025cd..a384f0afa 100644 --- a/app/Models/AnidbInfo.php +++ b/app/Models/AnidbInfo.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\AnidbInfo. diff --git a/app/Models/PredbHash.php b/app/Models/PredbHash.php index 488795a97..c62afdfeb 100644 --- a/app/Models/PredbHash.php +++ b/app/Models/PredbHash.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\PredbHash. diff --git a/app/Models/Release.php b/app/Models/Release.php index ad3b2ed95..36a03a9f3 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -2,15 +2,15 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasOne; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Blacklight\ElasticSearchSiteSearch; use Blacklight\ManticoreSearch; use Blacklight\NZB; +use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -309,7 +309,6 @@ class Release extends Model } /** - * * @throws \Exception */ public static function updateGrab(string $guid): void diff --git a/app/Models/ReleaseComment.php b/app/Models/ReleaseComment.php index 230deb1ef..12ac67a9d 100644 --- a/app/Models/ReleaseComment.php +++ b/app/Models/ReleaseComment.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\ReleaseComment. diff --git a/app/Models/TvEpisode.php b/app/Models/TvEpisode.php index 0d4012dc9..5a8a86bf2 100644 --- a/app/Models/TvEpisode.php +++ b/app/Models/TvEpisode.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; /** * App\Models\TvEpisode. diff --git a/app/Models/UsenetGroup.php b/app/Models/UsenetGroup.php index 0d3bcd42b..d0ec99cdd 100644 --- a/app/Models/UsenetGroup.php +++ b/app/Models/UsenetGroup.php @@ -2,14 +2,14 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Blacklight\ColorCLI; use Blacklight\NNTP; use Blacklight\NZB; use Blacklight\ReleaseImage; use Blacklight\Releases; +use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Facades\DB; /** diff --git a/app/Models/User.php b/app/Models/User.php index 408bbc241..9e067249d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,17 +2,17 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Collection; use App\Jobs\SendAccountExpiredEmail; use App\Jobs\SendAccountWillExpireEmail; use App\Jobs\SendInviteEmail; use Carbon\CarbonImmutable; use DariusIII\Token\Facades\Token; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Http\Request; @@ -368,7 +368,6 @@ class User extends Authenticatable } /** - * * @throws \Throwable */ public static function getRange($start, $offset, $orderBy, string $userName = '', ?string $email = '', ?string $host = '', ?string $role = '', bool $apiRequests = false): Collection diff --git a/app/Models/UserDownload.php b/app/Models/UserDownload.php index d9fa87d58..6494a2ee7 100644 --- a/app/Models/UserDownload.php +++ b/app/Models/UserDownload.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\UserDownload. diff --git a/app/Models/UserRequest.php b/app/Models/UserRequest.php index d9651ea7b..7cd2e6baf 100644 --- a/app/Models/UserRequest.php +++ b/app/Models/UserRequest.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Support\Facades\DB; /** diff --git a/app/Models/UserSerie.php b/app/Models/UserSerie.php index 14aae0509..90daa6544 100644 --- a/app/Models/UserSerie.php +++ b/app/Models/UserSerie.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\UserSerie. diff --git a/app/Models/Video.php b/app/Models/Video.php index 2f88a5f58..fe1855a2f 100644 --- a/app/Models/Video.php +++ b/app/Models/Video.php @@ -2,9 +2,9 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; /** * App\Models\Video. diff --git a/app/Models/VideoAlias.php b/app/Models/VideoAlias.php index d7de9e59b..5eddeb9d7 100644 --- a/app/Models/VideoAlias.php +++ b/app/Models/VideoAlias.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * App\Models\VideoAlias. diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index 9b7cfa6a5..cc6830112 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -2,8 +2,8 @@ namespace Tests; -use Illuminate\Foundation\Application; use Illuminate\Contracts\Console\Kernel; +use Illuminate\Foundation\Application; trait CreatesApplication {