Merge pull request #21 from sander3/user-model-bugfix

Resolves #20
sander3 · Nov 10, 2018 · 03bfb49 · 03bfb49
2 parents c98e961 + 9e7015f
commit 03bfb49
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/Events/GdprDownloaded.php b/src/Events/GdprDownloaded.php
@@ -2,25 +2,25 @@
 
 namespace Soved\Laravel\Gdpr\Events;
 
-use App\User;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class GdprDownloaded
 {
     use SerializesModels;
 
     /**
-     * @var \App\User
+     * @var \Illuminate\Contracts\Auth\Authenticatable
      */
     public $user;
 
     /**
      * Create a new event instance.
      *
-     * @param  \App\User  $user
+     * @param  \App\Authenticatable  $user
      * @return void
      */
-    public function __construct(User $user)
+    public function __construct(Authenticatable $user)
     {
         $this->user = $user;
     }

diff --git a/src/Events/GdprInactiveUser.php b/src/Events/GdprInactiveUser.php
@@ -2,25 +2,25 @@
 
 namespace Soved\Laravel\Gdpr\Events;
 
-use App\User;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class GdprInactiveUser
 {
     use SerializesModels;
 
     /**
-     * @var \App\User
+     * @var \Illuminate\Contracts\Auth\Authenticatable
      */
     public $user;
 
     /**
      * Create a new event instance.
      *
-     * @param  \App\User  $user
+     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct(User $user)
+    public function __construct(Authenticatable $user)
     {
         $this->user = $user;
     }

diff --git a/src/Events/GdprInactiveUserDeleted.php b/src/Events/GdprInactiveUserDeleted.php
@@ -2,25 +2,25 @@
 
 namespace Soved\Laravel\Gdpr\Events;
 
-use App\User;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class GdprInactiveUserDeleted
 {
     use SerializesModels;
 
     /**
-     * @var \App\User
+     * @var \Illuminate\Contracts\Auth\Authenticatable
      */
     public $user;
 
     /**
      * Create a new event instance.
      *
-     * @param  \App\User  $user
+     * @param  \App\Authenticatable  $user
      * @return void
      */
-    public function __construct(User $user)
+    public function __construct(Authenticatable $user)
     {
         $this->user = $user;
     }

diff --git a/src/Jobs/Cleanup/Strategies/DefaultStrategy.php b/src/Jobs/Cleanup/Strategies/DefaultStrategy.php
@@ -2,9 +2,9 @@
 
 namespace Soved\Laravel\Gdpr\Jobs\Cleanup\Strategies;
 
-use App\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Soved\Laravel\Gdpr\Events\GdprInactiveUser;
 use Soved\Laravel\Gdpr\Jobs\Cleanup\CleanupStrategy;
 use Soved\Laravel\Gdpr\Events\GdprInactiveUserDeleted;
@@ -48,11 +48,11 @@ private function notifyInactiveUsers(
         Collection $users
     ) {
         $users->filter(
-            function (User $user) use ($inactivity, $notificationThreshold) {
+            function (Authenticatable $user) use ($inactivity, $notificationThreshold) {
                 return $user->last_activity->diffInDays($inactivity)
                     === $notificationThreshold;
             }
-        )->each(function (User $user) {
+        )->each(function (Authenticatable $user) {
             event(new GdprInactiveUser($user));
         });
     }
@@ -68,9 +68,9 @@ private function deleteInactiveUsers(
         Carbon $inactivity,
         Collection $users
     ) {
-        $users->filter(function (User $user) use ($inactivity) {
+        $users->filter(function (Authenticatable $user) use ($inactivity) {
             return $user->last_activity < $inactivity;
-        })->each(function (User $user) {
+        })->each(function (Authenticatable $user) {
             $user->delete();
 
             event(new GdprInactiveUserDeleted($user));