Rename Tree::getTreeId() to id()

17 files changed, 53 insertions, 53 deletions

diff --git a/app/Module/AbstractModule.php b/app/Module/AbstractModule.php
index e39f1b8369..311f80dbbb 100644
--- a/app/Module/AbstractModule.php
+++ b/app/Module/AbstractModule.php
@@ -206,7 +206,7 @@ abstract class AbstractModule
         $access_level = Database::prepare(
             "SELECT access_level FROM `##module_privacy` WHERE gedcom_id = :gedcom_id AND module_name = :module_name AND component = :component"
         )->execute([
-            'gedcom_id'   => $tree->getTreeId(),
+            'gedcom_id'   => $tree->id(),
             'module_name' => $this->getName(),
             'component'   => $component,
         ])->fetchOne();
diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php
index 1aec119522..27de6ab069 100644
--- a/app/Module/BatchUpdateModule.php
+++ b/app/Module/BatchUpdateModule.php
@@ -273,7 +273,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
                     $tmp += Database::prepare(
                         "SELECT i_id AS xref, 'INDI' AS type, i_gedcom AS gedcom  FROM `##individuals` WHERE i_file = :tree_id"
                     )->execute([
-                        'tree_id' => $tree->getTreeId(),
+                        'tree_id' => $tree->id(),
                     ])->fetchAll();
                     break;
 
@@ -281,7 +281,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
                     $tmp += Database::prepare(
                         "SELECT f_id AS xref, 'FAM' AS type, f_gedcom AS gedcom  FROM `##families` WHERE f_file = :tree_id"
                     )->execute([
-                        'tree_id' => $tree->getTreeId(),
+                        'tree_id' => $tree->id(),
                     ])->fetchAll();
                     break;
 
@@ -289,7 +289,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
                     $tmp += Database::prepare(
                         "SELECT s_id AS xref, 'SOUR' AS type, s_gedcom AS gedcom  FROM `##sources` WHERE s_file = :tree_id"
                     )->execute([
-                        'tree_id' => $tree->getTreeId(),
+                        'tree_id' => $tree->id(),
                     ])->fetchAll();
                     break;
 
@@ -297,7 +297,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
                     $tmp += Database::prepare(
                         "SELECT m_id AS xref, 'OBJE' AS type, m_gedcom AS gedcom  FROM `##media` WHERE m_file = :tree_id"
                     )->execute([
-                        'tree_id' => $tree->getTreeId(),
+                        'tree_id' => $tree->id(),
                     ])->fetchAll();
                     break;
 
@@ -305,7 +305,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
                     $tmp += Database::prepare(
                         "SELECT o_id AS xref, 'OBJE' AS type, o_gedcom AS gedcom  FROM `##other` WHERE o_file = :tree_id AND o_type = :type"
                     )->execute([
-                        'tree_id' => $tree->getTreeId(),
+                        'tree_id' => $tree->id(),
                         'type'    => $type,
                     ])->fetchAll();
                     break;
diff --git a/app/Module/DescendancyModule.php b/app/Module/DescendancyModule.php
index 4cc5930863..32f6e72f36 100644
--- a/app/Module/DescendancyModule.php
+++ b/app/Module/DescendancyModule.php
@@ -66,7 +66,7 @@ class DescendancyModule extends AbstractModule implements ModuleSidebarInterface
                 " ORDER BY n_sort"
             )->execute([
                 'query'   => $search,
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
             ])->fetchAll();
 
             foreach ($rows as $row) {
diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php
index 1d47ff7ab8..5f540ed4fe 100644
--- a/app/Module/FamilyTreeFavoritesModule.php
+++ b/app/Module/FamilyTreeFavoritesModule.php
@@ -156,7 +156,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
             "SELECT favorite_id, user_id, gedcom_id, xref, favorite_type, title, note, url" .
             " FROM `##favorite` WHERE gedcom_id = :tree_id AND user_id IS NULL"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ])->fetchAll();
 
         foreach ($favorites as $favorite) {
@@ -209,7 +209,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
                 "DELETE FROM `##favorite` WHERE favorite_id = :favorite_id AND gedcom_id = :tree_id"
             )->execute([
                 'favorite_id' => $favorite_id,
-                'tree_id'     => $tree->getTreeId(),
+                'tree_id'     => $tree->id(),
             ]);
         }
 
@@ -231,7 +231,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
         $favorite = Database::prepare(
             "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id IS NULL AND url = :url"
         )->execute([
-            'gedcom_id' => $tree->getTreeId(),
+            'gedcom_id' => $tree->id(),
             'url'       => $url,
         ])->fetchOneRow();
 
@@ -239,7 +239,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
             Database::prepare(
                 "INSERT INTO `##favorite` (gedcom_id, url, note, title) VALUES (:gedcom_id, :user_id, :url, :note, :title)"
             )->execute([
-                'gedcom_id' => $tree->getTreeId(),
+                'gedcom_id' => $tree->id(),
                 'url'       => $url,
                 'note'      => $note,
                 'title'     => $title,
@@ -267,7 +267,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
         $favorite = Database::prepare(
             "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id IS NULL AND xref = :xref"
         )->execute([
-            'gedcom_id' => $tree->getTreeId(),
+            'gedcom_id' => $tree->id(),
             'xref'      => $xref,
         ])->fetchOneRow();
 
@@ -275,7 +275,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
             Database::prepare(
                 "INSERT INTO `##favorite` (gedcom_id, xref, note) VALUES (:gedcom_id, :xref, :note)"
             )->execute([
-                'gedcom_id' => $tree->getTreeId(),
+                'gedcom_id' => $tree->id(),
                 'xref'      => $xref,
                 'note'      => $note,
             ]);
diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php
index e52d131fdd..5a39e9fc5a 100644
--- a/app/Module/FamilyTreeNewsModule.php
+++ b/app/Module/FamilyTreeNewsModule.php
@@ -87,7 +87,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
             "SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE gedcom_id = :tree_id ORDER BY updated DESC"
         )->execute([
             'offset'  => WT_TIMESTAMP_OFFSET,
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ])->fetchAll();
 
         $content = view('modules/gedcom_news/list', [
@@ -170,7 +170,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
                 "SELECT subject, body FROM `##news` WHERE news_id = :news_id AND gedcom_id = :tree_id"
             )->execute([
                 'news_id' => $news_id,
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
             ])->fetchOneRow();
         } else {
             $row = (object) [
@@ -213,7 +213,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
                 'subject' => $subject,
                 'body'    => $body,
                 'news_id' => $news_id,
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
             ]);
         } else {
             Database::prepare(
@@ -221,7 +221,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
             )->execute([
                 'body'    => $body,
                 'subject' => $subject,
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
             ]);
         }
 
@@ -250,7 +250,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
             "DELETE FROM `##news` WHERE news_id = :news_id AND gedcom_id = :tree_id"
         )->execute([
             'news_id' => $news_id,
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ]);
 
         $url = route('tree-page', [
diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php
index 4d70dc07a2..8f07105484 100644
--- a/app/Module/FamilyTreeStatisticsModule.php
+++ b/app/Module/FamilyTreeStatisticsModule.php
@@ -92,7 +92,7 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn
                 " ORDER BY COUNT(n_surn) DESC" .
                 " LIMIT :limit"
             )->execute([
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
                 'limit'   => $number_of_surnames,
             ])->fetchOneColumn();
 
@@ -103,7 +103,7 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn
                 )->execute([
                     'collate' => I18N::collation(),
                     'surname' => $top_surname,
-                    'tree_id' => $tree->getTreeId(),
+                    'tree_id' => $tree->id(),
                 ])->fetchAssoc();
 
                 $all_surnames[$top_surname] = $variants;
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php
index 21aac5fe72..8a9f64aaf6 100644
--- a/app/Module/FrequentlyAskedQuestionsModule.php
+++ b/app/Module/FrequentlyAskedQuestionsModule.php
@@ -84,8 +84,8 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
             " AND setting_name='languages' AND (setting_value LIKE CONCAT('%', :locale, '%') OR setting_value='')"
         )->execute([
             'module_name' => $this->getName(),
-            'tree_id_1'   => $tree->getTreeId(),
-            'tree_id_2'   => $tree->getTreeId(),
+            'tree_id_1'   => $tree->id(),
+            'tree_id_2'   => $tree->id(),
             'locale'      => WT_LOCALE,
         ])->fetchAll();
 
@@ -121,20 +121,20 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
             " ORDER BY block_order"
         )->execute([
             'module_name' => $this->getName(),
-            'tree_id_1'   => $tree->getTreeId(),
-            'tree_id_2'   => $tree->getTreeId(),
+            'tree_id_1'   => $tree->id(),
+            'tree_id_2'   => $tree->id(),
         ])->fetchAll();
 
         $min_block_order = Database::prepare(
             "SELECT MIN(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ])->fetchOne();
 
         $max_block_order = Database::prepare(
             "SELECT MAX(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ])->fetchOne();
 
         $title = I18N::translate('Frequently asked questions') . ' — ' . $tree->getTitle();
@@ -400,8 +400,8 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
             " ORDER BY block_order"
         )->execute([
             'module_name' => $this->getName(),
-            'tree_id_1'   => $tree->getTreeId(),
-            'tree_id_2'   => $tree->getTreeId(),
+            'tree_id_1'   => $tree->id(),
+            'tree_id_2'   => $tree->id(),
         ])->fetchAll();
 
         // Filter foreign languages.
diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php
index ada94a27c3..58d306c62c 100644
--- a/app/Module/RecentChangesModule.php
+++ b/app/Module/RecentChangesModule.php
@@ -225,7 +225,7 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface
 
         $vars = [
             'days'    => $days,
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
         ];
 
         $xrefs = Database::prepare($sql)->execute($vars)->fetchOneColumn();
diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php
index 2a0bcf366a..2eb5e63adf 100644
--- a/app/Module/RelationshipsChartModule.php
+++ b/app/Module/RelationshipsChartModule.php
@@ -164,8 +164,8 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt
     public function postAdminAction(Request $request): RedirectResponse
     {
         foreach (Tree::getAll() as $tree) {
-            $recursion = $request->get('relationship-recursion-' . $tree->getTreeId(), '');
-            $ancestors = $request->get('relationship-ancestors-' . $tree->getTreeId(), '');
+            $recursion = $request->get('relationship-recursion-' . $tree->id(), '');
+            $ancestors = $request->get('relationship-ancestors-' . $tree->id(), '');
 
             $tree->setPreference('RELATIONSHIP_RECURSION', $recursion);
             $tree->setPreference('RELATIONSHIP_ANCESTORS', $ancestors);
diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php
index b56c6d39e7..753e890286 100644
--- a/app/Module/ResearchTaskModule.php
+++ b/app/Module/ResearchTaskModule.php
@@ -74,7 +74,7 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
             "SELECT DISTINCT d_gid FROM `##dates`" .
             " WHERE d_file = :tree_id AND d_fact = '_TODO' AND d_julianday1 < :jd"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'jd'      => $end_jd,
         ])->fetchOneColumn();
 
diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php
index e78abbadc4..cb326da96a 100644
--- a/app/Module/ReviewChangesModule.php
+++ b/app/Module/ReviewChangesModule.php
@@ -131,7 +131,7 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface
                 " WHERE status='pending'" .
                 " AND   gedcom_id=?" .
                 " GROUP BY xref"
-            )->execute([$tree->getTreeId()])->fetchAll();
+            )->execute([$tree->id()])->fetchAll();
             foreach ($changes as $change) {
                 $record = GedcomRecord::getInstance($change->xref, $tree);
                 if ($record->canShow()) {
diff --git a/app/Module/SiteMapModule.php b/app/Module/SiteMapModule.php
index eb34535cde..08928396ad 100644
--- a/app/Module/SiteMapModule.php
+++ b/app/Module/SiteMapModule.php
@@ -110,7 +110,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
     public function postAdminAction(Request $request): RedirectResponse
     {
         foreach (Tree::getAll() as $tree) {
-            $include_in_sitemap = (bool) $request->get('sitemap' . $tree->getTreeId());
+            $include_in_sitemap = (bool) $request->get('sitemap' . $tree->id());
             $tree->setPreference('include_in_sitemap', (string) $include_in_sitemap);
         }
 
@@ -266,7 +266,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
             " ORDER BY i_id" .
             " LIMIT :limit OFFSET :offset"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $limit,
             'offset'  => $offset,
         ])->fetchAll();
@@ -296,7 +296,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
             " ORDER BY m_id" .
             " LIMIT :limit OFFSET :offset"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $limit,
             'offset'  => $offset,
         ])->fetchAll();
@@ -326,7 +326,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
             " ORDER BY o_id" .
             " LIMIT :limit OFFSET :offset"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $limit,
             'offset'  => $offset,
         ])->fetchAll();
@@ -356,7 +356,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
             " ORDER BY o_id" .
             " LIMIT :limit OFFSET :offset"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $limit,
             'offset'  => $offset,
         ])->fetchAll();
@@ -386,7 +386,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface
             " ORDER BY s_id" .
             " LIMIT :limit OFFSET :offset"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $limit,
             'offset'  => $offset,
         ])->fetchAll();
diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php
index 80ec41fe7f..684285b312 100644
--- a/app/Module/SlideShowModule.php
+++ b/app/Module/SlideShowModule.php
@@ -72,7 +72,7 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface
             " AND multimedia_format  IN ('jpg', 'jpeg', 'png', 'gif', 'tiff', 'bmp')" .
             " AND source_media_type IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '')"
         )->execute([
-            $tree->getTreeId(),
+            $tree->id(),
             $this->getBlockSetting($block_id, 'filter_audio', '0') ? 'audio' : null,
             $this->getBlockSetting($block_id, 'filter_book', '1') ? 'book' : null,
             $this->getBlockSetting($block_id, 'filter_card', '1') ? 'card' : null,
diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php
index b4c366f951..edf1897bba 100644
--- a/app/Module/StoriesModule.php
+++ b/app/Module/StoriesModule.php
@@ -111,7 +111,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
             )->execute([
                 'module_name' => $this->getName(),
                 'xref'        => $individual->getXref(),
-                'tree_id'     => $individual->getTree()->getTreeId(),
+                'tree_id'     => $individual->getTree()->id(),
             ])->fetchOneColumn();
 
         $stories = [];
@@ -188,7 +188,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
             " AND gedcom_id = :tree_id" .
             " ORDER BY gedcom_id, xref"
         )->execute([
-            'tree_id'     => $tree->getTreeId(),
+            'tree_id'     => $tree->id(),
             'module_name' => $this->getName(),
         ])->fetchAll();
 
@@ -273,7 +273,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
             Database::prepare(
                 "UPDATE `##block` SET gedcom_id = :tree_id, xref = :xref WHERE block_id = :block_id"
             )->execute([
-                'tree_id'  => $tree->getTreeId(),
+                'tree_id'  => $tree->id(),
                 'xref'     => $xref,
                 'block_id' => $block_id,
             ]);
@@ -281,7 +281,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
             Database::prepare(
                 "INSERT INTO `##block` (gedcom_id, xref, module_name, block_order) VALUES (:tree_id, :xref, 'stories', 0)"
             )->execute([
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
                 'xref'    => $xref,
             ]);
 
@@ -347,7 +347,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
             " ORDER BY xref"
         )->execute([
             'module_name' => $this->getName(),
-            'tree_id'     => $tree->getTreeId(),
+            'tree_id'     => $tree->id(),
         ])->fetchAll();
 
         foreach ($stories as $story) {
diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php
index d94126febf..ffeba18880 100644
--- a/app/Module/TopPageViewsModule.php
+++ b/app/Module/TopPageViewsModule.php
@@ -77,7 +77,7 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
             " WHERE gedcom_id = :tree_id AND page_name IN ('individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php')" .
             " ORDER BY page_count DESC LIMIT :limit"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => (int) $num,
         ])->fetchAssoc();
 
diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php
index e52af42e21..01cd62b4c5 100644
--- a/app/Module/TopSurnamesModule.php
+++ b/app/Module/TopSurnamesModule.php
@@ -82,7 +82,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
             " ORDER BY COUNT(n_surn) DESC" .
             " LIMIT :limit"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'limit'   => $num,
         ])->fetchOneColumn();
 
@@ -93,7 +93,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
             )->execute([
                 'collate' => I18N::collation(),
                 'surname' => $top_surname,
-                'tree_id' => $tree->getTreeId(),
+                'tree_id' => $tree->id(),
             ])->fetchAssoc();
 
             $variants = array_map(function (string $count): int {
diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php
index 331974a354..8b0046f821 100644
--- a/app/Module/UserFavoritesModule.php
+++ b/app/Module/UserFavoritesModule.php
@@ -156,7 +156,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
             "SELECT favorite_id, user_id, gedcom_id, xref, favorite_type, title, note, url" .
             " FROM `##favorite` WHERE gedcom_id = :tree_id AND user_id = :user_id"
         )->execute([
-            'tree_id' => $tree->getTreeId(),
+            'tree_id' => $tree->id(),
             'user_id' => $user->getUserId(),
         ])->fetchAll();
 
@@ -233,7 +233,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
         $favorite = Database::prepare(
             "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id = :user_id AND url = :url"
         )->execute([
-            'gedcom_id' => $tree->getTreeId(),
+            'gedcom_id' => $tree->id(),
             'user_id'   => $user->getUserId(),
             'url'       => $url,
         ])->fetchOneRow();
@@ -242,7 +242,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
             Database::prepare(
                 "INSERT INTO `##favorite` (gedcom_id, user_id, url, note, title) VALUES (:gedcom_id, :user_id, :url, :note, :title)"
             )->execute([
-                'gedcom_id' => $tree->getTreeId(),
+                'gedcom_id' => $tree->id(),
                 'user_id'   => $user->getUserId(),
                 'url'       => $url,
                 'note'      => $note,
@@ -272,7 +272,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
         $favorite = Database::prepare(
             "SELECT * FROM `##favorite` WHERE gedcom_id = :gedcom_id AND user_id = :user_id AND xref = :xref"
         )->execute([
-            'gedcom_id' => $tree->getTreeId(),
+            'gedcom_id' => $tree->id(),
             'user_id'   => $user->getUserId(),
             'xref'      => $xref,
         ])->fetchOneRow();
@@ -281,7 +281,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
             Database::prepare(
                 "INSERT INTO `##favorite` (gedcom_id, user_id, xref, note) VALUES (:gedcom_id, :user_id, :xref, :note)"
             )->execute([
-                'gedcom_id' => $tree->getTreeId(),
+                'gedcom_id' => $tree->id(),
                 'user_id'   => $user->getUserId(),
                 'xref'      => $xref,
                 'note'      => $note,