Refactor the re-ordering of children/spouses/names/media; add assertions

1 files changed, 5 insertions, 0 deletions

diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index 727a3b676e..b777acf329 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -21,13 +21,16 @@ namespace Fisharebest\Webtrees\Services;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Carbon;
 use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\User;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
+use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 
 use function app;
+use function assert;
 
 /**
  * Functions for managing users.
@@ -350,6 +353,8 @@ class UserService
     public function contactLink(User $contact_user, ServerRequestInterface $request): string
     {
         $tree = $request->getAttribute('tree');
+        assert($tree instanceof Tree, new InvalidArgumentException());
+
         $user = $request->getAttribute('user');
 
         if ($contact_user->getPreference('contactmethod') === 'mailto') {