Merge pull request #2605 from RaiderIO/development

Release v11.6.1 - Updated MDT version to 5.2.5

app/Models/Team.php

@@ -257,7 +257,8 @@ public function isUserAdmin(User $user): bool
      */
     public function isUserCollaborator(User $user): bool
     {
-        return $this->getUserRole($user) !== TeamUser::ROLE_MEMBER;
+        $userRole = $this->getUserRole($user);
+        return $userRole !== null && $this->getUserRole($user) !== TeamUser::ROLE_MEMBER;
     }
 
     /**
@@ -276,6 +277,7 @@ public function isUserModerator(User $user): bool
      * Checks if a user is a member of this team or not.
      *
      * @param User|null $user
+     * @return bool
      */
     public function isUserMember(?User $user): bool
     {
@@ -377,9 +379,12 @@ public function getNewAdminUponAdminAccountDeletion(User $user): ?User
         }
 
         $roles    = TeamUser::ALL_ROLES;
-        $newOwner = $this->teamusers->where('user_id', '!=', $user->id)->sortByDesc(static fn($obj, $key) => $roles[$obj->role])->first();
+        /** @var TeamUser|null $newOwner */
+        $newOwner = $this->teamusers->where('user_id', '!=', $user->id)
+            ->sortByDesc(static fn($obj, $key) => $roles[$obj->role])
+            ->first();
 
-        return $newOwner !== null ? $newOwner->user : null;
+        return $newOwner?->user;
     }
 
     public function getAvailableTags(): Collection

composer.json

@@ -34,11 +34,11 @@
             "type": "package",
             "package": {
                 "name": "nnoggie/mythicdungeontools",
-                "version": "5.1.7",
+                "version": "5.2.5",
                 "source": {
                     "url": "https://github.com/Wotuu/MythicDungeonTools.git",
                     "type": "git",
-                    "reference": "45d226753d73bdf17ceeec8bc4937d0e49e644f5"
+                    "reference": "f09f57fcd6dc0a0ffbadb66fa106c5a98831a805"
                 }
             }
         },
@@ -98,7 +98,7 @@
         "laravelcollective/html": "^6.4",
         "marvinlabs/laravel-discord-logger": "^1.3",
         "nnoggie/mdt-legacy": "^1.0",
-        "nnoggie/mythicdungeontools": "5.1.7",
+        "nnoggie/mythicdungeontools": "5.2.5",
         "paquettg/php-html-parser": "^3.1",
         "patreon/patreon": "^1.0.0",
         "phlak/semver": "^4.1",