Merge branch 'v5.0.x'

Author: Blair2004

app/Events/SettingsSavedEvent.php

@@ -16,7 +16,7 @@ class SettingsSavedEvent
      *
      * @return void
      */
-    public function __construct( public $options, public $inputs, public $class )
+    public function __construct(public $data, public $settingsClass )
     {
         // ...
     }

app/Services/SettingsPage.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Classes\Hook;
 use App\Events\SettingsSavedEvent;
 use App\Traits\NsForms;
 use Illuminate\Http\Request;
@@ -137,17 +138,23 @@ public function saveForm( Request $request )
         /**
          * @var Options
          */
-        $options = app()->make( Options::class );
+        $options = app()->make(Options::class);
+        $data = [];
+        $inputs = Hook::filter( SettingsPage::method( 'saveForm' ), $this->getPlainData($request) );
 
-        foreach ( $this->getPlainData( $request ) as $key => $value ) {
-            if ( empty( $value ) ) {
-                $options->delete( $key );
+        foreach ( $inputs as $key => $value) {
+            if ( $value === null ) {
+                $options->delete($key);
             } else {
-                $options->set( $key, $value );
+                $options->set($key, $value);
+                $data[ $key ] = $value;
             }
         }
 
-        event( new SettingsSavedEvent( $options->get(), $request->all(), get_class( $this ) ) );
+        event( new SettingsSavedEvent(
+            data: $data, 
+            settingsClass: get_class($this) 
+        ) );
 
         return [
             'status' => 'success',

composer.json

@@ -31,7 +31,8 @@
         "spatie/laravel-db-snapshots": "^2.2",
         "symfony/http-client": "^6.0",
         "symfony/mailgun-mailer": "^6.0",
-        "tormjens/eventy": "^0.8"
+        "tormjens/eventy": "^0.8",
+        "vlucas/phpdotenv": "^5.6"
     },
     "require-dev": {
         "laravel/pint": "^1.1.1",

composer.lock

@@ -20,7 +20,7 @@
     &.success {
         @apply border-success-tertiary bg-success-primary;
         h2, p {
-            @apply text-white;
+            @apply text-primary;
         }
     }
 }