From 1e10641dfde847e15249e186f1d4ad28d87c7ff2 Mon Sep 17 00:00:00 2001
From: Ryan Scherler <ryan@eastslope.studio>
Date: Sun, 5 Apr 2020 19:10:20 -0700
Subject: [PATCH] .

---
 config/filament.php                |  4 +---
 src/Contracts/Fieldset.php         | 17 +++++++++++++++++
 src/Fieldsets/UserEditFieldset.php |  2 +-
 src/Http/Livewire/UserEdit.php     | 11 +++--------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/config/filament.php b/config/filament.php
index 24f2b6bed4..860044f31c 100644
--- a/config/filament.php
+++ b/config/filament.php
@@ -36,7 +36,7 @@ return [
     */
 
     'namespaces' => [
-        'fieldsets' => ['App\\Fieldsets', 'Filament\\Fieldsets'],
+        'fieldsets' => ['App\\Filament\\Fieldsets', 'Filament\\Fieldsets'],
     ],
 
     /*
@@ -49,9 +49,7 @@ return [
     */
 
     'redirects' => [
-
         'admin' => 'filament.admin.dashboard', // string or named route to redirect users when successfully authenticated.
-
     ],
 
     /*
diff --git a/src/Contracts/Fieldset.php b/src/Contracts/Fieldset.php
index 3297aaf08d..aa1d6cbfd2 100644
--- a/src/Contracts/Fieldset.php
+++ b/src/Contracts/Fieldset.php
@@ -4,7 +4,24 @@ namespace Filament\Contracts;
 
 interface Fieldset
 {
+    /**
+     * The fieldset title.
+     * 
+     * @return string
+     */
     public static function title(): string;
 
+    /**
+     * The fieldset fields.
+     * 
+     * @return array
+     */
     public static function fields($model): array;
+
+    /**
+     * The rules to ignore in real time for the fieldset.
+     * 
+     * @return array
+     */
+    public static function rulesIgnoreRealtime(): array;
 }
\ No newline at end of file
diff --git a/src/Fieldsets/UserEditFieldset.php b/src/Fieldsets/UserEditFieldset.php
index 72d7f9cbd7..bbc890151a 100644
--- a/src/Fieldsets/UserEditFieldset.php
+++ b/src/Fieldsets/UserEditFieldset.php
@@ -67,7 +67,7 @@ class UserEditFieldset implements Fieldset
         ];
     }
 
-    public static function rulesIgnoreRealtime()
+    public static function rulesIgnoreRealtime(): array
     {
         return ['confirmed'];
     }
diff --git a/src/Http/Livewire/UserEdit.php b/src/Http/Livewire/UserEdit.php
index afdac7eeee..2171fef612 100644
--- a/src/Http/Livewire/UserEdit.php
+++ b/src/Http/Livewire/UserEdit.php
@@ -5,15 +5,15 @@ namespace Filament\Http\Livewire;
 use Filament\Support\Livewire\FormComponent;
 
 class UserEdit extends FormComponent
-{
+{    
     public function fields()
     {
-        return $this->fieldset()::fields($this->model);
+        return $this->getFieldset(__FILE__)::fields($this->model);
     }
 
     public function rulesIgnoreRealtime()
     {
-        return $this->fieldset()::rulesIgnoreRealtime();
+        return $this->getFieldset(__FILE__)::rulesIgnoreRealtime();
     }
 
     public function success()
@@ -68,9 +68,4 @@ class UserEdit extends FormComponent
     {
         return redirect()->route('filament.admin.users.index');
     }
-
-    protected function fieldset()
-    {
-        return $this->getFieldset(__FILE__);
-    }
 }