Merge pull request #171 from laravel-enso/upgrade/laravel8

Upgrade/laravel8

src/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace LaravelEnso\Core;
 
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\ServiceProvider;
 use LaravelEnso\ActionLogger\Http\Middleware\ActionLogger;
@@ -12,6 +13,7 @@
 use LaravelEnso\Core\Http\Middleware\VerifyActiveState;
 use LaravelEnso\Core\Http\Middleware\XssSanitizer;
 use LaravelEnso\Core\Models\User;
+use LaravelEnso\Helpers\Services\FactoryResolver;
 use LaravelEnso\Impersonate\Http\Middleware\Impersonate;
 use LaravelEnso\Localisation\Http\Middleware\SetLanguage;
 use LaravelEnso\Permissions\Http\Middleware\VerifyRouteAccess;
@@ -27,6 +29,7 @@ public function boot()
             ->publishDependencies()
             ->publishResources()
             ->mapMorphs()
+            ->setFactoryResolver()
             ->commands(
                 AnnounceAppUpdate::class,
                 ClearPreferences::class,
@@ -126,4 +129,11 @@ private function mapMorphs()
 
         return $this;
     }
+
+    private function setFactoryResolver()
+    {
+        Factory::guessFactoryNamesUsing(new FactoryResolver());
+
+        return $this;
+    }
 }

src/Models/User.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use Illuminate\Contracts\Translation\HasLocalePreference;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\App;
@@ -22,7 +23,6 @@
 use LaravelEnso\Helpers\Traits\ActiveState;
 use LaravelEnso\Helpers\Traits\AvoidsDeletionConflicts;
 use LaravelEnso\Helpers\Traits\CascadesMorphMap;
-use LaravelEnso\Helpers\Traits\HasFactory;
 use LaravelEnso\Impersonate\Traits\Impersonates;
 use LaravelEnso\People\Models\Person;
 use LaravelEnso\People\Traits\IsPerson;

src/Models/UserGroup.php

@@ -2,10 +2,10 @@
 
 namespace LaravelEnso\Core\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Core\Exceptions\UserGroupConflict;
-use LaravelEnso\Helpers\Traits\HasFactory;
 use LaravelEnso\Rememberable\Traits\Rememberable;
 use LaravelEnso\Roles\Models\Role;
 use LaravelEnso\Roles\Traits\HasRoles;