From 255a809b2eaa570323ca67613d1a6425403e7b7a Mon Sep 17 00:00:00 2001
From: Mihai <mihai.ocneanu@gmail.com>
Date: Fri, 9 Oct 2020 09:27:30 +0300
Subject: [PATCH 1/2] now uses laravel trait

---
 src/AppServiceProvider.php | 12 ++++++++++++
 src/Models/User.php        |  2 +-
 src/Models/UserGroup.php   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/AppServiceProvider.php b/src/AppServiceProvider.php
index 154469d5..ecf93d4d 100644
--- a/src/AppServiceProvider.php
+++ b/src/AppServiceProvider.php
@@ -2,8 +2,10 @@
 
 namespace LaravelEnso\Core;
 
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 use LaravelEnso\ActionLogger\Http\Middleware\ActionLogger;
 use LaravelEnso\Core\Commands\AnnounceAppUpdate;
 use LaravelEnso\Core\Commands\ClearPreferences;
@@ -12,12 +14,14 @@
 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;
 
 class AppServiceProvider extends ServiceProvider
 {
+
     public function boot()
     {
         JsonResource::withoutWrapping();
@@ -27,6 +31,7 @@ public function boot()
             ->publishDependencies()
             ->publishResources()
             ->mapMorphs()
+            ->setFactoryResolver()
             ->commands(
                 AnnounceAppUpdate::class,
                 ClearPreferences::class,
@@ -126,4 +131,11 @@ private function mapMorphs()
 
         return $this;
     }
+
+    private function setFactoryResolver()
+    {
+        Factory::guessFactoryNamesUsing(new FactoryResolver());
+
+        return $this;
+    }
 }
diff --git a/src/Models/User.php b/src/Models/User.php
index 143159b4..e10caab9 100644
--- a/src/Models/User.php
+++ b/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;
diff --git a/src/Models/UserGroup.php b/src/Models/UserGroup.php
index fe8f7e92..84f7325b 100644
--- a/src/Models/UserGroup.php
+++ b/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;

From fe82a2834509ddf2025369dbab8a4271321af196 Mon Sep 17 00:00:00 2001
From: Mihai <gandesc@users.noreply.github.com>
Date: Fri, 9 Oct 2020 06:27:42 +0000
Subject: [PATCH 2/2] Apply fixes from StyleCI

---
 src/AppServiceProvider.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/AppServiceProvider.php b/src/AppServiceProvider.php
index ecf93d4d..4edcd4ca 100644
--- a/src/AppServiceProvider.php
+++ b/src/AppServiceProvider.php
@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 use LaravelEnso\ActionLogger\Http\Middleware\ActionLogger;
 use LaravelEnso\Core\Commands\AnnounceAppUpdate;
 use LaravelEnso\Core\Commands\ClearPreferences;
@@ -21,7 +20,6 @@
 
 class AppServiceProvider extends ServiceProvider
 {
-
     public function boot()
     {
         JsonResource::withoutWrapping();