diff --git a/app/Console/Commands/Environment/EmailSettingsCommand.php b/app/Console/Commands/Environment/EmailSettingsCommand.php index 87c8186c1..23061bf04 100644 --- a/app/Console/Commands/Environment/EmailSettingsCommand.php +++ b/app/Console/Commands/Environment/EmailSettingsCommand.php @@ -70,7 +70,7 @@ class EmailSettingsCommand extends Command /** * Handle variables for SMTP driver. */ - private function setupSmtpDriverVariables() + private function setupSmtpDriverVariables(): void { $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask( trans('command/messages.environment.mail.ask_smtp_host'), @@ -101,7 +101,7 @@ class EmailSettingsCommand extends Command /** * Handle variables for mailgun driver. */ - private function setupMailgunDriverVariables() + private function setupMailgunDriverVariables(): void { $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask( trans('command/messages.environment.mail.ask_mailgun_domain'), @@ -122,7 +122,7 @@ class EmailSettingsCommand extends Command /** * Handle variables for mandrill driver. */ - private function setupMandrillDriverVariables() + private function setupMandrillDriverVariables(): void { $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask( trans('command/messages.environment.mail.ask_mandrill_secret'), @@ -133,7 +133,7 @@ class EmailSettingsCommand extends Command /** * Handle variables for postmark driver. */ - private function setupPostmarkDriverVariables() + private function setupPostmarkDriverVariables(): void { $this->variables['MAIL_DRIVER'] = 'smtp'; $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com'; diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php index d1d71ae02..c11ade6c3 100644 --- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php +++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php @@ -51,7 +51,7 @@ class ProcessRunnableCommand extends Command * never throw an exception out, otherwise you'll end up killing the entire run group causing * any other schedules to not process correctly. */ - protected function processSchedule(Schedule $schedule) + protected function processSchedule(Schedule $schedule): void { if ($schedule->tasks->isEmpty()) { return; diff --git a/app/Console/Commands/UpgradeCommand.php b/app/Console/Commands/UpgradeCommand.php index 75a3c185f..145e6e0c6 100644 --- a/app/Console/Commands/UpgradeCommand.php +++ b/app/Console/Commands/UpgradeCommand.php @@ -178,7 +178,7 @@ class UpgradeCommand extends Command $this->info(__('commands.upgrade.success')); } - protected function withProgress(ProgressBar $bar, \Closure $callback) + protected function withProgress(ProgressBar $bar, \Closure $callback): void { $bar->clear(); $callback(); diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php index 6c44c356c..5dfe42a4a 100644 --- a/app/Exceptions/DisplayException.php +++ b/app/Exceptions/DisplayException.php @@ -4,6 +4,8 @@ namespace App\Exceptions; use Exception; use Filament\Notifications\Notification; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Psr\Log\LoggerInterface; use Illuminate\Http\Response; @@ -46,7 +48,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface * and then redirecting them back to the page that they came from. If the * request originated from an API hit, return the error in JSONAPI spec format. */ - public function render(Request $request) + public function render(Request $request): bool|RedirectResponse|JsonResponse { if ($request->is('livewire/update')) { Notification::make() @@ -55,7 +57,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface ->danger() ->send(); - return; + return false; } if ($request->expectsJson()) { @@ -73,10 +75,10 @@ class DisplayException extends PanelException implements HttpExceptionInterface * * @throws \Throwable */ - public function report() + public function report(): void { if (!$this->getPrevious() instanceof \Exception || !Handler::isReportable($this->getPrevious())) { - return null; + return; } try { @@ -85,6 +87,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface throw $this->getPrevious(); } - return $logger->{$this->getErrorLevel()}($this->getPrevious()); + $logger->{$this->getErrorLevel()}($this->getPrevious()); } } diff --git a/app/Extensions/Themes/Theme.php b/app/Extensions/Themes/Theme.php index 2badc3dcb..f6f55d8c8 100644 --- a/app/Extensions/Themes/Theme.php +++ b/app/Extensions/Themes/Theme.php @@ -4,17 +4,17 @@ namespace App\Extensions\Themes; class Theme { - public function js($path): string + public function js(string $path): string { return sprintf('' . PHP_EOL, $this->getUrl($path)); } - public function css($path): string + public function css(string $path): string { return sprintf('' . PHP_EOL, $this->getUrl($path)); } - protected function getUrl($path): string + protected function getUrl(string $path): string { return '/themes/panel/' . ltrim($path, '/'); } diff --git a/app/Filament/Pages/Installer/PanelInstaller.php b/app/Filament/Pages/Installer/PanelInstaller.php index 55da7add7..8a112a834 100644 --- a/app/Filament/Pages/Installer/PanelInstaller.php +++ b/app/Filament/Pages/Installer/PanelInstaller.php @@ -24,6 +24,7 @@ use Filament\Notifications\Notification; use Filament\Pages\SimplePage; use Filament\Support\Enums\MaxWidth; use Filament\Support\Exceptions\Halt; +use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Blade; use Illuminate\Support\HtmlString; @@ -37,7 +38,7 @@ class PanelInstaller extends SimplePage implements HasForms use EnvironmentWriterTrait; use InteractsWithForms; - public $data = []; + public array $data = []; protected static string $view = 'filament.pages.installer'; @@ -54,7 +55,7 @@ class PanelInstaller extends SimplePage implements HasForms return env('APP_INSTALLED', true); } - public function mount() + public function mount(): void { abort_if(self::isInstalled(), 404); @@ -93,7 +94,7 @@ class PanelInstaller extends SimplePage implements HasForms return 'data'; } - public function submit() + public function submit(): RedirectResponse { // Disable installer $this->writeToEnvironment(['APP_INSTALLED' => 'true']); diff --git a/app/Filament/Pages/Installer/Steps/DatabaseStep.php b/app/Filament/Pages/Installer/Steps/DatabaseStep.php index 5a0d6b736..04803352d 100644 --- a/app/Filament/Pages/Installer/Steps/DatabaseStep.php +++ b/app/Filament/Pages/Installer/Steps/DatabaseStep.php @@ -72,7 +72,7 @@ class DatabaseStep }); } - private static function testConnection(string $driver, $host, $port, $database, $username, $password): bool + private static function testConnection(string $driver, string $host, string $port, string $database, string $username, string $password): bool { if ($driver === 'sqlite') { return true; diff --git a/app/Filament/Pages/Installer/Steps/RedisStep.php b/app/Filament/Pages/Installer/Steps/RedisStep.php index 00ecb18af..d160e0b70 100644 --- a/app/Filament/Pages/Installer/Steps/RedisStep.php +++ b/app/Filament/Pages/Installer/Steps/RedisStep.php @@ -56,7 +56,7 @@ class RedisStep }); } - private static function testConnection($host, $port, $username, $password): bool + private static function testConnection(string $host, string $port, string $username, string $password): bool { try { config()->set('database.redis._panel_install_test', [ diff --git a/app/Filament/Resources/ApiKeyResource.php b/app/Filament/Resources/ApiKeyResource.php index ba2a851ca..daefee22b 100644 --- a/app/Filament/Resources/ApiKeyResource.php +++ b/app/Filament/Resources/ApiKeyResource.php @@ -5,6 +5,7 @@ namespace App\Filament\Resources; use App\Filament\Resources\ApiKeyResource\Pages; use App\Models\ApiKey; use Filament\Resources\Resource; +use Illuminate\Database\Eloquent\Model; class ApiKeyResource extends Resource { @@ -18,7 +19,7 @@ class ApiKeyResource extends Resource return static::getModel()::where('key_type', '2')->count() ?: null; } - public static function canEdit($record): bool + public static function canEdit(Model $record): bool { return false; } diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php index d3e07bcb9..e42e5e15e 100644 --- a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php +++ b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php @@ -4,6 +4,8 @@ namespace App\Filament\Resources\DatabaseHostResource\Pages; use App\Filament\Resources\DatabaseHostResource; use App\Services\Databases\Hosts\HostCreationService; +use Closure; +use Exception; use Filament\Forms; use Filament\Forms\Components\Section; use Filament\Forms\Components\Select; @@ -97,7 +99,7 @@ class CreateDatabaseHost extends CreateRecord return resolve(HostCreationService::class)->handle($data); } - public function exception($e, $stopPropagation): void + public function exception(Exception $e, Closure $stopPropagation): void { if ($e instanceof PDOException) { Notification::make() diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php b/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php index 862c33b8c..8951cff8b 100644 --- a/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php +++ b/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php @@ -6,6 +6,8 @@ use App\Filament\Resources\DatabaseHostResource; use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager; use App\Models\DatabaseHost; use App\Services\Databases\Hosts\HostUpdateService; +use Closure; +use Exception; use Filament\Actions; use Filament\Forms; use Filament\Forms\Components\Section; @@ -97,12 +99,16 @@ class EditDatabaseHost extends EditRecord ]; } - protected function handleRecordUpdate($record, array $data): Model + protected function handleRecordUpdate(Model $record, array $data): Model { - return resolve(HostUpdateService::class)->handle($record->id, $data); + if (! $record instanceof DatabaseHost) { + return $record; + } + + return resolve(HostUpdateService::class)->handle($record, $data); } - public function exception($e, $stopPropagation): void + public function exception(Exception $e, Closure $stopPropagation): void { if ($e instanceof PDOException) { Notification::make() diff --git a/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php b/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php index 4dfcdd955..bdd93d60d 100644 --- a/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php +++ b/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php @@ -8,6 +8,7 @@ use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\TextInput; use Filament\Forms\Form; use Filament\Forms\Get; +use Filament\Forms\Set; use Filament\Resources\RelationManagers\RelationManager; use Filament\Tables\Actions\DeleteAction; use Filament\Tables\Actions\ViewAction; @@ -60,7 +61,7 @@ class DatabasesRelationManager extends RelationManager ]); } - protected function rotatePassword(DatabasePasswordService $service, Database $database, $set, $get): void + protected function rotatePassword(DatabasePasswordService $service, Database $database, Set $set, Get $get): void { $newPassword = $service->handle($database); $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database'); diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php index e2c5f2c32..10d5d1062 100644 --- a/app/Filament/Resources/NodeResource/Pages/EditNode.php +++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php @@ -469,12 +469,12 @@ class EditNode extends EditRecord $this->fillForm(); } - protected function getColumnSpan() + protected function getColumnSpan(): ?int { return null; } - protected function getColumnStart() + protected function getColumnStart(): ?int { return null; } diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php index 51a59591d..be746d6c3 100644 --- a/app/Filament/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php @@ -813,7 +813,7 @@ class EditServer extends EditRecord ->all(); } - protected function rotatePassword(DatabasePasswordService $service, $record, $set, $get): void + protected function rotatePassword(DatabasePasswordService $service, Database $record, Set $set, Get $get): void { $newPassword = $service->handle($record); $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database'); diff --git a/app/Filament/Resources/UserResource/Pages/EditProfile.php b/app/Filament/Resources/UserResource/Pages/EditProfile.php index f5c5f5828..9b22e88ee 100644 --- a/app/Filament/Resources/UserResource/Pages/EditProfile.php +++ b/app/Filament/Resources/UserResource/Pages/EditProfile.php @@ -13,7 +13,9 @@ use chillerlan\QRCode\Common\EccLevel; use chillerlan\QRCode\Common\Version; use chillerlan\QRCode\QRCode; use chillerlan\QRCode\QROptions; +use Closure; use DateTimeZone; +use Exception; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Grid; use Filament\Forms\Components\Placeholder; @@ -274,8 +276,12 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile ]; } - protected function handleRecordUpdate($record, $data): Model + protected function handleRecordUpdate(Model $record, array $data): Model { + if (! $record instanceof User) { + return $record; + } + if ($token = $data['2facode'] ?? null) { /** @var ToggleTwoFactorService $service */ $service = resolve(ToggleTwoFactorService::class); @@ -298,7 +304,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile return parent::handleRecordUpdate($record, $data); } - public function exception($e, $stopPropagation): void + public function exception(Exception $e, Closure $stopPropagation): void { if ($e instanceof TwoFactorAuthenticationTokenInvalid) { Notification::make() diff --git a/app/Http/Controllers/Admin/ServersController.php b/app/Http/Controllers/Admin/ServersController.php index 9ddd9c7e6..9c7836e39 100644 --- a/app/Http/Controllers/Admin/ServersController.php +++ b/app/Http/Controllers/Admin/ServersController.php @@ -70,7 +70,7 @@ class ServersController extends Controller * @throws \App\Exceptions\DisplayException * @throws \App\Exceptions\Model\DataValidationException */ - public function toggleInstall(Server $server) + public function toggleInstall(Server $server): void { if ($server->status === ServerState::InstallFailed) { throw new DisplayException(trans('admin/server.exceptions.marked_as_failed')); @@ -84,8 +84,6 @@ class ServersController extends Controller ->body(trans('admin/server.alerts.install_toggled')) ->success() ->send(); - - return null; } /** @@ -94,7 +92,7 @@ class ServersController extends Controller * @throws \App\Exceptions\DisplayException * @throws \App\Exceptions\Model\DataValidationException */ - public function reinstallServer(Server $server) + public function reinstallServer(Server $server): void { $this->reinstallService->handle($server); diff --git a/app/Http/Controllers/Api/Application/ApplicationApiController.php b/app/Http/Controllers/Api/Application/ApplicationApiController.php index 174e6243a..87c721a74 100644 --- a/app/Http/Controllers/Api/Application/ApplicationApiController.php +++ b/app/Http/Controllers/Api/Application/ApplicationApiController.php @@ -40,7 +40,7 @@ abstract class ApplicationApiController extends Controller * Perform dependency injection of certain classes needed for core functionality * without littering the constructors of classes that extend this abstract. */ - public function loadDependencies(Fractal $fractal, Request $request) + public function loadDependencies(Fractal $fractal, Request $request): void { $this->fractal = $fractal; $this->request = $request; diff --git a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php index e07584d23..3b6badaa5 100644 --- a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php +++ b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php @@ -14,7 +14,7 @@ use App\Http\Requests\Api\Remote\ActivityEventRequest; class ActivityProcessingController extends Controller { - public function __invoke(ActivityEventRequest $request) + public function __invoke(ActivityEventRequest $request): void { $tz = Carbon::now()->getTimezone(); diff --git a/app/Http/Controllers/Auth/AbstractLoginController.php b/app/Http/Controllers/Auth/AbstractLoginController.php index e5b50d0ad..e62f9fab8 100644 --- a/app/Http/Controllers/Auth/AbstractLoginController.php +++ b/app/Http/Controllers/Auth/AbstractLoginController.php @@ -51,7 +51,7 @@ abstract class AbstractLoginController extends Controller * * @throws \App\Exceptions\DisplayException */ - protected function sendFailedLoginResponse(Request $request, Authenticatable $user = null, string $message = null) + protected function sendFailedLoginResponse(Request $request, Authenticatable $user = null, string $message = null): never { $this->incrementLoginAttempts($request); $this->fireFailedLoginEvent($user, [ @@ -99,7 +99,7 @@ abstract class AbstractLoginController extends Controller /** * Fire a failed login event. */ - protected function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = []) + protected function fireFailedLoginEvent(Authenticatable $user = null, array $credentials = []): void { Event::dispatch(new Failed('auth', $user, $credentials)); } diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 21ef4fee8..32a7049fc 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -16,7 +16,7 @@ class ForgotPasswordController extends Controller /** * Get the response for a failed password reset link. */ - protected function sendResetLinkFailedResponse(Request $request, $response): JsonResponse + protected function sendResetLinkFailedResponse(Request $request, string $response): JsonResponse { // As noted in #358 we will return success even if it failed // to avoid pointing out that an account does or does not @@ -31,7 +31,7 @@ class ForgotPasswordController extends Controller * * @param string $response */ - protected function sendResetLinkResponse(Request $request, $response): JsonResponse + protected function sendResetLinkResponse(Request $request, string $response): JsonResponse { return response()->json([ 'status' => trans($response), diff --git a/app/Http/Controllers/Auth/LoginCheckpointController.php b/app/Http/Controllers/Auth/LoginCheckpointController.php index 540aca5a0..8797f533b 100644 --- a/app/Http/Controllers/Auth/LoginCheckpointController.php +++ b/app/Http/Controllers/Auth/LoginCheckpointController.php @@ -72,7 +72,7 @@ class LoginCheckpointController extends AbstractLoginController } } - return $this->sendFailedLoginResponse($request, $user, !empty($recoveryToken) ? 'The recovery token provided is not valid.' : null); + $this->sendFailedLoginResponse($request, $user, !empty($recoveryToken) ? 'The recovery token provided is not valid.' : null); } /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 28c3c4f5e..ea2a59594 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -4,11 +4,13 @@ namespace App\Http\Controllers\Auth; use App\Filament\Pages\Installer\PanelInstaller; use Carbon\CarbonImmutable; +use Illuminate\Http\RedirectResponse; use Illuminate\Support\Str; use Illuminate\Http\Request; use App\Models\User; use Illuminate\Http\JsonResponse; use App\Facades\Activity; +use Illuminate\View\View; class LoginController extends AbstractLoginController { @@ -17,7 +19,7 @@ class LoginController extends AbstractLoginController * base authentication view component. React will take over at this point and * turn the login area into an SPA. */ - public function index() + public function index(): View|RedirectResponse { if (!PanelInstaller::isInstalled()) { return redirect('/installer'); diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index b4c338ee9..11dcc0346 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -69,7 +69,7 @@ class ResetPasswordController extends Controller * * @throws \App\Exceptions\Model\DataValidationException */ - protected function resetPassword($user, $password) + protected function resetPassword($user, $password): void { /** @var User $user */ $user->password = $this->hasher->make($password); diff --git a/app/Http/Middleware/EnsureStatefulRequests.php b/app/Http/Middleware/EnsureStatefulRequests.php index 66689fe11..35c1795cc 100644 --- a/app/Http/Middleware/EnsureStatefulRequests.php +++ b/app/Http/Middleware/EnsureStatefulRequests.php @@ -15,7 +15,7 @@ class EnsureStatefulRequests extends EnsureFrontendRequestsAreStateful * We don't want to support API usage using the cookies, except for requests stemming * from the front-end we control. */ - public static function fromFrontend($request) + public static function fromFrontend($request): bool { if (parent::fromFrontend($request)) { return true; diff --git a/app/Http/Requests/Admin/Egg/EggFormRequest.php b/app/Http/Requests/Admin/Egg/EggFormRequest.php index d1af8a085..aae5ae013 100644 --- a/app/Http/Requests/Admin/Egg/EggFormRequest.php +++ b/app/Http/Requests/Admin/Egg/EggFormRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requests\Admin\Egg; use App\Http\Requests\Admin\AdminFormRequest; +use Illuminate\Validation\Validator; class EggFormRequest extends AdminFormRequest { @@ -25,7 +26,7 @@ class EggFormRequest extends AdminFormRequest return $rules; } - public function withValidator($validator) + public function withValidator(Validator $validator): void { $validator->sometimes('config_from', 'exists:eggs,id', function () { return (int) $this->input('config_from') !== 0; diff --git a/app/Http/Requests/Api/Application/DatabaseHosts/UpdateDatabaseHostRequest.php b/app/Http/Requests/Api/Application/DatabaseHosts/UpdateDatabaseHostRequest.php index 111560bbf..83c74ac3b 100644 --- a/app/Http/Requests/Api/Application/DatabaseHosts/UpdateDatabaseHostRequest.php +++ b/app/Http/Requests/Api/Application/DatabaseHosts/UpdateDatabaseHostRequest.php @@ -11,6 +11,6 @@ class UpdateDatabaseHostRequest extends StoreDatabaseHostRequest /** @var DatabaseHost $databaseHost */ $databaseHost = $this->route()->parameter('database_host'); - return $rules ?? DatabaseHost::getRulesForUpdate($databaseHost->id); + return $rules ?? DatabaseHost::getRulesForUpdate($databaseHost); } } diff --git a/app/Http/Requests/Api/Application/Mounts/UpdateMountRequest.php b/app/Http/Requests/Api/Application/Mounts/UpdateMountRequest.php index 7f76ec420..e111553d4 100644 --- a/app/Http/Requests/Api/Application/Mounts/UpdateMountRequest.php +++ b/app/Http/Requests/Api/Application/Mounts/UpdateMountRequest.php @@ -14,6 +14,6 @@ class UpdateMountRequest extends StoreMountRequest /** @var Mount $mount */ $mount = $this->route()->parameter('mount'); - return Mount::getRulesForUpdate($mount->id); + return Mount::getRulesForUpdate($mount); } } diff --git a/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php b/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php index ab636dff0..a59039d99 100644 --- a/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php +++ b/app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php @@ -15,6 +15,6 @@ class UpdateNodeRequest extends StoreNodeRequest /** @var Node $node */ $node = $this->route()->parameter('node'); - return parent::rules(Node::getRulesForUpdate($node->id)); + return parent::rules(Node::getRulesForUpdate($node)); } } diff --git a/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php b/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php index ecccbdd5a..c7a919bee 100644 --- a/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php +++ b/app/Http/Requests/Api/Application/Users/UpdateUserRequest.php @@ -11,8 +11,8 @@ class UpdateUserRequest extends StoreUserRequest */ public function rules(array $rules = null): array { - $userId = $this->parameter('user', User::class)->id; + $user = $this->parameter('user', User::class); - return parent::rules(User::getRulesForUpdate($userId)); + return parent::rules(User::getRulesForUpdate($user)); } } diff --git a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php index bd68fb890..349db0616 100644 --- a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php +++ b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php @@ -49,7 +49,7 @@ abstract class SubuserRequest extends ClientApiRequest * * @throws \Illuminate\Contracts\Container\BindingResolutionException */ - protected function validatePermissionsCanBeAssigned(array $permissions) + protected function validatePermissionsCanBeAssigned(array $permissions): void { $user = $this->user(); /** @var \App\Models\Server $server */ diff --git a/app/Jobs/Schedule/RunTaskJob.php b/app/Jobs/Schedule/RunTaskJob.php index 6a660e5c0..167980ac9 100644 --- a/app/Jobs/Schedule/RunTaskJob.php +++ b/app/Jobs/Schedule/RunTaskJob.php @@ -90,7 +90,7 @@ class RunTaskJob extends Job implements ShouldQueue /** * Handle a failure while sending the action to the daemon or otherwise processing the job. */ - public function failed(\Exception $exception = null) + public function failed(\Exception $exception = null): void { $this->markTaskNotQueued(); $this->markScheduleComplete(); @@ -99,7 +99,7 @@ class RunTaskJob extends Job implements ShouldQueue /** * Get the next task in the schedule and queue it for running after the defined period of wait time. */ - private function queueNextTask() + private function queueNextTask(): void { /** @var \App\Models\Task|null $nextTask */ $nextTask = Task::query()->where('schedule_id', $this->task->schedule_id) @@ -121,7 +121,7 @@ class RunTaskJob extends Job implements ShouldQueue /** * Marks the parent schedule as being complete. */ - private function markScheduleComplete() + private function markScheduleComplete(): void { $this->task->schedule()->update([ 'is_processing' => false, @@ -132,7 +132,7 @@ class RunTaskJob extends Job implements ShouldQueue /** * Mark a specific task as no longer being queued. */ - private function markTaskNotQueued() + private function markTaskNotQueued(): void { $this->task->update(['is_queued' => false]); } diff --git a/app/Livewire/NodeSystemInformation.php b/app/Livewire/NodeSystemInformation.php index b29190251..54b4cd827 100644 --- a/app/Livewire/NodeSystemInformation.php +++ b/app/Livewire/NodeSystemInformation.php @@ -3,6 +3,7 @@ namespace App\Livewire; use App\Models\Node; +use Illuminate\View\View; use Livewire\Component; class NodeSystemInformation extends Component @@ -10,12 +11,12 @@ class NodeSystemInformation extends Component public Node $node; public string $sizeClasses; - public function render() + public function render(): View { return view('livewire.node-system-information'); } - public function placeholder() + public function placeholder(): string { return <<<'HTML'