Merge pull request #514 from michalsn/fix/withIdentities

fix: withIdentities() when user not exists

Author: datamweb

src/Models/UserModel.php

@@ -75,6 +75,10 @@ protected function fetchIdentities(array $data): array
             ? array_column($data, 'id')
             : array_column($data['data'], 'id');
 
+        if ($userIds === []) {
+            return $data;
+        }
+
         /** @var UserIdentityModel $identityModel */
         $identityModel = model(UserIdentityModel::class);
 

tests/Unit/UserTest.php

@@ -69,6 +69,13 @@ public function testModelFindAllWithIdentities(): void
         $this->assertCount(2, $identities);
     }
 
+    public function testModelFindAllWithIdentitiesUserNotExists(): void
+    {
+        $users = model(UserModel::class)->where('active', 0)->withIdentities()->findAll();
+
+        $this->assertSame([], $users);
+    }
+
     public function testModelFindByIdWithIdentities(): void
     {
         fake(UserModel::class);
@@ -81,6 +88,13 @@ public function testModelFindByIdWithIdentities(): void
         $this->assertCount(2, $user->identities);
     }
 
+    public function testModelFindByIdWithIdentitiesUserNotExists(): void
+    {
+        $user = model(UserModel::class)->where('active', 0)->withIdentities()->findById(1);
+
+        $this->assertNull($user);
+    }
+
     public function testLastLogin(): void
     {
         fake(