Look for App\Models\User before App\User in provider

Author: xaviqv

src/Models/Member_AppModelsUser.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace PanicHD\PanicHD\Models;
+
+use App\Models\User;
+use PanicHD\PanicHD\Traits\MemberTrait;
+
+class Member_AppModelsUser extends User
+{
+    use MemberTrait;
+
+    protected $table = 'users';
+}

src/PanicHDServiceProvider.php

@@ -34,12 +34,23 @@ public function boot()
 
         // Alias for Member model
         $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-        $member_model_class = 'PanicHD\PanicHD\Models\Member';
-        if (Schema::hasTable('panichd_settings') and Setting::where('slug', 'member_model_class')->count() == 1 and Setting::grab('member_model_class') != 'default') {
-            // TODO: Check Class existence before using it. Add in cache to avoid this checks in every load
+        if (Schema::hasTable('panichd_settings') and Setting::where('slug', 'member_model_class')->count() == 1) {
             $member_model_class = Setting::grab('member_model_class');
         }
 
+        if (!isset($member_model_class) or $member_model_class == 'default'){
+            $member_model_class = Cache::remember('panichd::provider_member_class', 3600, function () {
+                // Check App\Models\User existence first
+                if (class_exists('\App\Models\User')){
+                    return 'PanicHD\PanicHD\Models\Member_AppModelsUser';
+
+                }else{
+                    // Inherit from App\User as default
+                    return 'PanicHD\PanicHD\Models\Member_AppUser';
+                }
+            });
+        }
+
         $loader->alias('PanicHDMember', $member_model_class);
 
         $this->loadTranslationsFrom(__DIR__.'/Translations', 'panichd');