refactor: default user model to auth.providers.user.model

Added PHP 8.* support.
syntaxlexx · Jan 14, 2022 · afa168e · afa168e
1 parent 0423d3c
commit afa168e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/config.php b/config/config.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'user_model' => App\User::class,
+    'user_model' => config('auth.providers.users.model'),
 
     'message_model' => Lexx\ChatMessenger\Models\Message::class,
 

diff --git a/src/Models/Thread.php b/src/Models/Thread.php
@@ -328,7 +328,7 @@ public function getParticipantFromUser($userId)
      */
     public function activateAllParticipants()
     {
-        $participants = $this->participants()->withTrashed()->get();
+        $participants = $this->participants()->onlyTrashed()->get();
         foreach ($participants as $participant) {
             $participant->restore();
         }

diff --git a/tests/EloquentThreadTest.php b/tests/EloquentThreadTest.php
@@ -124,7 +124,7 @@ public function it_should_get_all_thread_participants()
         $this->assertCount(4, $participantIds);
         $this->assertEquals(999, end($participantIds));
 
-        $this->assertInternalType('array', $participantIds);
+        $this->assertIsArray('array', $participantIds);
     }
 
     /** @test */