diff --git a/app/Http/Requests/Api/Remote/ReportBackupCompleteRequest.php b/app/Http/Requests/Api/Remote/ReportBackupCompleteRequest.php index d0ba0a241..b25c88edb 100644 --- a/app/Http/Requests/Api/Remote/ReportBackupCompleteRequest.php +++ b/app/Http/Requests/Api/Remote/ReportBackupCompleteRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requests\Api\Remote; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class ReportBackupCompleteRequest extends FormRequest { @@ -17,17 +18,17 @@ class ReportBackupCompleteRequest extends FormRequest 'checksum' => [ 'nullable', 'string', - 'required_if:successful,true', + Rule::requiredIf(fn () => $this->boolean('successful')), ], 'checksum_type' => [ 'nullable', 'string', - 'required_if:successful,true', + Rule::requiredIf(fn () => $this->boolean('successful')), ], 'size' => [ 'nullable', 'numeric', - 'required_if:successful,true', + Rule::requiredIf(fn () => $this->boolean('successful')), ], 'parts' => [ 'nullable', diff --git a/app/Http/Requests/Api/Remote/SftpAuthenticationFormRequest.php b/app/Http/Requests/Api/Remote/SftpAuthenticationFormRequest.php index d2fb47e48..c02532c96 100644 --- a/app/Http/Requests/Api/Remote/SftpAuthenticationFormRequest.php +++ b/app/Http/Requests/Api/Remote/SftpAuthenticationFormRequest.php @@ -3,6 +3,7 @@ namespace App\Http\Requests\Api\Remote; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class SftpAuthenticationFormRequest extends FormRequest { @@ -22,7 +23,10 @@ class SftpAuthenticationFormRequest extends FormRequest public function rules(): array { return [ - 'type' => ['nullable', 'in:password,public_key'], + 'type' => [ + 'nullable', + Rule::in(['password', 'public_key']), + ], 'username' => ['required', 'string'], 'password' => ['required', 'string'], ];