🆙 More fixes 🆙

This commit is contained in:
Remco
2026-01-19 21:34:31 +01:00
parent 1e51ca4bd8
commit ccbd61d8f2
5 changed files with 13 additions and 3 deletions
@@ -13,7 +13,7 @@ class PasswordSettingsFormRequest extends FormRequest
use PasswordValidationRules; use PasswordValidationRules;
/** /**
* @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule>> * @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\InvokableRule|\Illuminate\Contracts\Validation\Rule>>
*/ */
public function rules(): array public function rules(): array
{ {
@@ -4,12 +4,16 @@ namespace App\Http\Requests;
use App\Rules\GoogleRecaptchaRule; use App\Rules\GoogleRecaptchaRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile; use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
class RegisterFormRequest extends FormRequest class RegisterFormRequest extends FormRequest
{ {
protected $errorBag = 'register'; protected $errorBag = 'register';
/**
* @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\InvokableRule|\Illuminate\Contracts\Validation\Rule>>
*/
public function rules(): array public function rules(): array
{ {
return [ return [
@@ -8,6 +8,9 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
class ShopVoucherFormRequest extends FormRequest class ShopVoucherFormRequest extends FormRequest
{ {
/**
* @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\InvokableRule|\Illuminate\Contracts\Validation\Rule>>
*/
public function rules(): array public function rules(): array
{ {
return [ return [
@@ -8,6 +8,9 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
class StaffApplicationFormRequest extends FormRequest class StaffApplicationFormRequest extends FormRequest
{ {
/**
* @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule>>
*/
public function rules(): array public function rules(): array
{ {
return [ return [
@@ -49,11 +49,11 @@ class WebsiteDrawBadgeObserver
try { try {
$filePath = DB::table('website_settings')->where('key', 'nitro_external_texts_file')->value('value'); $filePath = DB::table('website_settings')->where('key', 'nitro_external_texts_file')->value('value');
if (! $filePath) { if (! is_string($filePath) || $filePath === '') {
return; return;
} }
$filePath = str_replace(['../', '..\\'], '', $filePath); $filePath = str_replace(['../', '..\\'], '', (string) $filePath);
if (! file_exists($filePath) || ! is_file($filePath) || ! is_writable($filePath)) { if (! file_exists($filePath) || ! is_file($filePath) || ! is_writable($filePath)) {
return; return;