fix: findById() does not work with withIdentities()

ErrorException : Attempt to read property "id" on int

Author: kenjis

src/Models/UserModel.php

@@ -85,7 +85,7 @@ protected function fetchIdentities(array $data): array
         // Map our users by ID to make assigning simpler
         $mappedUsers = [];
         $users       = $data['singleton']
-            ? $data
+            ? [$data['data']]
             : $data['data'];
 
         foreach ($users as $user) {
@@ -100,7 +100,7 @@ protected function fetchIdentities(array $data): array
             $mappedUsers[$id->user_id]->identities = $array;
         }
 
-        $data['data'] = $mappedUsers;
+        $data['data'] = $data['singleton'] ? $mappedUsers[$id->user_id] : $mappedUsers;
 
         return $data;
     }

tests/Unit/UserTest.php

@@ -53,7 +53,7 @@ public function testGetIdentitiesByType(): void
         $this->assertEmpty($this->user->getIdentities('foo'));
     }
 
-    public function testModelWithIdentities(): void
+    public function testModelfindAllWithIdentities(): void
     {
         fake(UserModel::class);
         fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'password']);
@@ -67,6 +67,18 @@ public function testModelWithIdentities(): void
         $this->assertCount(2, $identities);
     }
 
+    public function testModelfindByIdWithIdentities(): void
+    {
+        fake(UserModel::class);
+        fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'password']);
+        fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'access_token']);
+
+        // Grab the user again, using the model's identity helper
+        $user = model(UserModel::class)->withIdentities()->findById(1);
+
+        $this->assertCount(2, $user->identities);
+    }
+
     public function testLastLogin(): void
     {
         fake(