From b8d0cb07455ef9252de301e53edb9a57a0e58f49 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sun, 17 Mar 2024 13:49:19 -0400 Subject: [PATCH] Styling --- app/Http/Controllers/Admin/ApiController.php | 1 - app/Http/Controllers/Admin/DatabaseController.php | 1 - app/Http/Controllers/Admin/Servers/CreateServerController.php | 1 - app/Http/Controllers/Admin/Settings/AdvancedController.php | 1 - app/Http/Controllers/Admin/Settings/IndexController.php | 1 - app/Http/Controllers/Admin/Settings/MailController.php | 1 - .../Controllers/Api/Remote/Servers/ServerDetailsController.php | 1 - app/Http/Middleware/RequireTwoFactorAuthentication.php | 1 - app/Http/Requests/Admin/MountFormRequest.php | 1 + phpstan.neon | 2 +- 10 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Admin/ApiController.php b/app/Http/Controllers/Admin/ApiController.php index f0b2adc36..e74dcc991 100644 --- a/app/Http/Controllers/Admin/ApiController.php +++ b/app/Http/Controllers/Admin/ApiController.php @@ -9,7 +9,6 @@ use App\Models\ApiKey; use Illuminate\Http\RedirectResponse; use Prologue\Alerts\AlertsMessageBag; use App\Services\Acl\Api\AdminAcl; -use Illuminate\View\Factory as ViewFactory; use App\Http\Controllers\Controller; use App\Services\Api\KeyCreationService; use App\Http\Requests\Admin\Api\StoreApplicationApiKeyRequest; diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php index bacbff0a1..c4f1e589e 100644 --- a/app/Http/Controllers/Admin/DatabaseController.php +++ b/app/Http/Controllers/Admin/DatabaseController.php @@ -7,7 +7,6 @@ use Illuminate\View\View; use App\Models\DatabaseHost; use Illuminate\Http\RedirectResponse; use Prologue\Alerts\AlertsMessageBag; -use Illuminate\View\Factory as ViewFactory; use App\Http\Controllers\Controller; use App\Services\Databases\Hosts\HostUpdateService; use App\Http\Requests\Admin\DatabaseHostFormRequest; diff --git a/app/Http/Controllers/Admin/Servers/CreateServerController.php b/app/Http/Controllers/Admin/Servers/CreateServerController.php index cd555d5e3..c525041cb 100644 --- a/app/Http/Controllers/Admin/Servers/CreateServerController.php +++ b/app/Http/Controllers/Admin/Servers/CreateServerController.php @@ -7,7 +7,6 @@ use Illuminate\View\View; use App\Models\Node; use Illuminate\Http\RedirectResponse; use Prologue\Alerts\AlertsMessageBag; -use Illuminate\View\Factory as ViewFactory; use App\Http\Controllers\Controller; use App\Http\Requests\Admin\ServerFormRequest; use App\Services\Servers\ServerCreationService; diff --git a/app/Http/Controllers/Admin/Settings/AdvancedController.php b/app/Http/Controllers/Admin/Settings/AdvancedController.php index 534392dc1..14b9e9a67 100644 --- a/app/Http/Controllers/Admin/Settings/AdvancedController.php +++ b/app/Http/Controllers/Admin/Settings/AdvancedController.php @@ -7,7 +7,6 @@ use Illuminate\View\View; use Illuminate\Http\RedirectResponse; use Prologue\Alerts\AlertsMessageBag; use Illuminate\Contracts\Console\Kernel; -use Illuminate\View\Factory as ViewFactory; use App\Http\Controllers\Controller; use Illuminate\Contracts\Config\Repository as ConfigRepository; use App\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest; diff --git a/app/Http/Controllers/Admin/Settings/IndexController.php b/app/Http/Controllers/Admin/Settings/IndexController.php index 4bb3bbdee..4408ebffd 100644 --- a/app/Http/Controllers/Admin/Settings/IndexController.php +++ b/app/Http/Controllers/Admin/Settings/IndexController.php @@ -7,7 +7,6 @@ use Illuminate\View\View; use Illuminate\Http\RedirectResponse; use Prologue\Alerts\AlertsMessageBag; use Illuminate\Contracts\Console\Kernel; -use Illuminate\View\Factory as ViewFactory; use App\Http\Controllers\Controller; use App\Traits\Helpers\AvailableLanguages; use App\Services\Helpers\SoftwareVersionService; diff --git a/app/Http/Controllers/Admin/Settings/MailController.php b/app/Http/Controllers/Admin/Settings/MailController.php index c4addcf1b..553fa14c2 100644 --- a/app/Http/Controllers/Admin/Settings/MailController.php +++ b/app/Http/Controllers/Admin/Settings/MailController.php @@ -8,7 +8,6 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Contracts\Console\Kernel; use App\Notifications\MailTested; -use Illuminate\View\Factory as ViewFactory; use Illuminate\Support\Facades\Notification; use App\Exceptions\DisplayException; use App\Http\Controllers\Controller; diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php index 5e0f6ea17..385f34e4e 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Api\Remote\Servers; -use App\Models\ActivityLogSubject; use App\Models\Backup; use Illuminate\Http\Request; use App\Models\Server; diff --git a/app/Http/Middleware/RequireTwoFactorAuthentication.php b/app/Http/Middleware/RequireTwoFactorAuthentication.php index 68174f0fe..ac1f4a1e2 100644 --- a/app/Http/Middleware/RequireTwoFactorAuthentication.php +++ b/app/Http/Middleware/RequireTwoFactorAuthentication.php @@ -44,7 +44,6 @@ class RequireTwoFactorAuthentication } /** @var \App\Models\User $user */ - $level = (int) config('panel.auth.2fa_required'); // If this setting is not configured, or the user is already using 2FA then we can just // send them right through, nothing else needs to be checked. diff --git a/app/Http/Requests/Admin/MountFormRequest.php b/app/Http/Requests/Admin/MountFormRequest.php index abe78f5b7..f88b1b396 100644 --- a/app/Http/Requests/Admin/MountFormRequest.php +++ b/app/Http/Requests/Admin/MountFormRequest.php @@ -14,6 +14,7 @@ class MountFormRequest extends AdminFormRequest if ($this->method() === 'PATCH') { /** @var Mount $mount */ $mount = $this->route()->parameter('mount'); + return Mount::getRulesForUpdate($mount->id); } diff --git a/phpstan.neon b/phpstan.neon index 58b6c8e91..94fd76e50 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,7 +7,7 @@ parameters: - app/ # Level 9 is the highest level - level: 5 + level: 6 ignoreErrors: # Prologue\Alerts defines its methods from its configuration file dynamically