From ccbd61d8f22548981a0e8c64024ff4e8d37f91cf Mon Sep 17 00:00:00 2001
From: Remco <Remcojandijkstra@ziggo.nl>
Date: Mon, 19 Jan 2026 21:34:31 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20More=20fixes=20=F0=9F=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php | 2 +-
 Updated_Cms/app/Http/Requests/RegisterFormRequest.php         | 4 ++++
 Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php      | 3 +++
 Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php | 3 +++
 Updated_Cms/app/Observers/WebsiteDrawBadgeObserver.php        | 4 ++--
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php b/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php
index 948d1d74e9..0bbf56fb13 100644
--- a/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php
+++ b/Updated_Cms/app/Http/Requests/PasswordSettingsFormRequest.php
@@ -13,7 +13,7 @@ class PasswordSettingsFormRequest extends FormRequest
     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
     {
diff --git a/Updated_Cms/app/Http/Requests/RegisterFormRequest.php b/Updated_Cms/app/Http/Requests/RegisterFormRequest.php
index 1dae173c81..f9e8df7b26 100644
--- a/Updated_Cms/app/Http/Requests/RegisterFormRequest.php
+++ b/Updated_Cms/app/Http/Requests/RegisterFormRequest.php
@@ -4,12 +4,16 @@ namespace App\Http\Requests;
 
 use App\Rules\GoogleRecaptchaRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 
 class RegisterFormRequest extends FormRequest
 {
     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
     {
         return [
diff --git a/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php b/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php
index 179d67700e..5b766de29d 100644
--- a/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php
+++ b/Updated_Cms/app/Http/Requests/ShopVoucherFormRequest.php
@@ -8,6 +8,9 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 
 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
     {
         return [
diff --git a/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php b/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php
index c5c1a80d96..4cb1e70a0c 100644
--- a/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php
+++ b/Updated_Cms/app/Http/Requests/StaffApplicationFormRequest.php
@@ -8,6 +8,9 @@ use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 
 class StaffApplicationFormRequest extends FormRequest
 {
+    /**
+     * @return array<string, array<int, string|\Illuminate\Contracts\Validation\ValidationRule>>
+     */
     public function rules(): array
     {
         return [
diff --git a/Updated_Cms/app/Observers/WebsiteDrawBadgeObserver.php b/Updated_Cms/app/Observers/WebsiteDrawBadgeObserver.php
index b37f537324..59e2e26148 100644
--- a/Updated_Cms/app/Observers/WebsiteDrawBadgeObserver.php
+++ b/Updated_Cms/app/Observers/WebsiteDrawBadgeObserver.php
@@ -49,11 +49,11 @@ class WebsiteDrawBadgeObserver
         try {
             $filePath = DB::table('website_settings')->where('key', 'nitro_external_texts_file')->value('value');
 
-            if (! $filePath) {
+            if (! is_string($filePath) || $filePath === '') {
                 return;
             }
 
-            $filePath = str_replace(['../', '..\\'], '', $filePath);
+            $filePath = str_replace(['../', '..\\'], '', (string) $filePath);
 
             if (! file_exists($filePath) || ! is_file($filePath) || ! is_writable($filePath)) {
                 return;