CodeStyle

20 files changed, 126 insertions, 12 deletions

diff --git a/resources/views/edit/add-fact-row.phtml b/resources/views/edit/add-fact-row.phtml
index e2b2533644..bfaf69d3d2 100644
--- a/resources/views/edit/add-fact-row.phtml
+++ b/resources/views/edit/add-fact-row.phtml
@@ -56,7 +56,7 @@ use Fisharebest\Webtrees\Individual;
                 <a class="btn btn-link btn-sm wt-quick-fact" href="<?= e(route(AddNewFact::class, [
                     'fact' => $fact,
                     'xref' => $record->xref(),
-                    'tree' => $tree->name(),
+                    'tree' => $record->tree()->name(),
                 ])) ?>">
                     <?= GedcomTag::getLabel($record->tag() . ':' . $fact) ?>
                 </a>
diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml
index d509d560f0..59afb810ee 100644
--- a/resources/views/edit/add-fact.phtml
+++ b/resources/views/edit/add-fact.phtml
@@ -2,15 +2,25 @@
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Config;
+use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Functions\FunctionsEdit;
+use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\GedcomTag;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditFactAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
 use Ramsey\Uuid\Uuid;
 
+/**
+ * @var string       $fact
+ * @var GedcomRecord $record
+ * @var string       $title
+ * @var Tree         $tree
+ */
+
 ?>
 
-<h2 class="wt-page-title"><?= $title ?></h2>
+<h2 class="wt-page-title"><?= $title ?></h2>z
 
 <form method="post" action="<?= e(route(EditFactAction::class, ['tree' => $tree->name(), 'xref' => $record->xref()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml
index d72ce8e058..b56e653da8 100644
--- a/resources/views/edit/change-family-members.phtml
+++ b/resources/views/edit/change-family-members.phtml
@@ -1,7 +1,20 @@
 <?php
 
+use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Http\RequestHandlers\ChangeFamilyMembersAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Tree;
+use Illuminate\Support\Collection;
+
+/**
+ * @var Collection<Individual> $children
+ * @var Family                 $family
+ * @var Individual|null        $father
+ * @var Individual|null        $mother
+ * @var string                 $title
+ * @var Tree                   $tree
+ */
 
 ?>
 
@@ -15,7 +28,7 @@ use Fisharebest\Webtrees\I18N;
 
     <div class="form-group row">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="HUSB">
-            <?php if ($father !== null && $father->sex() === 'M') : ?>
+            <?php if ($father instanceof Individual && $father->sex() === 'M') : ?>
                 <?= I18N::translate('Husband') ?>
             <?php elseif ($father !== null && $father->sex() === 'F') : ?>
                 <?= I18N::translate('Wife') ?>
@@ -30,7 +43,7 @@ use Fisharebest\Webtrees\I18N;
 
     <div class="form-group row">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="WIFE">
-            <?php if ($mother !== null && $mother->sex() === 'M') : ?>
+            <?php if ($mother  instanceof Individual && $mother->sex() === 'M') : ?>
                 <?= I18N::translate('Husband') ?>
             <?php elseif ($mother !== null && $mother->sex() === 'F') : ?>
                 <?= I18N::translate('Wife') ?>
diff --git a/resources/views/edit/edit-record.phtml b/resources/views/edit/edit-record.phtml
index 14b3b64ac0..7070641203 100644
--- a/resources/views/edit/edit-record.phtml
+++ b/resources/views/edit/edit-record.phtml
@@ -8,6 +8,7 @@ use Fisharebest\Webtrees\Tree;
 
 /**
  * @var bool         $can_edit_raw
+ * @var bool         $has_chan
  * @var GedcomRecord $record
  * @var string       $title
  * @var Tree         $tree
diff --git a/resources/views/edit/icon-fact-copy.phtml b/resources/views/edit/icon-fact-copy.phtml
index f591ab6e87..87dad542f4 100644
--- a/resources/views/edit/icon-fact-copy.phtml
+++ b/resources/views/edit/icon-fact-copy.phtml
@@ -1,8 +1,13 @@
 <?php
 
+use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Http\RequestHandlers\CopyFact;
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var Fact $fact
+ */
+
 ?>
 
 <a class="btn btn-link btn-sm" href="#" data-post-url="<?= e(route(CopyFact::class, ['tree' => $fact->record()->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()])) ?>" title="<?= I18N::translate('Copy') ?>">
diff --git a/resources/views/edit/icon-fact-delete.phtml b/resources/views/edit/icon-fact-delete.phtml
index ca438e77a7..92aa57a26e 100644
--- a/resources/views/edit/icon-fact-delete.phtml
+++ b/resources/views/edit/icon-fact-delete.phtml
@@ -1,8 +1,13 @@
 <?php
 
+use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Http\RequestHandlers\DeleteFact;
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var Fact $fact
+ */
+
 ?>
 
 <a class="btn btn-link btn-sm" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete this fact?') ?>" data-post-url="<?= e(route(DeleteFact::class, ['tree' => $fact->record()->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()])) ?>" title="<?= I18N::translate('Delete') ?>">
diff --git a/resources/views/edit/icon-fact-edit.phtml b/resources/views/edit/icon-fact-edit.phtml
index 809afca7e3..0cb079c52f 100644
--- a/resources/views/edit/icon-fact-edit.phtml
+++ b/resources/views/edit/icon-fact-edit.phtml
@@ -1,8 +1,13 @@
 <?php
 
+use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditFactPage;
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var Fact $fact
+ */
+
 ?>
 
 <a class="btn btn-link btn-sm" href="<?= e(route(EditFactPage::class, ['xref' => $fact->record()->xref(), 'fact_id' => $fact->id(), 'tree' => $fact->record()->tree()->name(), 'url' => $url ?? $fact->record()->url()])) ?>" title="<?= I18N::translate('Edit') ?>">
diff --git a/resources/views/edit/input-addon-calendar.phtml b/resources/views/edit/input-addon-calendar.phtml
index 059a2b62ba..b3b26b8fac 100644
--- a/resources/views/edit/input-addon-calendar.phtml
+++ b/resources/views/edit/input-addon-calendar.phtml
@@ -2,6 +2,10 @@
 
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var string $id
+ */
+
 ?>
 
 <div class="input-group-append">
diff --git a/resources/views/edit/input-addon-coordinates.phtml b/resources/views/edit/input-addon-coordinates.phtml
index 8841e832b6..0faa09324e 100644
--- a/resources/views/edit/input-addon-coordinates.phtml
+++ b/resources/views/edit/input-addon-coordinates.phtml
@@ -2,6 +2,10 @@
 
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var string $id
+ */
+
 ?>
 
 <div class="input-group-append">
diff --git a/resources/views/edit/input-addon-edit-name.phtml b/resources/views/edit/input-addon-edit-name.phtml
index 4d020a686e..a3d3c1349c 100644
--- a/resources/views/edit/input-addon-edit-name.phtml
+++ b/resources/views/edit/input-addon-edit-name.phtml
@@ -2,6 +2,10 @@
 
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var string $id
+ */
+
 ?>
 
 <div class="input-group-prepend">
@@ -63,4 +67,4 @@ use Fisharebest\Webtrees\I18N;
             NSFX.addEventListener('input', fn);
         }
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/edit/input-addon-help.phtml b/resources/views/edit/input-addon-help.phtml
index 1fa7c710cc..3a1391ac45 100644
--- a/resources/views/edit/input-addon-help.phtml
+++ b/resources/views/edit/input-addon-help.phtml
@@ -1,3 +1,11 @@
+<?php
+
+/**
+ * @var string $fact
+ */
+
+
+?>
 <div class="input-group-append">
     <span class="input-group-text">
         <?= view('help/link', ['topic' => $fact]) ?>
diff --git a/resources/views/edit/input-addon-keyboard.phtml b/resources/views/edit/input-addon-keyboard.phtml
index e95728064f..3992e91213 100644
--- a/resources/views/edit/input-addon-keyboard.phtml
+++ b/resources/views/edit/input-addon-keyboard.phtml
@@ -2,6 +2,10 @@
 
 use Fisharebest\Webtrees\I18N;
 
+/**
+ * @var string $id
+ */
+
 ?>
 
 <div class="input-group-append">
diff --git a/resources/views/edit/link-child-to-family.phtml b/resources/views/edit/link-child-to-family.phtml
index f51de61ff1..d845f14613 100644
--- a/resources/views/edit/link-child-to-family.phtml
+++ b/resources/views/edit/link-child-to-family.phtml
@@ -3,6 +3,15 @@
 use Fisharebest\Webtrees\GedcomCode\GedcomCodePedi;
 use Fisharebest\Webtrees\Http\RequestHandlers\LinkChildToFamilyAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Individual $individual
+ * @var string     $title
+ * @var Tree       $tree
+ * @var string     $xref
+ */
 
 ?>
 
diff --git a/resources/views/edit/link-spouse-to-individual.phtml b/resources/views/edit/link-spouse-to-individual.phtml
index 0d82b5b1fa..4091153080 100644
--- a/resources/views/edit/link-spouse-to-individual.phtml
+++ b/resources/views/edit/link-spouse-to-individual.phtml
@@ -3,6 +3,16 @@
 use Fisharebest\Webtrees\Functions\FunctionsEdit;
 use Fisharebest\Webtrees\Http\RequestHandlers\LinkSpouseToIndividualAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var Individual $individual
+ * @var string     $label
+ * @var string     $title
+ * @var Tree       $tree
+ * @var string     $xref
+ */
 
 ?>
 
diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml
index 05fcc22728..66f721d144 100644
--- a/resources/views/edit/new-individual.phtml
+++ b/resources/views/edit/new-individual.phtml
@@ -12,12 +12,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\AddParentToIndividualAction;
 use Fisharebest\Webtrees\Http\RequestHandlers\AddSpouseToFamilyAction;
 use Fisharebest\Webtrees\Http\RequestHandlers\AddSpouseToIndividualAction;
 use Fisharebest\Webtrees\Http\RequestHandlers\AddUnlinkedAction;
-use Fisharebest\Webtrees\Http\RequestHandlers\EditRawFactPage;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditFactAction;
+use Fisharebest\Webtrees\Http\RequestHandlers\EditRawFactPage;
 use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\SurnameTradition;
+use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\View;
 use Illuminate\Support\Collection;
 
@@ -29,6 +30,7 @@ use Illuminate\Support\Collection;
  * @var Fact|null       $name_fact
  * @var string          $next_action
  * @var string          $title
+ * @var Tree            $tree
  */
 
 ?>
@@ -270,8 +272,8 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 
         foreach (Fact::sortFactTags($tags) as $tag) {
             echo view('cards/add-fact', [
-                'tag' => $tag,
-                'tree'  => $tree,
+                'tag'  => $tag,
+                'tree' => $tree,
             ]);
         }
     }
@@ -299,7 +301,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
         echo view('cards/add-source-citation', [
             'bdm'                     => $bdm,
             'level'                   => 1,
-            'full_citations'          => $tree->getPreference('FULL_SOURCES'),
+            'full_citations'          => (bool) $tree->getPreference('FULL_SOURCES'),
             'prefer_level2_sources'   => $tree->getPreference('PREFER_LEVEL2_SOURCES'),
             'quick_required_facts'    => $tree->getPreference('QUICK_REQUIRED_FACTS'),
             'quick_required_famfacts' => $tree->getPreference('QUICK_REQUIRED_FAMFACTS'),
diff --git a/resources/views/edit/paste-fact-row.phtml b/resources/views/edit/paste-fact-row.phtml
index 660ce3b567..6cf3007856 100644
--- a/resources/views/edit/paste-fact-row.phtml
+++ b/resources/views/edit/paste-fact-row.phtml
@@ -1,7 +1,15 @@
 <?php
 
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\Http\RequestHandlers\PasteFact;
 use Fisharebest\Webtrees\I18N;
+use Illuminate\Support\Collection;
+
+/**
+ * @var Collection<Fact> $facts
+ * @var GedcomRecord     $record
+ */
 
 ?>
 
diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml
index 299a5da6f0..543e470c72 100644
--- a/resources/views/edit/raw-gedcom-fact.phtml
+++ b/resources/views/edit/raw-gedcom-fact.phtml
@@ -3,6 +3,7 @@
 use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditRawFactAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\Webtrees;
 
 /**
@@ -15,7 +16,7 @@ use Fisharebest\Webtrees\Webtrees;
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route(EditRawFactAction::class, ['tree' => $tree->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(EditRawFactAction::class, ['tree' => $fact->record()->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
     <input type="hidden" name="url" value="<?= e($url ?? $fact->record()->url()) ?>">
 
diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml
index 0218b730ea..3d37c8665f 100644
--- a/resources/views/edit/raw-gedcom-record.phtml
+++ b/resources/views/edit/raw-gedcom-record.phtml
@@ -1,10 +1,19 @@
 <?php
 
+use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditRawRecordAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\View;
 use Fisharebest\Webtrees\Webtrees;
 
+/**
+ * @var string       $level0
+ * @var GedcomRecord $record
+ * @var string       $title
+ * @var Tree         $tree
+ */
+
 ?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml
index f5f5a9d7de..9c1dffa4ed 100644
--- a/resources/views/edit/reorder-children.phtml
+++ b/resources/views/edit/reorder-children.phtml
@@ -1,15 +1,21 @@
 <?php
 
+use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Gedcom;
 use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenAction;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\View;
 
+/**
+ * @var Family $family
+ * @var string $title
+ */
+
 ?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route(ReorderChildrenAction::class, ['tree' => $tree->name(), 'xref' => $family->xref()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderChildrenAction::class, ['tree' => $family->tree()->name(), 'xref' => $family->xref()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
 
     <div class="wt-sortable-list">
diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml
index b46a4ee66b..36ecaaaa6b 100644
--- a/resources/views/edit/reorder-media.phtml
+++ b/resources/views/edit/reorder-media.phtml
@@ -2,13 +2,19 @@
 
 use Fisharebest\Webtrees\Http\RequestHandlers\ReorderMediaAction;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\View;
 
+/**
+ * @var Individual $individual
+ * @var string     $title
+ */
+
 ?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route(ReorderMediaAction::class, ['tree' => $tree->name(), 'xref' => $individual->xref()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderMediaAction::class, ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
 
     <div class="wt-sortable-list">