refactor

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Jan 14, 2024 · 51e0790 · 51e0790
1 parent 3c114b8
commit 51e0790
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Http/Controllers/Users.php b/src/Http/Controllers/Users.php
@@ -50,7 +50,7 @@ class Users extends \Igniter\Admin\Classes\AdminController
         'configFile' => 'user',
     ];
 
-    public $locationConfig = [
+    public array $locationConfig = [
         'addAbsenceConstraint' => false,
     ];
 
@@ -95,6 +95,7 @@ public function account_onSave()
             AdminAuth::logout();
             return redirect('/logout');
         }
+
         if ($usernameChanged || $languageChanged) {
             $this->currentUser->reload()->reloadRelations();
             AdminAuth::login($this->currentUser, true);

diff --git a/src/Requests/UserRequest.php b/src/Requests/UserRequest.php
@@ -8,13 +8,6 @@
 
 class UserRequest extends FormRequest
 {
-
-    protected function getRecordId()
-    {
-         $slugName = ($slug = $this->route('slug'))
-            ? str_after($slug, '/') : null;
-         return $slugName == 'account' ? AdminAuth::id() : $slugName;
-    }
     public function attributes()
     {
         return [
@@ -54,4 +47,12 @@ public function rules()
             'locations.*' => ['integer'],
         ];
     }
+
+    protected function getRecordId(): string
+    {
+        $slugName = ($slug = $this->route('slug'))
+            ? str_after($slug, '/') : null;
+
+        return $slugName == 'account' ? AdminAuth::id() : $slugName;
+    }
 }