Rename Fact::getFactId() to id()

7 files changed, 11 insertions, 11 deletions

diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml
index ccf82dbedb..b456ef435b 100644
--- a/resources/views/admin/merge-records-step-2.phtml
+++ b/resources/views/admin/merge-records-step-2.phtml
@@ -33,7 +33,7 @@
                         <?php foreach ($facts as $fact_id => $fact) : ?>
                             <tr>
                                 <td>
-                                    <input type="checkbox" name="keep1[]" value="<?= $fact->getFactId() ?>" checked>
+                                    <input type="checkbox" name="keep1[]" value="<?= $fact->id() ?>" checked>
                                 </td>
                                 <td>
                                     <div class="gedcom-data" dir="ltr"><?= e($fact->getGedcom()) ?></div>
@@ -80,7 +80,7 @@
                                 <?php foreach ($facts1 as $fact_id => $fact) : ?>
                                     <tr>
                                         <td>
-                                            <input type="checkbox" name="keep1[]" value="<?= $fact->getFactId() ?>" checked>
+                                            <input type="checkbox" name="keep1[]" value="<?= $fact->id() ?>" checked>
                                         </td>
                                         <td>
                                             <div class="gedcom-data" dir="ltr"><?= e($fact->getGedcom()) ?></div>
@@ -126,7 +126,7 @@
                                 <?php foreach ($facts2 as $fact_id => $fact) : ?>
                                     <tr>
                                         <td>
-                                            <input type="checkbox" name="keep2[]" value="<?= $fact->getFactId() ?>" checked>
+                                            <input type="checkbox" name="keep2[]" value="<?= $fact->id() ?>" checked>
                                         </td>
                                         <td>
                                             <div class="gedcom-data" dir="ltr"><?= e($fact->getGedcom()) ?></div>
diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml
index 0ca408d291..7e858c7083 100644
--- a/resources/views/edit/edit-fact.phtml
+++ b/resources/views/edit/edit-fact.phtml
@@ -9,7 +9,7 @@
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->getFactId()])) ?>" method="post">   <?= csrf_field() ?>
+<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->id()])) ?>" method="post">   <?= csrf_field() ?>
 
     <?php FunctionsEdit::createEditForm($edit_fact) ?>
 
@@ -112,7 +112,7 @@
                 I18N::translate('cancel') ?>
             </a>
             <?php if ($can_edit_raw) : ?>
-                <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->getFactId(), 'ged' => $tree->getName()])) ?>">
+                <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->id(), 'ged' => $tree->getName()])) ?>">
                     <?= I18N::translate('Edit the raw GEDCOM') ?>
                 </a>
             <?php endif; ?>
diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml
index 83acc446af..7b4a4965ef 100644
--- a/resources/views/edit/new-individual.phtml
+++ b/resources/views/edit/new-individual.phtml
@@ -25,7 +25,7 @@ $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRAD
 
 if ($name_fact !== null) {
     // Editing an existing name
-    $name_fact_id = $name_fact->getFactId();
+    $name_fact_id = $name_fact->id();
     $namerec      = $name_fact->getGedcom();
     $name_fields  = [
         'NAME' => $name_fact->value(),
@@ -333,7 +333,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
             </a>
 
             <?php if ($name_fact instanceof Fact && (Auth::isAdmin() || $tree->getPreference('SHOW_GEDCOM_RECORD'))) : ?>
-                <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->getFactId(), 'ged' => $tree->getName()])) ?>">
+                <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->id(), 'ged' => $tree->getName()])) ?>">
                     <?= I18N::translate('Edit the raw GEDCOM') ?>
                 </a>
             <?php endif ?>
diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml
index 173554c80e..dfc118c11b 100644
--- a/resources/views/edit/reorder-children.phtml
+++ b/resources/views/edit/reorder-children.phtml
@@ -9,7 +9,7 @@
     <div class="wt-sortable-list">
         <?php foreach ($family->getFacts('CHIL') as $fact) : ?>
             <div class="card mb-2 wt-sortable-item" data-sortbydate="<?= $fact->target()->getBirthDate()->julianDay() ?>">
-                <input type="hidden" name="order[]" value="<?= $fact->getFactId() ?>">
+                <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= FontAwesome::semanticIcon('drag-handle', '') ?>
                     <?= $fact->target()->getFullName() ?>
diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml
index d60c785968..cf8e5e68b3 100644
--- a/resources/views/edit/reorder-media.phtml
+++ b/resources/views/edit/reorder-media.phtml
@@ -9,7 +9,7 @@
     <div class="wt-sortable-list">
         <?php foreach ($individual->getFacts('OBJE') as $fact) : ?>
             <div class="card mb-2 wt-sortable-item">
-                <input type="hidden" name="order[]" value="<?= $fact->getFactId() ?>">
+                <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= FontAwesome::semanticIcon('drag-handle', '') ?>
                     <?= $fact->target()->getFullName() ?>
diff --git a/resources/views/edit/reorder-names.phtml b/resources/views/edit/reorder-names.phtml
index 743cc27ef2..9c63595c06 100644
--- a/resources/views/edit/reorder-names.phtml
+++ b/resources/views/edit/reorder-names.phtml
@@ -11,7 +11,7 @@
     <div class="wt-sortable-list">
         <?php foreach ($individual->getFacts('NAME') as $fact) : ?>
             <div class="card mb-2 wt-sortable-item">
-                <input type="hidden" name="order[]" value="<?= $fact->getFactId() ?>">
+                <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= FontAwesome::semanticIcon('drag-handle', '') ?>
                     <?= $fact->value() ?>
diff --git a/resources/views/edit/reorder-spouses.phtml b/resources/views/edit/reorder-spouses.phtml
index c81f9ffc4f..103cab0a6b 100644
--- a/resources/views/edit/reorder-spouses.phtml
+++ b/resources/views/edit/reorder-spouses.phtml
@@ -9,7 +9,7 @@
     <div class="wt-sortable-list">
         <?php foreach ($individual->getFacts('FAMS') as $fact) : ?>
             <div class="card mb-2 wt-sortable-item" data-sortbydate="<?= $fact->target()->getMarriageDate()->julianDay() ?>">
-                <input type="hidden" name="order[]" value="<?= $fact->getFactId() ?>">
+                <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= FontAwesome::semanticIcon('drag-handle', '') ?>
                     <?= $fact->target()->getFullName() ?>