diff options
231 files changed, 1830 insertions, 264 deletions
diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php index 7097009810..e9ba06c74f 100644 --- a/app/Module/ChartsBlockModule.php +++ b/app/Module/ChartsBlockModule.php @@ -120,7 +120,6 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $content = view('modules/charts/chart', [ 'block_id' => $block_id, 'chart_url' => $chart_url, - 'class' => 'wt-chart-pedigree', ]); } else { $title = I18N::translate('Pedigree'); @@ -141,7 +140,6 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $content = view('modules/charts/chart', [ 'block_id' => $block_id, 'chart_url' => $chart_url, - 'class' => 'wt-chart-descendants', ]); } else { $title = I18N::translate('Descendants'); @@ -162,7 +160,6 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface $content = view('modules/charts/chart', [ 'block_id' => $block_id, 'chart_url' => $chart_url, - 'class' => 'wt-chart-hourglass', ]); } else { $title = I18N::translate('Hourglass chart'); diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php index 1f26dec2d9..0d95efd501 100644 --- a/app/Module/FanChartModule.php +++ b/app/Module/FanChartModule.php @@ -271,22 +271,22 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface, Req $sosa = 2 ** $generations - 1; // fan size - $fanw = 640 * $width / 100; + $fanw = intdiv(640 * $width, 100); $cx = $fanw / 2 - 1; // center x $cy = $cx; // center y $rx = $fanw - 1; $rw = $fanw / ($gen + 1); $fanh = $fanw; // fan height if ($style === self::STYLE_HALF_CIRCLE) { - $fanh = $fanh * ($gen + 1) / ($gen * 2); + $fanh = intdiv($fanh * ($gen + 1), $gen * 2); } if ($style === self::STYLE_THREE_QUARTER_CIRCLE) { - $fanh *= 0.86; + $fanh = intdiv($fanw * 86, 100); } $scale = $fanw / 640; // Create the image - $image = imagecreate((int) $fanw, (int) $fanh); + $image = imagecreate($fanw, (int) $fanh); // Create colors $transparent = imagecolorallocate($image, 0, 0, 0); @@ -303,7 +303,7 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface, Req 'U' => $this->imageColor($image, $theme->parameter('chart-background-u')), ]; - imagefilledrectangle($image, 0, 0, (int) $fanw, (int) $fanh, $transparent); + imagefilledrectangle($image, 0, 0, $fanw, $fanh, $transparent); $fandeg = 90 * $style; diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index 095feeab9c..1c7e648b05 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -22,7 +22,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Carbon; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Services\HtmlService; -use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Statistics; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Str; @@ -38,19 +37,14 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface /** @var HtmlService */ private $html_service; - /** @var TreeService */ - private $tree_service; - /** * HtmlBlockModule bootstrap. * * @param HtmlService $html_service - * @param TreeService $tree_service */ - public function __construct(HtmlService $html_service, TreeService $tree_service) + public function __construct(HtmlService $html_service) { $this->html_service = $html_service; - $this->tree_service = $tree_service; } /** @@ -192,7 +186,6 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface $html = $this->getBlockSetting($block_id, 'html'); $show_timestamp = $this->getBlockSetting($block_id, 'show_timestamp', '0'); $languages = explode(',', $this->getBlockSetting($block_id, 'languages')); - $all_trees = $this->tree_service->titles(); $templates = [ $html => I18N::translate('Custom'), @@ -202,7 +195,6 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface ]; return view('modules/html/config', [ - 'all_trees' => $all_trees, 'html' => $html, 'languages' => $languages, 'show_timestamp' => $show_timestamp, diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php index 85550ef0fc..db75ed25f9 100644 --- a/app/Module/LifespansChartModule.php +++ b/app/Module/LifespansChartModule.php @@ -38,9 +38,29 @@ use Psr\Http\Server\RequestHandlerInterface; use stdClass; use function app; +use function array_filter; +use function array_intersect; +use function array_map; +use function array_merge; +use function array_reduce; +use function array_unique; use function assert; +use function count; +use function date; use function explode; use function implode; +use function intdiv; +use function is_array; +use function max; +use function md5; +use function min; +use function redirect; +use function response; +use function route; +use function usort; +use function view; + +use const PHP_INT_MAX; /** * Class LifespansChartModule @@ -243,8 +263,8 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac usort($individuals, Individual::birthDateComparator()); // Round to whole decades - $start_year = (int) floor($this->minYear($individuals) / 10) * 10; - $end_year = (int) ceil($this->maxYear($individuals) / 10) * 10; + $start_year = intdiv($this->minYear($individuals), 10) * 10; + $end_year = intdiv($this->maxYear($individuals), 10) * 10; $lifespans = $this->layoutIndividuals($individuals); diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php index 4840c66ac1..7b7b1bf3cf 100644 --- a/app/Module/OnThisDayModule.php +++ b/app/Module/OnThisDayModule.php @@ -242,10 +242,10 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface { $default_events = implode(',', self::DEFAULT_EVENTS); - $filter = $this->getBlockSetting($block_id, 'filter', '1'); - $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); - $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT); - $events = $this->getBlockSetting($block_id, 'events', $default_events); + $filter = $this->getBlockSetting($block_id, 'filter', '1'); + $info_style = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); + $sort_style = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT); + $events = $this->getBlockSetting($block_id, 'events', $default_events); $event_array = explode(',', $events); @@ -274,9 +274,9 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface 'all_events' => $all_events, 'event_array' => $event_array, 'filter' => $filter, - 'infoStyle' => $infoStyle, + 'info_style' => $info_style, 'info_styles' => $info_styles, - 'sortStyle' => $sortStyle, + 'sort_style' => $sort_style, 'sort_styles' => $sort_styles, ]); } diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 273656a86d..3bf1731ab4 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -433,7 +433,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleChartInte /** * Possible options for the ancestors option * - * @return array<string> + * @return array<int,string> */ private function ancestorsOptions(): array { @@ -446,7 +446,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleChartInte /** * Possible options for the recursion option * - * @return array<string> + * @return array<int,string> */ private function recursionConfigOptions(): array { diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php index b9a80f6396..3ea31a09a2 100644 --- a/app/Module/TopGivenNamesModule.php +++ b/app/Module/TopGivenNamesModule.php @@ -174,8 +174,8 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface */ public function editBlockConfiguration(Tree $tree, int $block_id): string { - $num = $this->getBlockSetting($block_id, 'num', self::DEFAULT_NUMBER); - $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); + $num = $this->getBlockSetting($block_id, 'num', self::DEFAULT_NUMBER); + $info_style = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); $info_styles = [ /* I18N: An option in a list-box */ @@ -185,7 +185,7 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface ]; return view('modules/top10_givnnames/config', [ - 'infoStyle' => $infoStyle, + 'infoStyle' => $info_style, 'info_styles' => $info_styles, 'num' => $num, ]); diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php index ef58b9245c..b6c2c39a17 100644 --- a/app/Module/TopSurnamesModule.php +++ b/app/Module/TopSurnamesModule.php @@ -235,8 +235,8 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface */ public function editBlockConfiguration(Tree $tree, int $block_id): string { - $num = $this->getBlockSetting($block_id, 'num', self::DEFAULT_NUMBER); - $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); + $num = $this->getBlockSetting($block_id, 'num', self::DEFAULT_NUMBER); + $info_style = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); $info_styles = [ /* I18N: An option in a list-box */ @@ -251,7 +251,7 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface return view('modules/top10_surnames/config', [ 'num' => $num, - 'infoStyle' => $infoStyle, + 'infoStyle' => $info_style, 'info_styles' => $info_styles, ]); } diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php index 7e4bde1c08..dfda30e265 100644 --- a/app/Module/UpcomingAnniversariesModule.php +++ b/app/Module/UpcomingAnniversariesModule.php @@ -256,11 +256,11 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI { $default_events = implode(',', self::DEFAULT_EVENTS); - $days = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS); - $filter = $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER); - $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); - $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT); - $events = $this->getBlockSetting($block_id, 'events', $default_events); + $days = (int) $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS); + $filter = $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER); + $info_style = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); + $sort_style = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT); + $events = $this->getBlockSetting($block_id, 'events', $default_events); $event_array = explode(',', $events); @@ -288,10 +288,10 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI 'days' => $days, 'event_array' => $event_array, 'filter' => $filter, - 'infoStyle' => $infoStyle, + 'info_style' => $info_style, 'info_styles' => $info_styles, 'max_days' => self::MAX_DAYS, - 'sortStyle' => $sortStyle, + 'sort_style' => $sort_style, 'sort_styles' => $sort_styles, ]); } diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php index 0e31189715..40c50819ed 100644 --- a/app/Services/AdminService.php +++ b/app/Services/AdminService.php @@ -106,7 +106,7 @@ class AdminService /** * @param Tree $tree * - * @return array<string,array<GedcomRecord>> + * @return array<string,array<int,array<int,GedcomRecord>>> */ public function duplicateRecords(Tree $tree): array { diff --git a/app/Services/HomePageService.php b/app/Services/HomePageService.php index 9b24702a8c..7fa7691a6f 100644 --- a/app/Services/HomePageService.php +++ b/app/Services/HomePageService.php @@ -199,7 +199,7 @@ class HomePageService * @param UserInterface $user * @param string $location "main" or "side" * - * @return Collection<string,ModuleBlockInterface> + * @return Collection<int,ModuleBlockInterface> */ public function treeBlocks(Tree $tree, UserInterface $user, string $location): Collection { @@ -249,7 +249,7 @@ class HomePageService * @param UserInterface $user * @param string $location "main" or "side" * - * @return Collection<string,ModuleBlockInterface> + * @return Collection<int,ModuleBlockInterface> */ public function userBlocks(Tree $tree, UserInterface $user, string $location): Collection { @@ -409,10 +409,10 @@ class HomePageService /** * Take a list of block names, and return block (module) objects. * - * @param Collection<string> $blocks - * @param Collection<string,ModuleBlockInterface> $active_blocks + * @param Collection<string> $blocks + * @param Collection<int,ModuleBlockInterface> $active_blocks * - * @return Collection<string,ModuleBlockInterface> + * @return Collection<int,ModuleBlockInterface> */ private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 3b5eda5833..959e871f52 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1675,7 +1675,12 @@ parameters: path: app/Services/HomePageService.php - - message: "#^Method Fisharebest\\\\Webtrees\\\\Services\\\\HomePageService\\:\\:filterActiveBlocks\\(\\) should return Illuminate\\\\Support\\\\Collection&iterable\\<string, Fisharebest\\\\Webtrees\\\\Module\\\\ModuleBlockInterface\\> but returns Illuminate\\\\Support\\\\Collection&iterable\\<string\\>\\.$#" + message: "#^Parameter \\#2 \\$active_blocks of method Fisharebest\\\\Webtrees\\\\Services\\\\HomePageService\\:\\:filterActiveBlocks\\(\\) expects Illuminate\\\\Support\\\\Collection&iterable\\<int, Fisharebest\\\\Webtrees\\\\Module\\\\ModuleBlockInterface\\>, Illuminate\\\\Support\\\\Collection&iterable\\<string, Fisharebest\\\\Webtrees\\\\Module\\\\ModuleBlockInterface\\> given\\.$#" + count: 2 + path: app/Services/HomePageService.php + + - + message: "#^Method Fisharebest\\\\Webtrees\\\\Services\\\\HomePageService\\:\\:filterActiveBlocks\\(\\) should return Illuminate\\\\Support\\\\Collection&iterable\\<int, Fisharebest\\\\Webtrees\\\\Module\\\\ModuleBlockInterface\\> but returns Illuminate\\\\Support\\\\Collection&iterable\\<string\\>\\.$#" count: 1 path: app/Services/HomePageService.php diff --git a/resources/views/admin/analytics-edit.phtml b/resources/views/admin/analytics-edit.phtml index ac27c8dff7..6dea388287 100644 --- a/resources/views/admin/analytics-edit.phtml +++ b/resources/views/admin/analytics-edit.phtml @@ -5,6 +5,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAnalyticsPage; use Fisharebest\Webtrees\I18N; +/** + * @var string $action + * @var string $form_fields + * @var string $preview + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), route(ModulesAllPage::class) => I18N::translate('Modules'), route(ModulesAnalyticsPage::class) => I18N::translate('Tracking and analytics'), $title]]) ?> diff --git a/resources/views/admin/broadcast.phtml b/resources/views/admin/broadcast.phtml index 2c54197542..2c117a6375 100644 --- a/resources/views/admin/broadcast.phtml +++ b/resources/views/admin/broadcast.phtml @@ -1,9 +1,20 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\BroadcastAction; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var string $body + * @var UserInterface $from + * @var string $subject + * @var string $title + * @var string $to + * @var Collection<string> $to_names + */ ?> diff --git a/resources/views/admin/changes-log.phtml b/resources/views/admin/changes-log.phtml index 5baa13b712..3e02668a3e 100644 --- a/resources/views/admin/changes-log.phtml +++ b/resources/views/admin/changes-log.phtml @@ -7,6 +7,24 @@ use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesLogDelete; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesLogDownload; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesLogPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $earliest + * @var string $from + * @var string $latest + * @var array<string,string> $statuses + * @var string $newged + * @var string $oldged + * @var string $title + * @var string $to + * @var Tree $tree + * @var array<string,string> $trees + * @var string $type + * @var string $username + * @var array<string,string> $users + * @var string $xref + */ ?> diff --git a/resources/views/admin/clean-data.phtml b/resources/views/admin/clean-data.phtml index d9866524ef..f04946ed63 100644 --- a/resources/views/admin/clean-data.phtml +++ b/resources/views/admin/clean-data.phtml @@ -4,6 +4,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\DeletePath; use Fisharebest\Webtrees\I18N; +/** + * @var array<string> $entries + * @var array<string> $protected + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/email-page.phtml b/resources/views/admin/email-page.phtml index b70a6c11b7..2fa91dba11 100644 --- a/resources/views/admin/email-page.phtml +++ b/resources/views/admin/email-page.phtml @@ -1,10 +1,19 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\EmailPreferencesAction; use Fisharebest\Webtrees\Http\RequestHandlers\UserListPage; use Fisharebest\Webtrees\I18N; +/** + * @var string $body + * @var UserInterface $from + * @var string $subject + * @var string $title + * @var UserInterface $to + */ + ?> <?= view('components/breadcrumbs', ['links' => [ diff --git a/resources/views/admin/external-module-info.phtml b/resources/views/admin/external-module-info.phtml index 5a0a2b18ad..9de9717045 100644 --- a/resources/views/admin/external-module-info.phtml +++ b/resources/views/admin/external-module-info.phtml @@ -1,3 +1,12 @@ +<?php + +use Fisharebest\Webtrees\Module\ModuleExternalUrlInterface; + +/** + * @var ModuleExternalUrlInterface $module + */ + +?> <div class="wt-external-module-info"> <a href="<?= e($module->externalUrl()) ?>"> <?= e($module->externalUrl()) ?> diff --git a/resources/views/admin/fix-level-0-media.phtml b/resources/views/admin/fix-level-0-media.phtml index 3f9d3f30d7..585600b083 100644 --- a/resources/views/admin/fix-level-0-media.phtml +++ b/resources/views/admin/fix-level-0-media.phtml @@ -5,6 +5,10 @@ use Fisharebest\Webtrees\Http\RequestHandlers\FixLevel0MediaAction; use Fisharebest\Webtrees\Http\RequestHandlers\FixLevel0MediaData; use Fisharebest\Webtrees\I18N; +/** + * @var string $title + */ + ?> <?php use Fisharebest\Webtrees\View; ?> diff --git a/resources/views/admin/import-complete.phtml b/resources/views/admin/import-complete.phtml index 4fcf15e068..f4ad47fe97 100644 --- a/resources/views/admin/import-complete.phtml +++ b/resources/views/admin/import-complete.phtml @@ -1,3 +1,12 @@ +<?php + +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ + +?> <script> $("#import<?= e($tree->id()) ?>").addClass("d-none"); $("#actions<?= e($tree->id()) ?>").removeClass("d-none"); diff --git a/resources/views/admin/import-fail.phtml b/resources/views/admin/import-fail.phtml index 766898a09e..a6b9136cd8 100644 --- a/resources/views/admin/import-fail.phtml +++ b/resources/views/admin/import-fail.phtml @@ -1,3 +1,13 @@ +<?php + +use Fisharebest\Webtrees\Tree; + +/** + * @var string $error + * @var Tree $tree + */ + +?> <div class="alert alert-danger"> <?= $error ?> </div> diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml index 53199ab65e..ba1de7d264 100644 --- a/resources/views/admin/import-progress.phtml +++ b/resources/views/admin/import-progress.phtml @@ -2,6 +2,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\GedcomLoad; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $errors + * @var float $progress + * @var Tree $tree + */ ?> diff --git a/resources/views/admin/media-upload.phtml b/resources/views/admin/media-upload.phtml index aaef96435f..bc8e363bae 100644 --- a/resources/views/admin/media-upload.phtml +++ b/resources/views/admin/media-upload.phtml @@ -4,6 +4,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageMediaPage; use Fisharebest\Webtrees\Http\RequestHandlers\UploadMediaPage; use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var string $filesize + * @var int $max_upload_files + * @var Collection<string,string> $media_folders + * @var string $title + */ ?> @@ -51,7 +59,7 @@ use Fisharebest\Webtrees\I18N; <span class="sr-only"><?= e($i) ?></span> </label> <div class="col-sm-9"> - <select class="form-control" id="folder_list<?= e($i) ?>"name="folder<?= e($i) ?>"> + <select class="form-control" id="folder_list<?= e($i) ?>" name="folder<?= e($i) ?>"> <?php foreach ($media_folders as $media_folder) : ?> <option value="<?= e($media_folder) ?>"> <?= e($media_folder) ?> diff --git a/resources/views/admin/merge-records-step-1.phtml b/resources/views/admin/merge-records-step-1.phtml index ae41ed574c..31ce4c36cb 100644 --- a/resources/views/admin/merge-records-step-1.phtml +++ b/resources/views/admin/merge-records-step-1.phtml @@ -1,11 +1,38 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\Http\RequestHandlers\MergeRecordsAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Media; +use Fisharebest\Webtrees\Note; +use Fisharebest\Webtrees\Repository; +use Fisharebest\Webtrees\Source; +use Fisharebest\Webtrees\Submitter; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var Family|null $family1 + * @var Family|null $family2 + * @var Individual|null $individual1 + * @var Individual|null $individual2 + * @var Media|null $media1 + * @var Media|null $media2 + * @var Note|null $note1 + * @var Note|null $note2 + * @var Repository|null $repository1 + * @var Repository|null $repository2 + * @var Source|null $source1 + * @var Source|null $source2 + * @var Submitter|null $submitter1 + * @var Submitter|null $submitter2 + * @var string $title + * @var Tree $tree + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), route(ManageTrees::class, ['tree' => $tree->name()]) => I18N::translate('Manage family trees'), $title]]) ?> diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml index 184430eefa..437f3f92b4 100644 --- a/resources/views/admin/merge-records-step-2.phtml +++ b/resources/views/admin/merge-records-step-2.phtml @@ -1,10 +1,22 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\Http\RequestHandlers\MergeFactsAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var array<Fact> $facts + * @var array<Fact> $facts1 + * @var array<Fact> $facts2 + * @var string $title + * @var GedcomRecord $record1 + * @var GedcomRecord $record2 + * @var Tree $tree + */ ?> diff --git a/resources/views/admin/server-information.phtml b/resources/views/admin/server-information.phtml index d71e4119fa..2388bebd3c 100644 --- a/resources/views/admin/server-information.phtml +++ b/resources/views/admin/server-information.phtml @@ -3,6 +3,11 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; +/** + * @var string $phpinfo + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/site-logs.phtml b/resources/views/admin/site-logs.phtml index d0d6c0bf5a..f95ef557e0 100644 --- a/resources/views/admin/site-logs.phtml +++ b/resources/views/admin/site-logs.phtml @@ -7,6 +7,22 @@ use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsDownload; use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsPage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var string $earliest + * @var string $from + * @var string $ip + * @var string $latest + * @var string $title + * @var string $to + * @var string $text + * @var string $tree + * @var Collection<string,string> $tree_options + * @var string $type + * @var string $username + * @var Collection<string,string> $user_options + */ ?> diff --git a/resources/views/admin/trees-check.phtml b/resources/views/admin/trees-check.phtml index 9f487b7fe8..4779d7bc54 100644 --- a/resources/views/admin/trees-check.phtml +++ b/resources/views/admin/trees-check.phtml @@ -3,6 +3,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var array<string> $errors + * @var string $title + * @var Tree $tree + * @var array<string> $warnings + */ ?> diff --git a/resources/views/admin/trees-create.phtml b/resources/views/admin/trees-create.phtml index df915fc775..37c1f7fcd4 100644 --- a/resources/views/admin/trees-create.phtml +++ b/resources/views/admin/trees-create.phtml @@ -4,6 +4,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\CreateTreeAction; use Fisharebest\Webtrees\I18N; +/** + * @var string $title + * @var string $tree_name + * @var string $tree_title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/trees-duplicates.phtml b/resources/views/admin/trees-duplicates.phtml index 2216f62fd6..a8488be6c6 100644 --- a/resources/views/admin/trees-duplicates.phtml +++ b/resources/views/admin/trees-duplicates.phtml @@ -1,9 +1,17 @@ <?php +use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\Http\RequestHandlers\MergeFactsPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var array<string,array<int,array<int,GedcomRecord>>> $duplicates + * @var Tree $tree + * @var string $title + */ ?> diff --git a/resources/views/admin/trees-export.phtml b/resources/views/admin/trees-export.phtml index bd6c803aea..dc1f4f8a9f 100644 --- a/resources/views/admin/trees-export.phtml +++ b/resources/views/admin/trees-export.phtml @@ -5,6 +5,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ExportGedcomClient; use Fisharebest\Webtrees\Http\RequestHandlers\ExportGedcomServer; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/admin/trees-merge.phtml b/resources/views/admin/trees-merge.phtml index 96f2359d93..0b29ae69e8 100644 --- a/resources/views/admin/trees-merge.phtml +++ b/resources/views/admin/trees-merge.phtml @@ -8,8 +8,8 @@ use Fisharebest\Webtrees\Tree; /** * @var string $title - * @var Tree $tree1 - * @var Tree $tree2 + * @var Tree|null $tree1 + * @var Tree|null $tree2 * @var array<string,string> $tree_list * @var int $xrefs */ @@ -47,8 +47,8 @@ use Fisharebest\Webtrees\Tree; <p class="form-inline"> <?= I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */ 'Copy all the records from %1$s into %2$s.', - view('components/select', ['name' => 'tree1_name', 'selected' => $tree1 ? $tree1->name() : '', 'options' => $tree_list]), - view('components/select', ['name' => 'tree2_name', 'selected' => $tree2 ? $tree2->name() : '', 'options' => $tree_list]) + view('components/select', ['name' => 'tree1_name', 'selected' => $tree1 instanceof Tree ? $tree1->name() : '', 'options' => $tree_list]), + view('components/select', ['name' => 'tree2_name', 'selected' => $tree2 instanceof Tree ? $tree2->name() : '', 'options' => $tree_list]) ) ?> </p> diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml index f4ad01d983..8eb17fd920 100644 --- a/resources/views/admin/trees-preferences.phtml +++ b/resources/views/admin/trees-preferences.phtml @@ -1,11 +1,40 @@ <?php use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\Http\RequestHandlers\TreePreferencesAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var array<string,string> $all_fam_facts + * @var array<string,string> $all_indi_facts + * @var array<string,string> $all_name_facts + * @var array<string,string> $all_plac_facts + * @var array<string,string> $all_repo_facts + * @var array<string,string> $all_sour_facts + * @var array<string,string> $all_surname_traditions + * @var array<int,string> $calendar_formats + * @var string $data_folder + * @var array<int,string> $formats + * @var Date $french_calendar_end + * @var Date $french_calendar_start + * @var Date $gregorian_calendar_start + * @var Collection<UserInterface> $members + * @var Individual|null $pedigree_individual + * @var array<int,string> $privacy_options + * @var array<int,string> $relatives_events + * @var array<int,string> $source_types + * @var array<string,string> $surname_list_styles + * @var string $title + * @var Tree $tree + * @var int $tree_count + */ ?> diff --git a/resources/views/admin/trees-privacy.phtml b/resources/views/admin/trees-privacy.phtml index d6f1670c62..364c115583 100644 --- a/resources/views/admin/trees-privacy.phtml +++ b/resources/views/admin/trees-privacy.phtml @@ -5,8 +5,18 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ManageTrees; use Fisharebest\Webtrees\Http\RequestHandlers\TreePrivacyAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var array<string,string> $all_tags + * @var int $count_trees + * @var array<string,string> $privacy_constants + * @var array<int,object> $privacy_restrictions + * @var string $title + * @var Tree $tree + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), route(ManageTrees::class, ['tree' => $tree->name()]) => I18N::translate('Manage family trees'), $title]]) ?> diff --git a/resources/views/admin/upgrade/steps.phtml b/resources/views/admin/upgrade/steps.phtml index 451dc93f59..c2cb42f2c1 100644 --- a/resources/views/admin/upgrade/steps.phtml +++ b/resources/views/admin/upgrade/steps.phtml @@ -4,6 +4,11 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var array<string,string> $steps + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/upgrade/wizard.phtml b/resources/views/admin/upgrade/wizard.phtml index 845652ad31..5d5c1eb612 100644 --- a/resources/views/admin/upgrade/wizard.phtml +++ b/resources/views/admin/upgrade/wizard.phtml @@ -4,6 +4,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\UpgradeWizardConfirm; use Fisharebest\Webtrees\I18N; +/** + * @var string $current_version + * @var string $latest_version + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/users-cleanup.phtml b/resources/views/admin/users-cleanup.phtml index 014b83db5f..60f5125b5a 100644 --- a/resources/views/admin/users-cleanup.phtml +++ b/resources/views/admin/users-cleanup.phtml @@ -7,6 +7,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\UserEditPage; use Fisharebest\Webtrees\Http\RequestHandlers\UserListPage; use Fisharebest\Webtrees\Http\RequestHandlers\UsersCleanupAction; use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var Collection<UserInterface> $inactive_users + * @var string $title + * @var Collection<UserInterface> $unverified_users + */ ?> diff --git a/resources/views/admin/users-create.phtml b/resources/views/admin/users-create.phtml index b6453e4a40..4f6caca596 100644 --- a/resources/views/admin/users-create.phtml +++ b/resources/views/admin/users-create.phtml @@ -6,6 +6,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\UserListPage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var string $email + * @var string $real_name + * @var string $title + * @var string $username + */ + ?> <?= view('components/breadcrumbs', ['links' => [ diff --git a/resources/views/admin/users-edit.phtml b/resources/views/admin/users-edit.phtml index 3f56759416..222344021c 100644 --- a/resources/views/admin/users-edit.phtml +++ b/resources/views/admin/users-edit.phtml @@ -2,12 +2,25 @@ use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; +use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\UserEditAction; use Fisharebest\Webtrees\Http\RequestHandlers\UserListPage; -use Fisharebest\Webtrees\Registry; -use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Registry; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var array<string,string> $contact_methods + * @var string $default_language + * @var array<string,string> $languages + * @var array<string,string> $roles + * @var array<string,string> $theme_options + * @var string $title + * @var Collection<Tree> $trees + * @var UserInterface $user + */ ?> diff --git a/resources/views/admin/users.phtml b/resources/views/admin/users.phtml index faf8cb0706..3ce378c63d 100644 --- a/resources/views/admin/users.phtml +++ b/resources/views/admin/users.phtml @@ -5,6 +5,11 @@ use Fisharebest\Webtrees\Http\RequestHandlers\UserListData; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var string $filter + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/admin/webtrees1-thumbnails-form.phtml b/resources/views/admin/webtrees1-thumbnails-form.phtml index 5b30472a76..6714be83d2 100644 --- a/resources/views/admin/webtrees1-thumbnails-form.phtml +++ b/resources/views/admin/webtrees1-thumbnails-form.phtml @@ -4,6 +4,11 @@ use Fisharebest\Webtrees\Http\RequestHandlers\DeletePath; use Fisharebest\Webtrees\Http\RequestHandlers\ImportThumbnailsAction; use Fisharebest\Webtrees\I18N; +/** + * @var int $difference + * @var string $thumbnail + */ + ?> <div class="btn-group"> diff --git a/resources/views/admin/webtrees1-thumbnails.phtml b/resources/views/admin/webtrees1-thumbnails.phtml index 243c31a152..b02539daf6 100644 --- a/resources/views/admin/webtrees1-thumbnails.phtml +++ b/resources/views/admin/webtrees1-thumbnails.phtml @@ -5,6 +5,10 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ImportThumbnailsData; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/calendar-page.phtml b/resources/views/calendar-page.phtml index 3cde5f8bee..6c43f6a806 100644 --- a/resources/views/calendar-page.phtml +++ b/resources/views/calendar-page.phtml @@ -7,6 +7,7 @@ use Fisharebest\Webtrees\Http\RequestHandlers\CalendarAction; use Fisharebest\Webtrees\Http\RequestHandlers\CalendarEvents; use Fisharebest\Webtrees\Http\RequestHandlers\CalendarPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; /** * @var string $cal @@ -22,6 +23,7 @@ use Fisharebest\Webtrees\I18N; * @var string $title * @var AbstractCalendarDate $today * @var string $today_month + * @var Tree $tree * @var string $view * @var int $year */ diff --git a/resources/views/captcha.phtml b/resources/views/captcha.phtml index 434daf4d7e..cc0db8b8d4 100644 --- a/resources/views/captcha.phtml +++ b/resources/views/captcha.phtml @@ -1,3 +1,12 @@ +<?php + +/** + * @var string $x + * @var string $y + * @var string $z + */ + +?> <input type="text" name="<?= e($x) ?>" class="d-none" aria-label="field1" value="ok"> <input type="text" name="<?= e($y) ?>" class="d-none" aria-label="field2" value="<?= e($z) ?>"> diff --git a/resources/views/cards/add-associate.phtml b/resources/views/cards/add-associate.phtml index 89288f8718..e69e934f9e 100644 --- a/resources/views/cards/add-associate.phtml +++ b/resources/views/cards/add-associate.phtml @@ -2,6 +2,13 @@ use Fisharebest\Webtrees\Functions\FunctionsEdit; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $id + * @var int $level + * @var Tree $tree + */ ?> diff --git a/resources/views/cards/add-fact.phtml b/resources/views/cards/add-fact.phtml index 628da3df42..e8ae311ecc 100644 --- a/resources/views/cards/add-fact.phtml +++ b/resources/views/cards/add-fact.phtml @@ -2,6 +2,12 @@ use Fisharebest\Webtrees\Functions\FunctionsEdit; use Fisharebest\Webtrees\GedcomTag; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $tag + * @var Tree $tree + */ ?> diff --git a/resources/views/cards/add-media-object.phtml b/resources/views/cards/add-media-object.phtml index 9ff046eede..f7dbef1153 100644 --- a/resources/views/cards/add-media-object.phtml +++ b/resources/views/cards/add-media-object.phtml @@ -1,9 +1,15 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $level + * @var Tree $tree + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4"> <a class="card-header" href="#" data-toggle="collapse" data-target="#add-media-object" aria-expanded="false" aria-controls="add-media-object"> diff --git a/resources/views/cards/add-note.phtml b/resources/views/cards/add-note.phtml index 7735d49882..85316052d5 100644 --- a/resources/views/cards/add-note.phtml +++ b/resources/views/cards/add-note.phtml @@ -1,9 +1,15 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $level + * @var Tree $tree + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4"> <a class="card-header" href="#" data-toggle="collapse" data-target="#add-note" aria-expanded="false" aria-controls="add-note"> diff --git a/resources/views/cards/add-restriction.phtml b/resources/views/cards/add-restriction.phtml index 3b546beff8..263ed56c33 100644 --- a/resources/views/cards/add-restriction.phtml +++ b/resources/views/cards/add-restriction.phtml @@ -1,9 +1,15 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $level + * @var Tree $tree + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4"> <a class="card-header" href="#" data-toggle="collapse" data-target="#add-restriction" aria-expanded="false" aria-controls="add-restriction"> diff --git a/resources/views/cards/add-shared-note.phtml b/resources/views/cards/add-shared-note.phtml index dc421f2334..03cf4c4124 100644 --- a/resources/views/cards/add-shared-note.phtml +++ b/resources/views/cards/add-shared-note.phtml @@ -1,9 +1,15 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $level + * @var Tree $tree + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4"> <a class="card-header" href="#" data-toggle="collapse" data-target="#add-note-object" aria-expanded="false" aria-controls="add-note-object"> diff --git a/resources/views/cards/add-sour-data-even.phtml b/resources/views/cards/add-sour-data-even.phtml index 49df77bb87..943e2b153b 100644 --- a/resources/views/cards/add-sour-data-even.phtml +++ b/resources/views/cards/add-sour-data-even.phtml @@ -1,9 +1,14 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <div class="card mb-4"> <a class="card-header" href="#" data-toggle="collapse" data-target="#add-sour-data-even-object" aria-expanded="false" aria-controls="add-sour-data-even-object"> @@ -11,8 +16,8 @@ use Fisharebest\Webtrees\Functions\FunctionsEdit; </a> <div class="card-body collapse" id="add-sour-data-even-object"> - <?= FunctionsEdit::addSimpleTag($tree, 2 . ' EVEN') ?> - <?= FunctionsEdit::addSimpleTag($tree, 3 . ' DATE') ?> - <?= FunctionsEdit::addSimpleTag($tree, 3 . ' PLAC') ?> + <?= FunctionsEdit::addSimpleTag($tree, '2 EVEN') ?> + <?= FunctionsEdit::addSimpleTag($tree, '3 DATE') ?> + <?= FunctionsEdit::addSimpleTag($tree, '3 PLAC') ?> </div> </div> diff --git a/resources/views/cards/add-source-citation.phtml b/resources/views/cards/add-source-citation.phtml index 348269a8fa..bcc3c744e7 100644 --- a/resources/views/cards/add-source-citation.phtml +++ b/resources/views/cards/add-source-citation.phtml @@ -5,8 +5,19 @@ use Fisharebest\Webtrees\Functions\FunctionsEdit; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomTag; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; +/** + * @var string $bdm + * @var bool $full_citations + * @var int $level + * @var string $prefer_level2_sources + * @var string $quick_required_facts + * @var string $quick_required_famfacts + * @var Tree $tree + */ + ?> <div class="card mb-4"> diff --git a/resources/views/components/alert-danger.phtml b/resources/views/components/alert-danger.phtml index 3eb5e08e2e..46b8438628 100644 --- a/resources/views/components/alert-danger.phtml +++ b/resources/views/components/alert-danger.phtml @@ -1 +1,8 @@ +<?php + +/** + * @var string $alert + */ + +?> <div class="alert alert-danger" role="alert" style="white-space: pre-wrap;"><?= $alert ?></div> diff --git a/resources/views/components/alert-success.phtml b/resources/views/components/alert-success.phtml index 225d170e69..afba5ab705 100644 --- a/resources/views/components/alert-success.phtml +++ b/resources/views/components/alert-success.phtml @@ -1 +1,8 @@ +<?php + +/** + * @var string $alert + */ + +?> <div class="alert alert-success" role="alert" style="white-space: pre-wrap;"><?= $alert ?></div> diff --git a/resources/views/components/alert-warning-dismissible.phtml b/resources/views/components/alert-warning-dismissible.phtml index ef727ccd07..cf2b3e1a3f 100644 --- a/resources/views/components/alert-warning-dismissible.phtml +++ b/resources/views/components/alert-warning-dismissible.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $alert + */ + ?> <div class="alert alert-warning alert-dismissible fade show" role="alert"> diff --git a/resources/views/components/badge.phtml b/resources/views/components/badge.phtml index 01d5f4ce6b..02e6ab699c 100644 --- a/resources/views/components/badge.phtml +++ b/resources/views/components/badge.phtml @@ -2,6 +2,12 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string|null $context + * @var int $count + * @var int|null $total + */ + ?> <span class="badge badge-<?= $context ?? 'secondary' ?>"> diff --git a/resources/views/components/breadcrumbs.phtml b/resources/views/components/breadcrumbs.phtml index f61a17c781..6fad789ebc 100644 --- a/resources/views/components/breadcrumbs.phtml +++ b/resources/views/components/breadcrumbs.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var array<string|int,string> $links + */ + +?> <nav class="wt-breadcrumbs" aria-label="breadcrumb" role="navigation"> <ol class="breadcrumb small py-2"> <?php foreach ($links as $url => $label) : ?> diff --git a/resources/views/contact-page.phtml b/resources/views/contact-page.phtml index 68ca5a70d0..467d231aeb 100644 --- a/resources/views/contact-page.phtml +++ b/resources/views/contact-page.phtml @@ -2,6 +2,20 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ContactAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $body + * @var string $captcha + * @var string $from_email + * @var string $from_name + * @var string $subject + * @var string $title + * @var string $to + * @var string $to_name + * @var string $url + * @var Tree $tree + */ ?> diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml index d4105a479d..72523b87b7 100644 --- a/resources/views/edit-account-page.phtml +++ b/resources/views/edit-account-page.phtml @@ -3,9 +3,22 @@ use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\AccountDelete; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var array<string,string> $contact_methods + * @var Individual|null $default_individual + * @var array<string,string> $languages + * @var Individual|null $my_individual_record + * @var bool $show_delete_option + * @var array<string,string> $timezones + * @var string $title + * @var Tree|null $tree + * @var UserInterface $user + */ + ?> <h2 class="wt-page-title"> diff --git a/resources/views/edit-blocks-block.phtml b/resources/views/edit-blocks-block.phtml index 639323d822..27077d3851 100644 --- a/resources/views/edit-blocks-block.phtml +++ b/resources/views/edit-blocks-block.phtml @@ -1,6 +1,12 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Module\ModuleBlockInterface; + +/** + * @var ModuleBlockInterface $block + * @var int|string $block_id + */ ?> diff --git a/resources/views/edit-blocks-page.phtml b/resources/views/edit-blocks-page.phtml index dd09f48419..2cfc2c9f74 100644 --- a/resources/views/edit-blocks-page.phtml +++ b/resources/views/edit-blocks-page.phtml @@ -1,7 +1,19 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var Collection<string,ModuleBlockInterface> $all_blocks + * @var bool $can_reset + * @var Collection<int,ModuleBlockInterface> $main_blocks + * @var Collection<int,ModuleBlockInterface> $side_blocks + * @var string $title + * @var string $url_cancel + * @var string $url_save + */ ?> 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"> diff --git a/resources/views/emails/approve-user-html.phtml b/resources/views/emails/approve-user-html.phtml index 233a6e76ff..024af5cae4 100644 --- a/resources/views/emails/approve-user-html.phtml +++ b/resources/views/emails/approve-user-html.phtml @@ -1,7 +1,13 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $base_url + * @var UserInterface $user + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/emails/approve-user-text.phtml b/resources/views/emails/approve-user-text.phtml index 1e5b699b2e..73438304fa 100644 --- a/resources/views/emails/approve-user-text.phtml +++ b/resources/views/emails/approve-user-text.phtml @@ -1,8 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $base_url + * @var UserInterface $user + */ + ?> -?= I18N::translate('Hello %s…', $user->realName()) ?> +<?= I18N::translate('Hello %s…', $user->realName()) ?> <?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', $base_url, $base_url) ?> diff --git a/resources/views/emails/message-copy-html.phtml b/resources/views/emails/message-copy-html.phtml index f5676f4ad3..e4b18b6ab3 100644 --- a/resources/views/emails/message-copy-html.phtml +++ b/resources/views/emails/message-copy-html.phtml @@ -1,7 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $message + * @var UserInterface $recipient + * @var UserInterface $sender + * @var string $url + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> <p> diff --git a/resources/views/emails/message-copy-text.phtml b/resources/views/emails/message-copy-text.phtml index 47e292c204..56c01f63eb 100644 --- a/resources/views/emails/message-copy-text.phtml +++ b/resources/views/emails/message-copy-text.phtml @@ -1,7 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $message + * @var UserInterface $recipient + * @var UserInterface $sender + * @var string $url + */ + ?> <?= I18N::translate('Hello %s…', $sender->realName()) ?> diff --git a/resources/views/emails/message-user-html.phtml b/resources/views/emails/message-user-html.phtml index cc64365da6..1bdef69613 100644 --- a/resources/views/emails/message-user-html.phtml +++ b/resources/views/emails/message-user-html.phtml @@ -1,7 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $message + * @var UserInterface $recipient + * @var UserInterface $sender + * @var string $url + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> <p> diff --git a/resources/views/emails/message-user-text.phtml b/resources/views/emails/message-user-text.phtml index 7b9deaaf5c..8f1c71c173 100644 --- a/resources/views/emails/message-user-text.phtml +++ b/resources/views/emails/message-user-text.phtml @@ -1,7 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $message + * @var UserInterface $recipient + * @var UserInterface $sender + * @var string $url + */ + ?> <?= I18N::translate('Hello %s…', $recipient->realName()) ?> diff --git a/resources/views/emails/password-request-html.phtml b/resources/views/emails/password-request-html.phtml index 1b9b2acf53..e7930a897f 100644 --- a/resources/views/emails/password-request-html.phtml +++ b/resources/views/emails/password-request-html.phtml @@ -1,7 +1,13 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $url + * @var UserInterface $user + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> <p> diff --git a/resources/views/emails/password-request-text.phtml b/resources/views/emails/password-request-text.phtml index 42de45ed63..1d570cba97 100644 --- a/resources/views/emails/password-request-text.phtml +++ b/resources/views/emails/password-request-text.phtml @@ -1,7 +1,13 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $url + * @var UserInterface $user + */ + ?> <?= I18N::translate('Hello %s…', e($user->realName())) ?> diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml index 9b08542f10..0ccc81e818 100644 --- a/resources/views/emails/pending-changes-html.phtml +++ b/resources/views/emails/pending-changes-html.phtml @@ -1,7 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChanges; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + * @var UserInterface $user + */ ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/emails/pending-changes-text.phtml b/resources/views/emails/pending-changes-text.phtml index 239a891254..d7ab89b8b3 100644 --- a/resources/views/emails/pending-changes-text.phtml +++ b/resources/views/emails/pending-changes-text.phtml @@ -1,7 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChanges; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + * @var UserInterface $user +*/ ?> diff --git a/resources/views/emails/register-notify-html.phtml b/resources/views/emails/register-notify-html.phtml index b46d38b7b5..f9b4df36a6 100644 --- a/resources/views/emails/register-notify-html.phtml +++ b/resources/views/emails/register-notify-html.phtml @@ -1,6 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $base_url + * @var string $comments + * @var Tree|null $tree + * @var UserInterface $user + */ ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/emails/register-notify-text.phtml b/resources/views/emails/register-notify-text.phtml index 360808679b..6f534d47e6 100644 --- a/resources/views/emails/register-notify-text.phtml +++ b/resources/views/emails/register-notify-text.phtml @@ -1,6 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $base_url + * @var string $comments + * @var Tree|null $tree + * @var UserInterface $user + */ ?> <?= I18N::translate('Hello administrator…') ?> diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml index 1bcee55162..60b5409e9a 100644 --- a/resources/views/emails/register-user-html.phtml +++ b/resources/views/emails/register-user-html.phtml @@ -1,7 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $base_url + * @var UserInterface $user + * @var string $verify_url + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> <p> diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml index e11b8e57ac..5bbfbd2b9a 100644 --- a/resources/views/emails/register-user-text.phtml +++ b/resources/views/emails/register-user-text.phtml @@ -1,7 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +/** + * @var string $base_url + * @var UserInterface $user + * @var string $verify_url + */ + ?> <?= I18N::translate('Hello %s…', $user->realName()) ?> diff --git a/resources/views/emails/verify-notify-html.phtml b/resources/views/emails/verify-notify-html.phtml index 44dfacf430..603c815713 100644 --- a/resources/views/emails/verify-notify-html.phtml +++ b/resources/views/emails/verify-notify-html.phtml @@ -1,8 +1,13 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\UserEditPage; use Fisharebest\Webtrees\I18N; +/** + * @var UserInterface $user + */ + ?> <div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> <p> diff --git a/resources/views/emails/verify-notify-text.phtml b/resources/views/emails/verify-notify-text.phtml index 10e3ade683..bf2b1a4563 100644 --- a/resources/views/emails/verify-notify-text.phtml +++ b/resources/views/emails/verify-notify-text.phtml @@ -1,8 +1,13 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\UserEditPage; use Fisharebest\Webtrees\I18N; +/** + * @var UserInterface $user + */ + ?> <?= I18N::translate('Hello administrator…') ?> diff --git a/resources/views/errors/database-connection.phtml b/resources/views/errors/database-connection.phtml index 5ed9e3caab..9644a4e26f 100644 --- a/resources/views/errors/database-connection.phtml +++ b/resources/views/errors/database-connection.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $error + */ + ?> <div class="content"> diff --git a/resources/views/errors/database-error.phtml b/resources/views/errors/database-error.phtml index 964cfd3f1c..c09bca43ea 100644 --- a/resources/views/errors/database-error.phtml +++ b/resources/views/errors/database-error.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $error + */ + ?> <p> diff --git a/resources/views/errors/image-svg.phtml b/resources/views/errors/image-svg.phtml index 0a51d5a45c..9dc3e2f9c5 100644 --- a/resources/views/errors/image-svg.phtml +++ b/resources/views/errors/image-svg.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var string $status + */ + +?> <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"> <rect width="100" height="100" fill="#F88" /> <text x="5" y="55" font-family="Verdana" font-size="35"><?= $status ?></text> diff --git a/resources/views/errors/unhandled-exception.phtml b/resources/views/errors/unhandled-exception.phtml index 8928546c63..3a12befb37 100644 --- a/resources/views/errors/unhandled-exception.phtml +++ b/resources/views/errors/unhandled-exception.phtml @@ -1 +1,8 @@ +<?php + +/** + * @var string $error + */ + +?> <pre class="alert alert-danger"><?= $error ?></pre> diff --git a/resources/views/expand-chart-box.phtml b/resources/views/expand-chart-box.phtml index 982d0a824d..4d8cac5f52 100644 --- a/resources/views/expand-chart-box.phtml +++ b/resources/views/expand-chart-box.phtml @@ -1,3 +1,13 @@ +<?php + +use Fisharebest\Webtrees\Fact; +use Illuminate\Support\Collection; + +/** + * @var Collection<Fact> $facts + */ + +?> <?php foreach ($facts as $fact) : ?> <?= $fact->summary() ?> <?php endforeach; diff --git a/resources/views/family-page-children.phtml b/resources/views/family-page-children.phtml index f55fe8509f..7920931dab 100644 --- a/resources/views/family-page-children.phtml +++ b/resources/views/family-page-children.phtml @@ -1,9 +1,14 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\AddChildToFamilyPage; use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenPage; use Fisharebest\Webtrees\I18N; +/** + * @var Family $family + */ + ?> <div class="align-self-center"> diff --git a/resources/views/family-page-grandparents.phtml b/resources/views/family-page-grandparents.phtml index 104e1ff718..75611764d4 100644 --- a/resources/views/family-page-grandparents.phtml +++ b/resources/views/family-page-grandparents.phtml @@ -1,8 +1,15 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\AddParentToIndividualPage; use Fisharebest\Webtrees\Http\RequestHandlers\AddSpouseToFamilyPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; + +/** + * @var Individual|null $individual + * @var Family|null $family + */ ?> diff --git a/resources/views/family-page-parents.phtml b/resources/views/family-page-parents.phtml index 3b01f067cf..1cb009b2af 100644 --- a/resources/views/family-page-parents.phtml +++ b/resources/views/family-page-parents.phtml @@ -1,7 +1,13 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\AddSpouseToFamilyPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; + +/** + * @var Family $family + */ ?> <div class="d-flex"> @@ -12,7 +18,7 @@ use Fisharebest\Webtrees\I18N; </div> <div class="align-self-center"> - <?php if ($family->husband()) : ?> + <?php if ($family->husband() instanceof Individual) : ?> <?= view('chart-box', ['individual' => $family->husband()]) ?> <?php else : ?> <div class="wt-chart-box"> @@ -34,7 +40,7 @@ use Fisharebest\Webtrees\I18N; </div> <div class="align-self-center"> - <?php if ($family->wife()) : ?> + <?php if ($family->wife() instanceof Individual) : ?> <?= view('chart-box', ['individual' => $family->wife()]) ?> <?php else : ?> <div class="wt-chart-box"> diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index b1d918ebd6..2a63e5d61c 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -1,6 +1,7 @@ <?php use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Functions\FunctionsPrint; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; @@ -8,6 +9,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord; use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var Collection<Fact> $clipboard_facts + * @var Collection<Fact> $facts + * @var Family $record + */ ?> diff --git a/resources/views/forgot-password-page.phtml b/resources/views/forgot-password-page.phtml index c2c0a27c91..0924a64f83 100644 --- a/resources/views/forgot-password-page.phtml +++ b/resources/views/forgot-password-page.phtml @@ -4,7 +4,8 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Tree; /** - * @var string $title + * @var string $title + * @var Tree|null $tree */ ?> diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml index c0aaa70eb5..fcc49f1b12 100644 --- a/resources/views/gedcom-record-page-menu.phtml +++ b/resources/views/gedcom-record-page-menu.phtml @@ -1,9 +1,14 @@ <?php +use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\Http\RequestHandlers\DeleteRecord; use Fisharebest\Webtrees\Http\RequestHandlers\EditRecordPage; use Fisharebest\Webtrees\I18N; +/** + * @var GedcomRecord $record + */ + ?> <div class="dropdown wt-page-menu"> diff --git a/resources/views/help/date.phtml b/resources/views/help/date.phtml index c7832c2cfe..61d8ef4eed 100644 --- a/resources/views/help/date.phtml +++ b/resources/views/help/date.phtml @@ -2,6 +2,19 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,string> $date_dates + * @var array<string,string> $date_period_dates + * @var array<string,string> $date_period_shortcuts + * @var array<string,string> $date_range_dates + * @var array<string,string> $date_range_shortcuts + * @var array<string,string> $date_shortcuts + * @var array<string,string> $french_dates + * @var array<string,string> $hijri_dates + * @var array<string,string> $jewish_dates + * @var array<string,string> $julian_dates + */ + ?> <p> diff --git a/resources/views/help/link.phtml b/resources/views/help/link.phtml index 04316f831c..58a0cce28e 100644 --- a/resources/views/help/link.phtml +++ b/resources/views/help/link.phtml @@ -3,6 +3,10 @@ use Fisharebest\Webtrees\Http\RequestHandlers\HelpText; use Fisharebest\Webtrees\I18N; +/** + * @var string $topic + */ + ?> <a href="#" data-toggle="modal" data-backdrop="static" data-target="#wt-ajax-modal" data-href="<?= e(route(HelpText::class, ['topic' => $topic])) ?>" title="<?= I18N::translate('Help') ?>"> <?= view('icons/help') ?> diff --git a/resources/views/help/pending-changes.phtml b/resources/views/help/pending-changes.phtml index 02a9d71837..a202e08fb7 100644 --- a/resources/views/help/pending-changes.phtml +++ b/resources/views/help/pending-changes.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var bool $is_admin + */ + ?> <p> diff --git a/resources/views/icons/mime.phtml b/resources/views/icons/mime.phtml index 78f20390c3..b84a2437c4 100644 --- a/resources/views/icons/mime.phtml +++ b/resources/views/icons/mime.phtml @@ -1 +1,8 @@ +<?php + +/** + * @var string $type + */ + +?> <span class="wt-mime wt-mime-<?= e(explode('/', $type)[0]) ?> wt-mime-<?= strtr($type, '/', '-') ?>" aria-hidden="true"></span> diff --git a/resources/views/icons/sex.phtml b/resources/views/icons/sex.phtml index e977c9f8f9..c961128316 100644 --- a/resources/views/icons/sex.phtml +++ b/resources/views/icons/sex.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var string $sex + */ + +?> <?php if ($sex === 'F') : ?> <span class="wt-icon-sex wt-icon-sex-f"><i class="fas fa-venus fa-fw" aria-hidden="true"></i></span> <?php elseif ($sex === 'M') : ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index a640ad3392..732b9170cd 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -22,7 +22,7 @@ use Illuminate\Support\Collection; * @var Collection<Media> $individual_media * @var Collection<Fact> $name_records * @var Collection<Fact> $sex_records - * @var Collection<ModuleTabInterface $tabs + * @var Collection<ModuleTabInterface> $tabs * @var Tree $tree */ ?> diff --git a/resources/views/layouts/ajax.phtml b/resources/views/layouts/ajax.phtml index f516e555a6..8f953c44b3 100644 --- a/resources/views/layouts/ajax.phtml +++ b/resources/views/layouts/ajax.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\View; +/** + * @var string $content + */ + ?> <?= $content ?> diff --git a/resources/views/layouts/error.phtml b/resources/views/layouts/error.phtml index 2315304192..581ad24a7b 100644 --- a/resources/views/layouts/error.phtml +++ b/resources/views/layouts/error.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $content + */ + ?> <!DOCTYPE html> <html dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/layouts/offline.phtml b/resources/views/layouts/offline.phtml index 6c4905fcbc..e2130dc71a 100644 --- a/resources/views/layouts/offline.phtml +++ b/resources/views/layouts/offline.phtml @@ -3,6 +3,11 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Webtrees; +/** + * @var string $message + * @var string $url + */ + ?> <!DOCTYPE html> diff --git a/resources/views/layouts/report.phtml b/resources/views/layouts/report.phtml index a561f2b5ac..774593e8fb 100644 --- a/resources/views/layouts/report.phtml +++ b/resources/views/layouts/report.phtml @@ -3,6 +3,11 @@ use Fisharebest\Webtrees\DebugBar; use Fisharebest\Webtrees\I18N; +/** + * @var string $content + * @var string $title + */ + ?> <!DOCTYPE html> <html dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/layouts/setup.phtml b/resources/views/layouts/setup.phtml index 22fc9a5f8c..d7484f82a4 100644 --- a/resources/views/layouts/setup.phtml +++ b/resources/views/layouts/setup.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $content + */ + ?> <!DOCTYPE html> <html dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>"> diff --git a/resources/views/lists/anniversaries-list.phtml b/resources/views/lists/anniversaries-list.phtml index 3615fcc6d4..badf4907b4 100644 --- a/resources/views/lists/anniversaries-list.phtml +++ b/resources/views/lists/anniversaries-list.phtml @@ -9,6 +9,7 @@ use Illuminate\Support\Collection; /** * @var Collection<Fact> $facts + * @var int $id * @var int $limit_low * @var int $limit_high */ diff --git a/resources/views/lists/chart-by-age.phtml b/resources/views/lists/chart-by-age.phtml index cbd5af5523..7b42596c58 100644 --- a/resources/views/lists/chart-by-age.phtml +++ b/resources/views/lists/chart-by-age.phtml @@ -4,6 +4,11 @@ declare(strict_types=1); use Fisharebest\Webtrees\I18N; +/** + * @var array<mixed> $data + * @var string $title + */ + $chart_options = [ 'title' => '', 'subtitle' => '', diff --git a/resources/views/lists/chart-by-decade.phtml b/resources/views/lists/chart-by-decade.phtml index fdcb0b8388..f4e25dbbca 100644 --- a/resources/views/lists/chart-by-decade.phtml +++ b/resources/views/lists/chart-by-decade.phtml @@ -4,6 +4,11 @@ declare(strict_types=1); use Fisharebest\Webtrees\I18N; +/** + * @var array<mixed> $data + * @var string $title + */ + $chart_options = [ 'title' => '', 'subtitle' => '', diff --git a/resources/views/lists/given-names-list.phtml b/resources/views/lists/given-names-list.phtml index 2a959d15a2..08485fa29e 100644 --- a/resources/views/lists/given-names-list.phtml +++ b/resources/views/lists/given-names-list.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,int> $given_names + * @var bool $show_totals + */ + ?> <ul> diff --git a/resources/views/lists/given-names-table.phtml b/resources/views/lists/given-names-table.phtml index 31bbbee2fd..8877932364 100644 --- a/resources/views/lists/given-names-table.phtml +++ b/resources/views/lists/given-names-table.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,int> $given_names + * @var array<array<mixed>>|null $order + */ + ?> <table diff --git a/resources/views/lists/individual-table-parents.phtml b/resources/views/lists/individual-table-parents.phtml index b4446e41e9..5d73169f47 100644 --- a/resources/views/lists/individual-table-parents.phtml +++ b/resources/views/lists/individual-table-parents.phtml @@ -1,6 +1,11 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; + +/** + * @var Individual $individual + */ ?> diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index 7acefb0da6..78eb37b93b 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -1,9 +1,17 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Media; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; + +/** + * @var Collection<Media> $media_objects + * @var Tree $tree + */ ?> diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index 2fef0c8edb..d9573f9c62 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -1,9 +1,17 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Note; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; + +/** + * @var Collection<Note> $notes + * @var Tree $tree + */ ?> diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index f190740d18..b1c537ae79 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -1,9 +1,17 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Repository; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; + +/** + * @var Collection<Repository> $repositories + * @var Tree $tree + */ ?> diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index d8c49adc27..6dc93c4793 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -1,9 +1,17 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Source; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; + +/** + * @var Collection<Source> $sources + * @var Tree $tree + */ ?> diff --git a/resources/views/lists/submitters-table.phtml b/resources/views/lists/submitters-table.phtml index 07566a1eea..f55974fed1 100644 --- a/resources/views/lists/submitters-table.phtml +++ b/resources/views/lists/submitters-table.phtml @@ -2,9 +2,16 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Submitter; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; +use Illuminate\Support\Collection; + +/** + * @var Collection<Submitter> $submitters + * @var Tree $tree + */ ?> diff --git a/resources/views/lists/surnames-table.phtml b/resources/views/lists/surnames-table.phtml index 781d2a8b06..08a23ce65e 100644 --- a/resources/views/lists/surnames-table.phtml +++ b/resources/views/lists/surnames-table.phtml @@ -7,6 +7,7 @@ use Fisharebest\Webtrees\Tree; /** * @var bool $families * @var IndividualListModule|null $module + * @var array<array<mixed>>|null $order * @var array<string,array<string,string>> $surnames * @var Tree $tree */ diff --git a/resources/views/login-page.phtml b/resources/views/login-page.phtml index b556fc1060..3668b64cca 100644 --- a/resources/views/login-page.phtml +++ b/resources/views/login-page.phtml @@ -8,12 +8,13 @@ use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; /** - * @var string $error - * @var string $warning - * @var string $welcome - * @var string $url - * @var string $username - * @var bool $can_register + * @var bool $can_register + * @var string $error + * @var Tree|null $tree + * @var string $url + * @var string $username + * @var string $warning + * @var string $welcome */ ?> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index 7fd0fd62df..fbc6e65bbe 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -19,17 +19,18 @@ use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; +use League\Flysystem\FilesystemInterface; /** - * @var Collection<Fact $clipboard_facts - * @var \League\Flysystem\FilesystemInterface $data_filesystem - * @var Collection<Fact> $facts - * @var Collection<Family> $families - * @var Collection<Individual> $individuals - * @var Media $media - * @var Collection<Note> $notes - * @var Collection<Source> $sources - * @var Tree $tree + * @var Collection<Fact> $clipboard_facts + * @var FilesystemInterface $data_filesystem + * @var Collection<Fact> $facts + * @var Collection<Family> $families + * @var Collection<Individual> $individuals + * @var Media $media + * @var Collection<Note> $notes + * @var Collection<Source> $sources + * @var Tree $tree */ ?> diff --git a/resources/views/message-page.phtml b/resources/views/message-page.phtml index 9c90bac5e0..248d26335f 100644 --- a/resources/views/message-page.phtml +++ b/resources/views/message-page.phtml @@ -1,7 +1,19 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\MessageAction; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $body + * @var UserInterface $from + * @var string $subject + * @var UserInterface $to + * @var Tree $tree + * @var string $title + * @var string $url + */ ?> diff --git a/resources/views/modals/error.phtml b/resources/views/modals/error.phtml index 3492db8e92..aecc64dd77 100644 --- a/resources/views/modals/error.phtml +++ b/resources/views/modals/error.phtml @@ -1,3 +1,11 @@ +<?php + +/** + * @var string $error + * @var string $title + */ + +?> <?= view('modals/header', ['title' => $title]) ?> <div class="modal-body"> diff --git a/resources/views/modals/header.phtml b/resources/views/modals/header.phtml index 905c9a3242..595c3130cd 100644 --- a/resources/views/modals/header.phtml +++ b/resources/views/modals/header.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $title + */ + ?> <div class="modal-header"> diff --git a/resources/views/modals/help.phtml b/resources/views/modals/help.phtml index 14f09e0100..d51e93a597 100644 --- a/resources/views/modals/help.phtml +++ b/resources/views/modals/help.phtml @@ -1,3 +1,11 @@ +<?php + +/** + * @var string $text + * @var string $title + */ + +?> <?= view('modals/header', ['title' => $title]) ?> <div class="modal-body"> diff --git a/resources/views/modals/record-created.phtml b/resources/views/modals/record-created.phtml index 8e2d0d13bd..00b7d448b9 100644 --- a/resources/views/modals/record-created.phtml +++ b/resources/views/modals/record-created.phtml @@ -1,3 +1,12 @@ +<?php + +/** + * @var string $name + * @var string $title + * @var string $url + */ + +?> <?= view('modals/header', ['title' => $title]) ?> <div class="modal-body"> diff --git a/resources/views/modals/source-fields.phtml b/resources/views/modals/source-fields.phtml index c298ee88f9..4a292708cd 100644 --- a/resources/views/modals/source-fields.phtml +++ b/resources/views/modals/source-fields.phtml @@ -1,6 +1,11 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ ?> diff --git a/resources/views/modals/submission-fields.phtml b/resources/views/modals/submission-fields.phtml index 62112aa3c9..c3e949da18 100644 --- a/resources/views/modals/submission-fields.phtml +++ b/resources/views/modals/submission-fields.phtml @@ -1,6 +1,11 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/GEDFact_assistant/select-census.phtml b/resources/views/modules/GEDFact_assistant/select-census.phtml index 0231fb3b31..7a239a0bbc 100644 --- a/resources/views/modules/GEDFact_assistant/select-census.phtml +++ b/resources/views/modules/GEDFact_assistant/select-census.phtml @@ -1,9 +1,14 @@ <?php +use Fisharebest\Webtrees\Census\CensusPlaceInterface; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\I18N; + +/** + * @var array<CensusPlaceInterface> $census_places + */ ?> -<?php use Fisharebest\Webtrees\I18N; ?> <script> function selectCensus(el) { diff --git a/resources/views/modules/ancestors-chart/page.phtml b/resources/views/modules/ancestors-chart/page.phtml index fd28ff754b..58d74a8d4c 100644 --- a/resources/views/modules/ancestors-chart/page.phtml +++ b/resources/views/modules/ancestors-chart/page.phtml @@ -1,6 +1,20 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var int $generations + * @var Individual|null $individual + * @var int $maximum_generations + * @var int $minimum_generations + * @var string $style + * @var array<string,string> $styles + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/batch_update/admin.phtml b/resources/views/modules/batch_update/admin.phtml deleted file mode 100644 index 46665930d7..0000000000 --- a/resources/views/modules/batch_update/admin.phtml +++ /dev/null @@ -1,113 +0,0 @@ -<?php - -use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; -use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; -use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\View; - -?> - -<?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), route(ModulesAllPage::class) => I18N::translate('Module administration'), $title]]) ?> - -<h1><?= $title ?></h1> - -<form method="post" id="batch-update-form"> - <?= csrf_field() ?> - - <input type="hidden" name="xref" value="<?= $curr_xref ?>"> - - <div class="row form-group"> - <label class="col-sm-3 col-form-label"><?= I18N::translate('Family tree') ?></label> - <div class="col-sm-9"> - <?= view('components/select', ['name' => 'tree', 'selected' => $tree->name(), 'options' => $trees]) ?> - </div> - </div> - <div class="row form-group"> - <label class="col-sm-3 col-form-label"><?= I18N::translate('Batch update') ?></label> - <div class="col-sm-9"> - <select class="form-control" name="plugin"> - <?php if ($plugin === null) : ?> - <option value="" selected></option> - <?php endif ?> - - <?php foreach ($plugins as $key => $value) : ?> - <option value="<?= $key ?>" <?= ($plugin ? get_class($plugin) : null) === $key ? 'selected' : '' ?>> - <?= $value->getName() ?> - </option> - <?php endforeach ?> - </select> - - <?php if ($plugin !== null) : ?> - <p class="small text-muted"><?= $plugin->description() ?></p> - <?php endif ?> - </div> - </div> - - <?php if ($plugin !== null) : ?> - <?= $plugin->getOptionsForm() ?> - - <hr> - - <?php if ($record !== null) : ?> - <div class="row"> - <div class="col-sm-3 d-flex flex-column justify-content-between"> - <div> - <?php if ($prev_xref === null) : ?> - <button class="btn btn-primary" type="submit" disabled> - <?= I18N::translate('previous') ?> - </button> - <?php else : ?> - <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($prev_xref) ?>'"> - <?= I18N::translate('previous') ?> - </button> - <?php endif ?> - - <?php if ($next_xref === null) : ?> - <button class="btn btn-primary" type="submit" disabled> - <?= I18N::translate('next') ?> - </button> - <?php else : ?> - <button class="btn btn-primary" type="submit" onclick="this.form.xref.value='<?= e($next_xref) ?>'"> - <?= I18N::translate('next') ?> - </button> - <?php endif ?> - </div> - - <div> - <button class="btn btn-primary" type="submit" name="update" value="one" onclick="this.form.method='post'"> - <?= I18N::translate('Update') ?> - </button> - - <?php if ($auto_accept) : ?> - <button class="btn btn-primary" type="submit" name="update" value="all" onclick="this.form.method='post'"> - <?= I18N::translate('Update all') ?> - </button> - <?php else : ?> - <button class="btn btn-primary" disabled title="<?= I18N::translate('Your user account does not have “automatically accept changes” enabled. You will only be able to change one record at a time.') ?>"> - <?= I18N::translate('Update all') ?> - </button> - <?php endif ?> - </div> - </div> - <div class="col-sm-9"> - <a class="lead" href="<?= e($record->url()) ?>"> - <?= $record->fullName() ?> - </a> - <?= $plugin->getActionPreview($record) ?> - </div> - </div> - <?php else : ?> - <div class="alert alert-info"> - <?= I18N::translate('Nothing found.') ?> - </div> - <?php endif ?> - <?php endif ?> -</form> - -<?php View::push('javascript') ?> -<script> - $("#batch-update-form input, #batch-update-form select").change(function () { - $("#batch-update-form").submit(); - }); -</script> -<?php View::endpush() ?> diff --git a/resources/views/modules/block-template.phtml b/resources/views/modules/block-template.phtml index 24243d08e2..fad76ad521 100644 --- a/resources/views/modules/block-template.phtml +++ b/resources/views/modules/block-template.phtml @@ -2,6 +2,14 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $block + * @var string $content + * @var string $config_url + * @var int $id + * @var string $title + */ + ?> <div class="card mb-4 wt-block wt-block-<?= e($block) ?>" id="block-<?= e($id) ?>"> diff --git a/resources/views/modules/branches/list.phtml b/resources/views/modules/branches/list.phtml index 5c0c15df45..302991de07 100644 --- a/resources/views/modules/branches/list.phtml +++ b/resources/views/modules/branches/list.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var string $branches + */ + +?> <ol> <?= $branches ?> </ol> diff --git a/resources/views/modules/census-assistant.phtml b/resources/views/modules/census-assistant.phtml index b52f7da903..8eda87c606 100644 --- a/resources/views/modules/census-assistant.phtml +++ b/resources/views/modules/census-assistant.phtml @@ -1,8 +1,13 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\View; +/** + * @var Individual|null $individual + */ + ?> <div id="census-assistant-link" hidden> diff --git a/resources/views/modules/charts/chart.phtml b/resources/views/modules/charts/chart.phtml index 608ffa2b8d..cde052dee8 100644 --- a/resources/views/modules/charts/chart.phtml +++ b/resources/views/modules/charts/chart.phtml @@ -1,3 +1,11 @@ +<?php + +/** + * @var int $block_id + * @var string $chart_url + */ + +?> <div id="chart-block-<?= e($block_id) ?>"></div> <script> diff --git a/resources/views/modules/charts/config.phtml b/resources/views/modules/charts/config.phtml index c77c35ae36..fe8f1c0bb7 100644 --- a/resources/views/modules/charts/config.phtml +++ b/resources/views/modules/charts/config.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var array<string,string> $charts + * @var Individual|null $individual + * @var Tree $tree + * @var string $type + */ ?> diff --git a/resources/views/modules/clippings/add-options.phtml b/resources/views/modules/clippings/add-options.phtml index 0d8da22183..87f62287d7 100644 --- a/resources/views/modules/clippings/add-options.phtml +++ b/resources/views/modules/clippings/add-options.phtml @@ -1,7 +1,15 @@ <?php +use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +/** + * @var string $default + * @var array<string,string> $options + * @var GedcomRecord $record + * @var string $title + */ + ?> <h2 class="wt-page-title"><?= $title ?></h2> diff --git a/resources/views/modules/clippings/download.phtml b/resources/views/modules/clippings/download.phtml index 8ea8ab19ee..da8926d722 100644 --- a/resources/views/modules/clippings/download.phtml +++ b/resources/views/modules/clippings/download.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var bool $is_manager + * @var bool $is_member + * @var string $module + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/clippings/show.phtml b/resources/views/modules/clippings/show.phtml index 190a7c5818..2ddefd7052 100644 --- a/resources/views/modules/clippings/show.phtml +++ b/resources/views/modules/clippings/show.phtml @@ -1,6 +1,15 @@ <?php +use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $module + * @var array<GedcomRecord> $records + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/compact-chart/arrow-down.phtml b/resources/views/modules/compact-chart/arrow-down.phtml index 11bdb3c536..f5110d657d 100644 --- a/resources/views/modules/compact-chart/arrow-down.phtml +++ b/resources/views/modules/compact-chart/arrow-down.phtml @@ -1,7 +1,18 @@ -<?php if ($individual === null) : ?> - <?= view('icons/arrow-down') ?> -<?php else : ?> +<?php + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Module\CompactTreeChartModule; + +/** + * @var Individual|null $individual + * @var CompactTreeChartModule $module + */ + +?> +<?php if ($individual instanceof Individual) : ?> <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-down') ?> </a> +<?php else : ?> + <?= view('icons/arrow-down') ?> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-left.phtml b/resources/views/modules/compact-chart/arrow-left.phtml index 2d573806f6..fbb0610520 100644 --- a/resources/views/modules/compact-chart/arrow-left.phtml +++ b/resources/views/modules/compact-chart/arrow-left.phtml @@ -1,7 +1,18 @@ -<?php if ($individual === null) : ?> - <?= view('icons/arrow-left') ?> -<?php else : ?> +<?php + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Module\CompactTreeChartModule; + +/** + * @var Individual|null $individual + * @var CompactTreeChartModule $module + */ + +?> +<?php if ($individual instanceof Individual) : ?> <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-left') ?> </a> +<?php else : ?> + <?= view('icons/arrow-left') ?> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-right.phtml b/resources/views/modules/compact-chart/arrow-right.phtml index 0b258696f0..428ae3dc97 100644 --- a/resources/views/modules/compact-chart/arrow-right.phtml +++ b/resources/views/modules/compact-chart/arrow-right.phtml @@ -1,7 +1,18 @@ -<?php if ($individual === null) : ?> - <?= view('icons/arrow-right') ?> -<?php else : ?> +<?php + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Module\CompactTreeChartModule; + +/** + * @var Individual|null $individual + * @var CompactTreeChartModule $module + */ + +?> +<?php if ($individual instanceof Individual) : ?> <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-right') ?> </a> +<?php else : ?> + <?= view('icons/arrow-right') ?> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-up.phtml b/resources/views/modules/compact-chart/arrow-up.phtml index cd718187da..99da24cdd2 100644 --- a/resources/views/modules/compact-chart/arrow-up.phtml +++ b/resources/views/modules/compact-chart/arrow-up.phtml @@ -1,7 +1,18 @@ -<?php if ($individual === null) : ?> - <?= view('icons/arrow-up') ?> -<?php else : ?> +<?php + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Module\CompactTreeChartModule; + +/** + * @var Individual|null $individual + * @var CompactTreeChartModule $module + */ + +?> +<?php if ($individual instanceof Individual) : ?> <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-up') ?> </a> +<?php else : ?> + <?= view('icons/arrow-up') ?> <?php endif; diff --git a/resources/views/modules/compact-chart/chart.phtml b/resources/views/modules/compact-chart/chart.phtml index 5f427378b2..86521f6f35 100644 --- a/resources/views/modules/compact-chart/chart.phtml +++ b/resources/views/modules/compact-chart/chart.phtml @@ -1,3 +1,15 @@ +<?php + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Module\CompactTreeChartModule; +use Illuminate\Support\Collection; + +/** + * @var Collection<int,Individual> $ancestors + * @var CompactTreeChartModule $module + */ + +?> <table class="text-center w-100 h-100 wt-chart-compact-table" role="presentation"> <tr> <td> diff --git a/resources/views/modules/compact-chart/individual.phtml b/resources/views/modules/compact-chart/individual.phtml index 624acbcc41..f6d3261f1a 100644 --- a/resources/views/modules/compact-chart/individual.phtml +++ b/resources/views/modules/compact-chart/individual.phtml @@ -1,15 +1,14 @@ -<?php if ($individual === null) : ?> - <div class="h-100 wt-chart-box"> </div> -<?php else : ?> +<?php + +use Fisharebest\Webtrees\Individual; + +/** + * @var Individual|null $individual + */ + +?> +<?php if ($individual instanceof Individual) : ?> <?= view('chart-box', ['individual' => $individual]) ?> -<!-- - <div class="h-100 person_box<?= ['M' => '', 'F' => 'F', 'U' => 'NN'][$individual->sex()]?> person_box_template"> - <a href="<?= e($individual->url()) ?>"> - <?= $individual->fullName() ?> - </a> - <div class="small"> - <?= $individual->lifespan() ?> - </div> - </div> ---> +<?php else : ?> + <div class="h-100 wt-chart-box"> </div> <?php endif ?> diff --git a/resources/views/modules/compact-chart/page.phtml b/resources/views/modules/compact-chart/page.phtml index e49ee35323..bd9622abc2 100644 --- a/resources/views/modules/compact-chart/page.phtml +++ b/resources/views/modules/compact-chart/page.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var string $title + * @var Individual $individual + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/contact-links/footer.phtml b/resources/views/modules/contact-links/footer.phtml index 90f16be32d..3c6384df97 100644 --- a/resources/views/modules/contact-links/footer.phtml +++ b/resources/views/modules/contact-links/footer.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var string $contact_links + */ + +?> <div class="wt-footer wt-footer-contact text-center py-2"> <?= $contact_links ?> </div> diff --git a/resources/views/modules/custom-css-js/edit.phtml b/resources/views/modules/custom-css-js/edit.phtml index 9c788d5fba..33915c265c 100644 --- a/resources/views/modules/custom-css-js/edit.phtml +++ b/resources/views/modules/custom-css-js/edit.phtml @@ -3,6 +3,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; +/** + * @var string $body + * @var string $head + * @var string $title + */ + ?> <?= view('components/breadcrumbs', ['links' => [route(ControlPanel::class) => I18N::translate('Control panel'), $title]]) ?> diff --git a/resources/views/modules/descendancy/sidebar.phtml b/resources/views/modules/descendancy/sidebar.phtml index 4679d8c851..46fab38967 100644 --- a/resources/views/modules/descendancy/sidebar.phtml +++ b/resources/views/modules/descendancy/sidebar.phtml @@ -1,8 +1,14 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var string $individual_list + * @var Tree $tree + */ + ?> <form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'tree' => $tree->name()])) ?>" onsubmit="return false;"> diff --git a/resources/views/modules/descendancy_chart/page.phtml b/resources/views/modules/descendancy_chart/page.phtml index 03451a8c02..ed1cf8ca48 100644 --- a/resources/views/modules/descendancy_chart/page.phtml +++ b/resources/views/modules/descendancy_chart/page.phtml @@ -1,6 +1,20 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var int $generations + * @var Individual $individual + * @var int $maximum_generations + * @var int $minimum_generations + * @var string $style + * @var array<string,string> $styles + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/edit-block-config.phtml b/resources/views/modules/edit-block-config.phtml index b92ad69d74..4910c1843b 100644 --- a/resources/views/modules/edit-block-config.phtml +++ b/resources/views/modules/edit-block-config.phtml @@ -1,6 +1,16 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Module\ModuleBlockInterface; +use Fisharebest\Webtrees\Tree; + +/** + * @var ModuleBlockInterface $block + * @var int $block_id + * @var string $cancel_url + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/family-book-chart/page.phtml b/resources/views/modules/family-book-chart/page.phtml index bce6476f59..ef84a16e20 100644 --- a/resources/views/modules/family-book-chart/page.phtml +++ b/resources/views/modules/family-book-chart/page.phtml @@ -1,6 +1,20 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var int $book_size + * @var int $generations + * @var Individual $individual + * @var int $maximum_generations + * @var int $minimum_generations + * @var bool $spouses + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/family-book-chart/parents.phtml b/resources/views/modules/family-book-chart/parents.phtml index 4fd0ad4b28..e2b5600602 100644 --- a/resources/views/modules/family-book-chart/parents.phtml +++ b/resources/views/modules/family-book-chart/parents.phtml @@ -1,3 +1,13 @@ +<?php + +use Fisharebest\Webtrees\Family; + +/** + * @var Family|null $family + * @var int $generations + */ + +?> <div class="d-flex"> <div class="align-self-center"> <div class="d-flex"> diff --git a/resources/views/modules/family_nav/sidebar.phtml b/resources/views/modules/family_nav/sidebar.phtml index 52ba066c50..0a9a9988cd 100644 --- a/resources/views/modules/family_nav/sidebar.phtml +++ b/resources/views/modules/family_nav/sidebar.phtml @@ -1,3 +1,12 @@ +<?php + +use Fisharebest\Webtrees\Individual; + +/** + * @var Individual $individual + */ + +?> <div class="wt-sidebar-content wt-sidebar-family-navigator"> <!-- parent families --> <?php foreach ($individual->childFamilies() as $family) : ?> diff --git a/resources/views/modules/fanchart/chart.phtml b/resources/views/modules/fanchart/chart.phtml index 20a328011d..abd69c6068 100644 --- a/resources/views/modules/fanchart/chart.phtml +++ b/resources/views/modules/fanchart/chart.phtml @@ -1,3 +1,22 @@ +<?php + +/** + * @var string $areas + * @var int $fanh + * @var int $fanw + * @var string $html + * @var string $png + * @var string $title + */ + +assert(is_string($areas)); +assert(is_int($fanh)); +assert(is_int($fanw)); +assert(is_string($html)); +assert(is_string($png)); +assert(is_string($title)); + +?> <?= $html ?> <map id="fan-chart-map" name="fan-chart-map"> @@ -13,7 +32,7 @@ .click(function (e) { e.stopPropagation(); e.preventDefault(); - var target = jQuery(this.hash); + let target = jQuery(this.hash); // position the menu centered immediately above the mouse click position and // make sure it doesn’t end up off the screen target @@ -29,7 +48,7 @@ e.stopPropagation(); }); jQuery("#fan_chart") - .click(function (e) { + .click(function () { jQuery(".fan_chart_menu").hide(); }); </script> diff --git a/resources/views/modules/fanchart/page.phtml b/resources/views/modules/fanchart/page.phtml index e6d7754909..286029cdf7 100644 --- a/resources/views/modules/fanchart/page.phtml +++ b/resources/views/modules/fanchart/page.phtml @@ -1,6 +1,23 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var int $generations + * @var Individual $individual + * @var int $maximum_generations + * @var int $maximum_width + * @var int $minimum_generations + * @var int $minimum_width + * @var string $style + * @var array<string,string> $styles + * @var string $title + * @var Tree $tree + * @var int $width + */ ?> diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml index 67779d497c..df3a8cbe44 100644 --- a/resources/views/modules/faq/config.phtml +++ b/resources/views/modules/faq/config.phtml @@ -3,6 +3,17 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<object> $faqs + * @var string $max_block_order + * @var string $min_block_order + * @var string $title + * @var Tree $tree + * @var array<string,string> $tree_names + */ ?> @@ -65,14 +76,14 @@ use Fisharebest\Webtrees\I18N; <?= e($faq->header) ?> </td> <td> - <?php if ($faq->block_order != $min_block_order) : ?> + <?php if ($faq->block_order !== $min_block_order) : ?> <a href="#" data-post-url="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id])) ?>" class="btn btn-secondary"> <?= view('icons/arrow-up') ?> </a> <?php endif ?> </td> <td> - <?php if ($faq->block_order != $max_block_order) : ?> + <?php if ($faq->block_order !== $max_block_order) : ?> <a href="#" data-post-url="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id])) ?>" class="btn btn-secondary"> <?= view('icons/arrow-down') ?> </a> diff --git a/resources/views/modules/faq/show.phtml b/resources/views/modules/faq/show.phtml index f1d0094fde..18ecf30119 100644 --- a/resources/views/modules/faq/show.phtml +++ b/resources/views/modules/faq/show.phtml @@ -1,6 +1,12 @@ <?php use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var Collection<object> $faqs + * @var string $title + */ ?> diff --git a/resources/views/modules/gedcom_block/welcome.phtml b/resources/views/modules/gedcom_block/welcome.phtml index ef54eaf536..50f4dce81d 100644 --- a/resources/views/modules/gedcom_block/welcome.phtml +++ b/resources/views/modules/gedcom_block/welcome.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var array<string,array<string,string>> $links + */ + +?> <div class="d-flex flex-wrap justify-content-around"> <?php foreach ($links as $link) : ?> <div class="text-center m-1"> diff --git a/resources/views/modules/gedcom_news/edit.phtml b/resources/views/modules/gedcom_news/edit.phtml index 037d2d2d86..a488e1911b 100644 --- a/resources/views/modules/gedcom_news/edit.phtml +++ b/resources/views/modules/gedcom_news/edit.phtml @@ -2,6 +2,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $body + * @var string $subject + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/gedcom_news/list.phtml b/resources/views/modules/gedcom_news/list.phtml index 69bba61e74..b749f80abf 100644 --- a/resources/views/modules/gedcom_news/list.phtml +++ b/resources/views/modules/gedcom_news/list.phtml @@ -2,6 +2,15 @@ use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<object> $articles + * @var int $block_id + * @var int $limit + * @var Tree $tree + */ ?> @@ -10,7 +19,7 @@ use Fisharebest\Webtrees\I18N; <?php endif ?> <?php foreach ($articles as $n => $article) : ?> - <?php if ($n === 5 && count($articles) > 5) : ?> + <?php if ($n === $limit && count($articles) > $limit) : ?> <p> <button class="btn btn-sm btn-secondary" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"> <?= view('icons/add') ?> @@ -41,7 +50,7 @@ use Fisharebest\Webtrees\I18N; </div> <?php endforeach ?> - <?php if (count($articles) > 5) : ?> + <?php if (count($articles) > $limit) : ?> </div> <?php endif ?> diff --git a/resources/views/modules/gedcom_stats/config.phtml b/resources/views/modules/gedcom_stats/config.phtml index 5506a42d4a..c8bb6ede63 100644 --- a/resources/views/modules/gedcom_stats/config.phtml +++ b/resources/views/modules/gedcom_stats/config.phtml @@ -2,6 +2,28 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $show_last_update + * @var string $stat_indi + * @var string $stat_surname + * @var string $stat_fam + * @var string $stat_sour + * @var string $stat_media + * @var string $stat_repo + * @var string $stat_events + * @var string $stat_users + * @var string $stat_first_birth + * @var string $stat_last_birth + * @var string $stat_first_death + * @var string $stat_last_death + * @var string $stat_long_life + * @var string $stat_avg_life + * @var string $stat_most_chil + * @var string $stat_avg_chil + * @var string $show_common_surnames + * @var string $number_of_surnames + */ + ?> <fieldset class="form-group"> diff --git a/resources/views/modules/gedcom_stats/statistics.phtml b/resources/views/modules/gedcom_stats/statistics.phtml index 6972d2ae01..e982999539 100644 --- a/resources/views/modules/gedcom_stats/statistics.phtml +++ b/resources/views/modules/gedcom_stats/statistics.phtml @@ -1,6 +1,29 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Statistics; + +/** + * @var string $show_last_update + * @var Statistics $stats + * @var string $stat_indi + * @var string $stat_surname + * @var string $stat_fam + * @var string $stat_sour + * @var string $stat_media + * @var string $stat_repo + * @var string $stat_events + * @var string $stat_users + * @var string $stat_first_birth + * @var string $stat_last_birth + * @var string $stat_first_death + * @var string $stat_last_death + * @var string $stat_long_life + * @var string $stat_avg_life + * @var string $stat_most_chil + * @var string $stat_avg_chil + * @var string $surnames + */ ?> diff --git a/resources/views/modules/google-analytics/snippet.phtml b/resources/views/modules/google-analytics/snippet.phtml index e55b77b528..06e09b39ff 100644 --- a/resources/views/modules/google-analytics/snippet.phtml +++ b/resources/views/modules/google-analytics/snippet.phtml @@ -1,3 +1,12 @@ +<?php + +/** + * @var object $dimensions + */ + +assert(is_object($dimensions)) + +?> <script async src="https://www.google-analytics.com/analytics.js"></script> <script> window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)}; diff --git a/resources/views/modules/hit-counter/footer.phtml b/resources/views/modules/hit-counter/footer.phtml index ae7b05fd0b..0c8bb9539d 100644 --- a/resources/views/modules/hit-counter/footer.phtml +++ b/resources/views/modules/hit-counter/footer.phtml @@ -1,3 +1,10 @@ +<?php + +/** + * @var string $hit_counter + */ + +?> <div class="wt-footer wt-footer-hit-counter text-center py-2"> <?= $hit_counter ?> </div> diff --git a/resources/views/modules/hourglass-chart/page.phtml b/resources/views/modules/hourglass-chart/page.phtml index c13fc4ff56..1dc154ade1 100644 --- a/resources/views/modules/hourglass-chart/page.phtml +++ b/resources/views/modules/hourglass-chart/page.phtml @@ -1,6 +1,19 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var int $generations + * @var Individual $individual + * @var int $maximum_generations + * @var int $minimum_generations + * @var bool $spouses + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/hourglass-chart/parents.phtml b/resources/views/modules/hourglass-chart/parents.phtml index 5f9253bd15..f5c3cea3cd 100644 --- a/resources/views/modules/hourglass-chart/parents.phtml +++ b/resources/views/modules/hourglass-chart/parents.phtml @@ -1,6 +1,7 @@ <?php use Fisharebest\Webtrees\Family; +use Fisharebest\Webtrees\Individual; /** * @var Family $family @@ -20,7 +21,7 @@ use Fisharebest\Webtrees\Family; <?= view('chart-box', ['individual' => $family->husband()]) ?> </div> - <?php if ($family->husband() && $family->husband()->childFamilies()->first()) : ?> + <?php if ($family->husband() instanceof Individual && $family->husband()->childFamilies()->first() instanceof Family) : ?> <div class="wt-chart-horizontal-spacer"> <div class="wt-chart-horizontal-line"></div> </div> @@ -46,7 +47,7 @@ use Fisharebest\Webtrees\Family; <?= view('chart-box', ['individual' => $family->wife()]) ?> </div> - <?php if ($family->wife() && $family->wife()->childFamilies()->first()) : ?> + <?php if ($family->wife() instanceof Individual && $family->wife()->childFamilies()->first() instanceof Family) : ?> <div class="wt-chart-horizontal-spacer"> <div class="wt-chart-horizontal-line"></div> </div> diff --git a/resources/views/modules/html/config.phtml b/resources/views/modules/html/config.phtml index 59d5b7cae4..7f5c787c4d 100644 --- a/resources/views/modules/html/config.phtml +++ b/resources/views/modules/html/config.phtml @@ -3,6 +3,14 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var string $html + * @var array<int,string> $languages + * @var bool $show_timestamp + * @var array<string,string> $templates + * @var string $title + */ + ?> <div class="row form-group"> diff --git a/resources/views/modules/html/template-statistics.phtml b/resources/views/modules/html/template-statistics.phtml index 2baa246a7a..93d937cf3f 100644 --- a/resources/views/modules/html/template-statistics.phtml +++ b/resources/views/modules/html/template-statistics.phtml @@ -2,12 +2,17 @@ use Fisharebest\Webtrees\Http\RequestHandlers\TreePage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ ?> <div class="gedcom_stats"> <p> - <a href="<?= e(route(TreePage::class, ['tree' => $tree])) ?>">#gedcomTitle#</a> + <a href="<?= e(route(TreePage::class, ['tree' => $tree->name()])) ?>">#gedcomTitle#</a> </p> <?= I18N::translate('This family tree was last updated on %s.', '#gedcomUpdated#') ?> diff --git a/resources/views/modules/individual-list/page.phtml b/resources/views/modules/individual-list/page.phtml index fc9de325be..5a0b40eca4 100644 --- a/resources/views/modules/individual-list/page.phtml +++ b/resources/views/modules/individual-list/page.phtml @@ -1,3 +1,11 @@ +<?php + +/** + * @var string $content + * @var string $title + */ + +?> <h2 class="wt-page-title"> <?= $title ?> </h2> diff --git a/resources/views/modules/interactive-tree/chart.phtml b/resources/views/modules/interactive-tree/chart.phtml index 79eeacf54a..71f8a2ba26 100644 --- a/resources/views/modules/interactive-tree/chart.phtml +++ b/resources/views/modules/interactive-tree/chart.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var Individual $individual + * @var string $module + * @var string $name + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/interactive-tree/page.phtml b/resources/views/modules/interactive-tree/page.phtml index 88e560f327..5822353b10 100644 --- a/resources/views/modules/interactive-tree/page.phtml +++ b/resources/views/modules/interactive-tree/page.phtml @@ -1,8 +1,16 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\View; +/** + * @var string $html + * @var Individual $individual + * @var string $js + * @var string $title + */ + ?> <h2 class="wt-page-title"> diff --git a/resources/views/modules/interactive-tree/tab.phtml b/resources/views/modules/interactive-tree/tab.phtml index 26ab61fa93..785de808bb 100644 --- a/resources/views/modules/interactive-tree/tab.phtml +++ b/resources/views/modules/interactive-tree/tab.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\View; +/** + * @var string $html + * @var string $js + */ + ?> <div class="wt-tab-tree py-4"> diff --git a/resources/views/modules/lifespans-chart/chart.phtml b/resources/views/modules/lifespans-chart/chart.phtml index 43e7f84159..662e56525f 100644 --- a/resources/views/modules/lifespans-chart/chart.phtml +++ b/resources/views/modules/lifespans-chart/chart.phtml @@ -2,6 +2,15 @@ use Fisharebest\Webtrees\Gedcom; +/** + * @var string $dir + * @var int $end_year + * @var array<stdClass> $lifespans + * @var int $max_rows + * @var int $start_year + * @var string $subtitle + */ + ?> <p class="wt-lifespans-subtitle"> diff --git a/resources/views/modules/lifespans-chart/page.phtml b/resources/views/modules/lifespans-chart/page.phtml index 757a9853b1..59942bc711 100644 --- a/resources/views/modules/lifespans-chart/page.phtml +++ b/resources/views/modules/lifespans-chart/page.phtml @@ -1,6 +1,15 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var string $ajax_url + * @var string $reset_url + * @var string $title + * @var Tree $tree + * @var array<string> $xrefs + */ ?> diff --git a/resources/views/modules/lightbox/tab.phtml b/resources/views/modules/lightbox/tab.phtml index 6ddd5bb1c6..593e23ca7e 100644 --- a/resources/views/modules/lightbox/tab.phtml +++ b/resources/views/modules/lightbox/tab.phtml @@ -1,3 +1,13 @@ +<?php + +use Fisharebest\Webtrees\Media; +use Illuminate\Support\Collection; + +/** + * @var Collection<Media> $media_list + */ + +?> <div class="wt-tab-album py-4"> <?php foreach ($media_list as $media) : ?> <figure class="figure text-center col-sm-6 col-md-4 col-lg-3 col-xl-2 wt-album-tab-figure"> diff --git a/resources/views/modules/login_block/sign-in.phtml b/resources/views/modules/login_block/sign-in.phtml index 2c70499954..ec597419f8 100644 --- a/resources/views/modules/login_block/sign-in.phtml +++ b/resources/views/modules/login_block/sign-in.phtml @@ -8,6 +8,11 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var bool $allow_register + * @var Tree $tree + */ + ?> <form method="post" action="<?= route(LoginAction::class, ['tree' => $tree->name()]) ?>" name="login-form"> @@ -46,7 +51,7 @@ use Fisharebest\Webtrees\View; <?php endif ?> <div class="collapse" id="forgot-password"> - <form method="post" action="<?= e(route(PasswordRequestAction::class, ['tree' => $tree instanceof Tree ? $tree->name() : null])) ?>"> + <form method="post" action="<?= e(route(PasswordRequestAction::class, ['tree' => $tree->name()])) ?>"> <?= I18N::translate('Request a new password') ?> <div class="form-group"> <label for="new_passwd_username"> diff --git a/resources/views/modules/login_block/sign-out.phtml b/resources/views/modules/login_block/sign-out.phtml index 10527709d1..f6a1c399f7 100644 --- a/resources/views/modules/login_block/sign-out.phtml +++ b/resources/views/modules/login_block/sign-out.phtml @@ -1,9 +1,14 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\Http\RequestHandlers\Logout; use Fisharebest\Webtrees\I18N; +/** + * @var UserInterface $user + */ + ?> <p> diff --git a/resources/views/modules/matomo-analytics/snippet.phtml b/resources/views/modules/matomo-analytics/snippet.phtml index 364d06e120..e26a67ab3b 100644 --- a/resources/views/modules/matomo-analytics/snippet.phtml +++ b/resources/views/modules/matomo-analytics/snippet.phtml @@ -1,3 +1,12 @@ +<?php + +use Fisharebest\Webtrees\Contracts\UserInterface; + +/** + * @var UserInterface $user + */ + +?> <script type="text/javascript"> var _paq = window._paq || []; _paq.push(['trackPageView']); diff --git a/resources/views/modules/media/tab.phtml b/resources/views/modules/media/tab.phtml index 4a43725cc5..3f4e3911ea 100644 --- a/resources/views/modules/media/tab.phtml +++ b/resources/views/modules/media/tab.phtml @@ -1,10 +1,19 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; -?> -<?php use Fisharebest\Webtrees\I18N; ?> +/** + * @var bool $can_edit + * @var Collection<Fact> $clipboard_facts + * @var Collection<Fact> $facts + * @var Individual $individual + */ +?> <div class="wt-tab-media py-4"> <table class="table wt-facts-table"> <?php foreach ($facts as $fact) : ?> diff --git a/resources/views/modules/note-list/page.phtml b/resources/views/modules/note-list/page.phtml index 3be5fcd5dd..d446963960 100644 --- a/resources/views/modules/note-list/page.phtml +++ b/resources/views/modules/note-list/page.phtml @@ -1,3 +1,16 @@ +<?php + +use Fisharebest\Webtrees\Note; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Note> $notes + * @var string $title + * @var Tree $tree + */ + +?> <h2 class="wt-page-title"> <?= $title ?> </h2> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index 329ebe5323..0fa1971d36 100644 --- a/resources/views/modules/notes/tab.phtml +++ b/resources/views/modules/notes/tab.phtml @@ -1,9 +1,19 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var bool $can_edit + * @var Collection<Fact> $clipboard_facts + * @var Collection<Fact> $facts + * @var Individual $individual + */ ?> diff --git a/resources/views/modules/pedigree-chart/page.phtml b/resources/views/modules/pedigree-chart/page.phtml index 4c17d25c65..d2273817ae 100644 --- a/resources/views/modules/pedigree-chart/page.phtml +++ b/resources/views/modules/pedigree-chart/page.phtml @@ -10,6 +10,7 @@ use Fisharebest\Webtrees\Tree; * @var Individual $individual * @var int $max_generations * @var int $min_generations + * @var string $style * @var string $title * @var Tree $tree */ diff --git a/resources/views/modules/pedigree-map/page.phtml b/resources/views/modules/pedigree-map/page.phtml index e4e00c9b94..0650a42a76 100644 --- a/resources/views/modules/pedigree-map/page.phtml +++ b/resources/views/modules/pedigree-map/page.phtml @@ -1,6 +1,17 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; + +/** + * @var int $generations + * @var Individual $individual + * @var string $map + * @var int $maxgenerations + * @var string $title + * @var Tree $tree + */ ?> diff --git a/resources/views/modules/personal_facts/tab.phtml b/resources/views/modules/personal_facts/tab.phtml index 3afd6e1485..91f64fa9fc 100644 --- a/resources/views/modules/personal_facts/tab.phtml +++ b/resources/views/modules/personal_facts/tab.phtml @@ -1,10 +1,20 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Functions\FunctionsPrint; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var bool $can_edit + * @var Collection<Fact> $clipboard_facts + * @var Collection<Fact> $facts + * @var bool $has_historical_facts + * @var Individual $individual + */ ?> diff --git a/resources/views/modules/place-hierarchy/events.phtml b/resources/views/modules/place-hierarchy/events.phtml index afc3073b8f..464aa81861 100644 --- a/resources/views/modules/place-hierarchy/events.phtml +++ b/resources/views/modules/place-hierarchy/events.phtml @@ -1,18 +1,28 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Family> $famlist + * @var Collection<Individual> $indilist + * @var Tree $tree + */ ?> <ul class="nav nav-tabs" role="tablist"> <li class="nav-item" role="presentation"> - <a class="nav-link active<?= $indilist === [] ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> + <a class="nav-link active<?= $indilist->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => count($indilist)]) ?> </a> </li> <li class="nav-item" role="presentation"> - <a class="nav-link<?= $famlist === [] ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> + <a class="nav-link<?= $famlist->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => count($famlist)]) ?> </a> @@ -20,7 +30,7 @@ use Fisharebest\Webtrees\I18N; </ul> <div class="tab-content"> <div class="tab-pane fade show active" role="tabpanel" id="individuals"> - <?php if ($indilist === []) : ?> + <?php if ($indilist->isEmpty()) : ?> <p><?= I18N::translate('No results found.') ?></p> <?php else : ?> <?= view('lists/individuals-table', [ @@ -32,7 +42,7 @@ use Fisharebest\Webtrees\I18N; </div> <div class="tab-pane fade" role="tabpanel" id="families"> - <?php if ($famlist === []) : ?> + <?php if ($famlist->isEmpty()) : ?> <p><?= I18N::translate('No results found.') ?></p> <?php else : ?> <?= view('lists/families-table', ['families' => $famlist, 'tree' => $tree]) ?> diff --git a/resources/views/modules/place-hierarchy/map.phtml b/resources/views/modules/place-hierarchy/map.phtml index 6155cb3ed0..e9ae04722c 100644 --- a/resources/views/modules/place-hierarchy/map.phtml +++ b/resources/views/modules/place-hierarchy/map.phtml @@ -3,6 +3,11 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\View; +/** + * @var array<mixed> $data + * @var array<mixed> $provider + */ + ?> <div class="py-4"> diff --git a/resources/views/modules/places/tab.phtml b/resources/views/modules/places/tab.phtml index f0fa0601f7..3d2ea02be8 100644 --- a/resources/views/modules/places/tab.phtml +++ b/resources/views/modules/places/tab.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<mixed> $data + * @var array<mixed> $provider + */ + ?> <div class="py-4"> diff --git a/resources/views/modules/powered-by-webtrees/footer.phtml b/resources/views/modules/powered-by-webtrees/footer.phtml index 4d73881a03..64e385139d 100644 --- a/resources/views/modules/powered-by-webtrees/footer.phtml +++ b/resources/views/modules/powered-by-webtrees/footer.phtml @@ -1,3 +1,11 @@ +<?php + +/** + * @var string $name + * @var string $url + */ + +?> <div class="wt-footer wt-footer-powered-by text-center"> <a href="<?= e($url) ?>" class="wt-footer-powered-by-webtrees" dir="ltr"> <?= e($name) ?> diff --git a/resources/views/modules/privacy-policy/footer.phtml b/resources/views/modules/privacy-policy/footer.phtml index 2108a916ad..94f92a8ec8 100644 --- a/resources/views/modules/privacy-policy/footer.phtml +++ b/resources/views/modules/privacy-policy/footer.phtml @@ -1,8 +1,14 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var Tree $tree + * @var bool $uses_analytics + */ + ?> <div class="wt-footer wt-footer-privacy-policy text-center py-2"> diff --git a/resources/views/modules/privacy-policy/page.phtml b/resources/views/modules/privacy-policy/page.phtml index 0a18023074..bfa62632d8 100644 --- a/resources/views/modules/privacy-policy/page.phtml +++ b/resources/views/modules/privacy-policy/page.phtml @@ -1,6 +1,15 @@ <?php +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Module\ModuleAnalyticsInterface; +use Illuminate\Support\Collection; + +/** + * @var Collection<UserInterface> $administrators + * @var Collection<ModuleAnalyticsInterface> $analytics + * @var string $title + */ ?> diff --git a/resources/views/modules/random_media/config.phtml b/resources/views/modules/random_media/config.phtml index 737cfcc333..3ca38f75ce 100644 --- a/resources/views/modules/random_media/config.phtml +++ b/resources/views/modules/random_media/config.phtml @@ -2,6 +2,14 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $controls + * @var string $filter + * @var array<string,string> $filters + * @var array<string,string> $formats + * @var string $start + */ + ?> <div class="form-group row"> @@ -19,8 +27,8 @@ use Fisharebest\Webtrees\I18N; <?= I18N::translate('Type') ?> </legend> <div class="col-sm-9"> - <?php foreach ($formats as $typeName => $typeValue) : ?> - <?= view('components/checkbox', ['label' => $typeValue, 'name' => 'filter_' . $typeName, 'checked' => (bool) $filters[$typeName]]) ?> + <?php foreach ($formats as $type => $label) : ?> + <?= view('components/checkbox', ['label' => $label, 'name' => 'filter_' . $type, 'checked' => (bool) $filters[$type]]) ?> <?php endforeach ?> </div> </div> diff --git a/resources/views/modules/random_media/slide-show.phtml b/resources/views/modules/random_media/slide-show.phtml index f16ac0679a..400260ad72 100644 --- a/resources/views/modules/random_media/slide-show.phtml +++ b/resources/views/modules/random_media/slide-show.phtml @@ -4,13 +4,16 @@ use Fisharebest\Webtrees\Functions\FunctionsPrint; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\MediaFile; +use Fisharebest\Webtrees\Tree; /** * @var int $block_id + * @var int $delay * @var bool $show_controls * @var bool $start_automatically * @var Media $media * @var MediaFile $media_file + * @var Tree $tree */ ?> diff --git a/resources/views/modules/recent_changes/changes-list.phtml b/resources/views/modules/recent_changes/changes-list.phtml index 0a6dce827a..520d73f69e 100644 --- a/resources/views/modules/recent_changes/changes-list.phtml +++ b/resources/views/modules/recent_changes/changes-list.phtml @@ -5,6 +5,7 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** + * @var int $id * @var int $limit_low * @var int $limit_high * @var Collection<stdClass> $rows diff --git a/resources/views/modules/relationships-chart/config.phtml b/resources/views/modules/relationships-chart/config.phtml index b58b74dee2..7c38163863 100644 --- a/resources/views/modules/relationships-chart/config.phtml +++ b/resources/views/modules/relationships-chart/config.phtml @@ -3,6 +3,17 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Tree> $all_trees + * @var array<int,string> $ancestors_options + * @var string $default_ancestors + * @var string $default_recursion + * @var array<int,string> $recursion_options + * @var string $title + */ ?> diff --git a/resources/views/modules/relationships-chart/page.phtml b/resources/views/modules/relationships-chart/page.phtml index 4065372b7f..04d3c32380 100644 --- a/resources/views/modules/relationships-chart/page.phtml +++ b/resources/views/modules/relationships-chart/page.phtml @@ -1,8 +1,24 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var string $ajax_url + * @var int $ancestors + * @var array<string,string> $ancestors_options + * @var bool $ancestors_only + * @var Individual|null $individual1 + * @var Individual|null $individual2 + * @var int $max_recursion + * @var int $recursion + * @var array<string,string> $recursion_options + * @var string $title + * @var Tree $tree + */ + ?> <h2 class="wt-page-title"> diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index 6ce5ed6b58..a6727e1606 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -1,6 +1,7 @@ <?php use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Functions\Functions; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\GedcomTag; @@ -11,6 +12,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenPage; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +/** + * @var Family $family + * @var int $fam_access_level + * @var Individual $individual + * @var string $label + * @var string $type + */ + ?> <table class="table table-sm wt-facts-table"> diff --git a/resources/views/modules/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml index 7b487f4ecf..5a4f610e94 100644 --- a/resources/views/modules/relatives/tab.phtml +++ b/resources/views/modules/relatives/tab.phtml @@ -1,5 +1,6 @@ <?php +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\RequestHandlers\AddChildToIndividualPage; use Fisharebest\Webtrees\Http\RequestHandlers\AddParentToIndividualPage; use Fisharebest\Webtrees\Http\RequestHandlers\AddSpouseToIndividualPage; @@ -7,9 +8,23 @@ use Fisharebest\Webtrees\Http\RequestHandlers\LinkChildToFamilyPage; use Fisharebest\Webtrees\Http\RequestHandlers\LinkSpouseToIndividualPage; use Fisharebest\Webtrees\Http\RequestHandlers\ReorderFamiliesPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; +/** + * @var bool $can_edit + * @var int $fam_access_level + * @var Individual $individual + * @var Collection<Family> $parent_families + * @var Collection<Family> $spouse_families + * @var Collection<Family> $step_child_families + * @var Collection<Family> $step_parent_families + */ + +?> +<?php ?> -<?php use Fisharebest\Webtrees\View; ?> <div class="wt-tab-relatives py-4"> <table class="table table-sm wt-facts-table" role="presentation"> @@ -25,7 +40,7 @@ use Fisharebest\Webtrees\I18N; </tbody> </table> -<?php if ($parent_families->isEmpty() && $can_edit) : ?> +<?php if ($can_edit && $parent_families->isEmpty()) : ?> <table class="table table-sm wt-facts-table" role="presentation"> <tbody> <tr> diff --git a/resources/views/modules/repository-list/page.phtml b/resources/views/modules/repository-list/page.phtml index 19ffc64459..e28aa413a9 100644 --- a/resources/views/modules/repository-list/page.phtml +++ b/resources/views/modules/repository-list/page.phtml @@ -1,3 +1,16 @@ +<?php + +use Fisharebest\Webtrees\Repository; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Repository> $repositories + * @var string $title + * @var Tree $tree + */ + +?> <h2 class="wt-page-title"> <?= $title ?> </h2> diff --git a/resources/views/modules/review_changes/config.phtml b/resources/views/modules/review_changes/config.phtml index 5eb8322bb4..aa4ec3eebc 100644 --- a/resources/views/modules/review_changes/config.phtml +++ b/resources/views/modules/review_changes/config.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $days + * @var string $sendmail + */ + ?> <p> diff --git a/resources/views/modules/sitemap/config.phtml b/resources/views/modules/sitemap/config.phtml index a207345395..bfc5dafa6f 100644 --- a/resources/views/modules/sitemap/config.phtml +++ b/resources/views/modules/sitemap/config.phtml @@ -3,6 +3,15 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Tree> $all_trees + * @var string $sitemap_url + * @var array<string,string> $submit_urls + * @var string $title + */ ?> diff --git a/resources/views/modules/source-list/page.phtml b/resources/views/modules/source-list/page.phtml index 146fb1ef6e..70fa0d7113 100644 --- a/resources/views/modules/source-list/page.phtml +++ b/resources/views/modules/source-list/page.phtml @@ -1,3 +1,16 @@ +<?php + +use Fisharebest\Webtrees\Source; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Source> $sources + * @var string $title + * @var Tree $tree + */ + +?> <h2 class="wt-page-title"> <?= $title ?> </h2> diff --git a/resources/views/modules/sources_tab/tab.phtml b/resources/views/modules/sources_tab/tab.phtml index 0223fdd9f1..ada4899584 100644 --- a/resources/views/modules/sources_tab/tab.phtml +++ b/resources/views/modules/sources_tab/tab.phtml @@ -1,9 +1,19 @@ <?php +use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\View; +use Illuminate\Support\Collection; + +/** + * @var bool $can_edit + * @var Collection<Fact> $clipboard_facts + * @var Collection<Fact> $facts + * @var Individual $individual + */ ?> diff --git a/resources/views/modules/statistics-chart/custom.phtml b/resources/views/modules/statistics-chart/custom.phtml index 428f511ee6..7ebbf5a483 100644 --- a/resources/views/modules/statistics-chart/custom.phtml +++ b/resources/views/modules/statistics-chart/custom.phtml @@ -2,8 +2,15 @@ use Fisharebest\Webtrees\Http\RequestHandlers\AutoCompleteSurname; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Module\StatisticsChartModule; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\View; +/** + * @var StatisticsChartModule $module + * @var Tree $tree + */ + ?> <div class="container pt-3"> diff --git a/resources/views/modules/statistics-chart/page.phtml b/resources/views/modules/statistics-chart/page.phtml index 6c7c665920..4f9caf53cf 100644 --- a/resources/views/modules/statistics-chart/page.phtml +++ b/resources/views/modules/statistics-chart/page.phtml @@ -4,6 +4,11 @@ declare(strict_types=1); use Fisharebest\Webtrees\View; +/** + * @var array<string,string> $tabs + * @var string $title + */ + ?> <h2 class="wt-page-title"> diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml index 48bdab303e..4965950eaf 100644 --- a/resources/views/modules/stories/config.phtml +++ b/resources/views/modules/stories/config.phtml @@ -3,6 +3,15 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesAllPage; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<stdClass> $stories + * @var string $title + * @var Tree $tree + * @var array<string> $tree_names + */ ?> diff --git a/resources/views/modules/stories/list.phtml b/resources/views/modules/stories/list.phtml index 9b04b40ebd..8b803e7270 100644 --- a/resources/views/modules/stories/list.phtml +++ b/resources/views/modules/stories/list.phtml @@ -1,6 +1,12 @@ <?php use Fisharebest\Webtrees\I18N; +use Illuminate\Support\Collection; + +/** + * @var Collection<stdClass> $stories + * @var string $title + */ ?> diff --git a/resources/views/modules/submitter-list/page.phtml b/resources/views/modules/submitter-list/page.phtml index 6cbb933b21..505a0f96dc 100644 --- a/resources/views/modules/submitter-list/page.phtml +++ b/resources/views/modules/submitter-list/page.phtml @@ -1,3 +1,16 @@ +<?php + +use Fisharebest\Webtrees\Submitter; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var Collection<Submitter> $submitters + * @var string $title + * @var Tree $tree + */ + +?> <h2 class="wt-page-title"> <?= $title ?> </h2> diff --git a/resources/views/modules/timeline-chart/page.phtml b/resources/views/modules/timeline-chart/page.phtml index 5de6b79b3b..9987f80b61 100644 --- a/resources/views/modules/timeline-chart/page.phtml +++ b/resources/views/modules/timeline-chart/page.phtml @@ -1,6 +1,20 @@ <?php use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use Illuminate\Support\Collection; + +/** + * @var string $ajax_url + * @var Collection<Individual> $individuals + * @var array<string,string> $remove_urls + * @var string $reset_url + * @var string $title + * @var Tree $tree + * @var string $zoom_in_url + * @var string $zoom_out_url + */ ?> diff --git a/resources/views/modules/todays_events/config.phtml b/resources/views/modules/todays_events/config.phtml index 0c43ba5a7f..1cc782f8e6 100644 --- a/resources/views/modules/todays_events/config.phtml +++ b/resources/views/modules/todays_events/config.phtml @@ -2,6 +2,16 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,string> $all_events + * @var array<string,string> $event_array + * @var string $filter + * @var string $info_style + * @var array<string,string> $info_styles + * @var string $sort_style + * @var array<string,string> $sort_styles + */ + ?> <div class="form-group row"> @@ -27,7 +37,7 @@ use Fisharebest\Webtrees\I18N; <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'infoStyle', 'selected' => $infoStyle, 'options' => $info_styles]) ?> + <?= view('components/select', ['name' => 'infoStyle', 'selected' => $info_style, 'options' => $info_styles]) ?> </div> </div> @@ -36,6 +46,6 @@ use Fisharebest\Webtrees\I18N; <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'sortStyle', 'selected' => $sortStyle, 'options' => $sort_styles]) ?> + <?= view('components/select', ['name' => 'sortStyle', 'selected' => $sort_style, 'options' => $sort_styles]) ?> </div> </div> diff --git a/resources/views/modules/todo/config.phtml b/resources/views/modules/todo/config.phtml index d65c544d6c..b55bb46f83 100644 --- a/resources/views/modules/todo/config.phtml +++ b/resources/views/modules/todo/config.phtml @@ -2,6 +2,12 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $show_future + * @var string $show_other + * @var string $show_unassigned + */ + ?> <p> diff --git a/resources/views/modules/top10_givnnames/block.phtml b/resources/views/modules/top10_givnnames/block.phtml index 086ea0c8e2..b616c159d1 100644 --- a/resources/views/modules/top10_givnnames/block.phtml +++ b/resources/views/modules/top10_givnnames/block.phtml @@ -2,6 +2,11 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $females + * @var string $males + */ + ?> <div class="d-flex flex-wrap justify-content-around"> diff --git a/resources/views/modules/top10_givnnames/config.phtml b/resources/views/modules/top10_givnnames/config.phtml index aa5672538f..d8aed88e5c 100644 --- a/resources/views/modules/top10_givnnames/config.phtml +++ b/resources/views/modules/top10_givnnames/config.phtml @@ -2,6 +2,12 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $info_style + * @var array<string,string> $info_styles + * @var string $num + */ + ?> <div class="form-group row"> @@ -18,6 +24,6 @@ use Fisharebest\Webtrees\I18N; <?= I18N::translate('Presentation style') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'infoStyle', 'selected' => $infoStyle, 'options' => $info_styles]) ?> + <?= view('components/select', ['name' => 'infoStyle', 'selected' => $info_style, 'options' => $info_styles]) ?> </div> </div> diff --git a/resources/views/modules/top10_pageviews/config.phtml b/resources/views/modules/top10_pageviews/config.phtml index 90bd8b13b4..685ae00e2b 100644 --- a/resources/views/modules/top10_pageviews/config.phtml +++ b/resources/views/modules/top10_pageviews/config.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $num + */ + ?> <div class="form-group row"> diff --git a/resources/views/modules/top10_pageviews/list.phtml b/resources/views/modules/top10_pageviews/list.phtml index bb17780422..d1ac2a1999 100644 --- a/resources/views/modules/top10_pageviews/list.phtml +++ b/resources/views/modules/top10_pageviews/list.phtml @@ -2,6 +2,10 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,mixed> $results + */ + ?> <ul class="list-unstyled"> <?php foreach ($results as $result) : ?> diff --git a/resources/views/modules/top10_surnames/config.phtml b/resources/views/modules/top10_surnames/config.phtml index 9ec5571454..37a1647093 100644 --- a/resources/views/modules/top10_surnames/config.phtml +++ b/resources/views/modules/top10_surnames/config.phtml @@ -2,6 +2,12 @@ use Fisharebest\Webtrees\I18N; +/** + * @var string $info_style + * @var array<string> $info_styles + * @var string $num + */ + ?> <div class="form-group row"> @@ -18,6 +24,6 @@ use Fisharebest\Webtrees\I18N; <?= I18N::translate('Presentation style') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'infoStyle', 'selected' => $infoStyle, 'options' => $info_styles]) ?> + <?= view('components/select', ['name' => 'infoStyle', 'selected' => $info_style, 'options' => $info_styles]) ?> </div> </div> diff --git a/resources/views/modules/upcoming_events/config.phtml b/resources/views/modules/upcoming_events/config.phtml index cb00909ac0..a8ffb4ec06 100644 --- a/resources/views/modules/upcoming_events/config.phtml +++ b/resources/views/modules/upcoming_events/config.phtml @@ -2,6 +2,18 @@ use Fisharebest\Webtrees\I18N; +/** + * @var array<string,string> $all_events + * @var int $days + * @var array<string> $event_array + * @var string $filter + * @var string $info_style + * @var array<string,string> $info_styles + * @var string $sort_style + * @var array<string,string> $sort_styles + * @var int $max_days + */ + ?> <div class="form-group row"> @@ -37,7 +49,7 @@ use Fisharebest\Webtrees\I18N; <?= /* I18N: Label for a configuration option */ I18N::translate('Presentation style') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'infoStyle', 'selected' => $infoStyle, 'options' => $info_styles]) ?> + <?= view('components/select', ['name' => 'infoStyle', 'selected' => $info_style, 'options' => $info_styles]) ?> </div> </div> @@ -46,6 +58,6 @@ use Fisharebest\Webtrees\I18N; <?= /* I18N: Label for a configuration option */ I18N::translate('Sort order') ?> </label> <div class="col-sm-9"> - <?= view('components/select', ['name' => 'sortStyle', 'selected' => $sortStyle, 'options' => $sort_styles]) ?> + <?= view('components/select', ['name' => 'sortStyle', 'selected' => $sort_style, 'options' => $sort_styles]) ?> </div> </div> diff --git a/resources/views/modules/user_blog/list.phtml b/resources/views/modules/user_blog/list.phtml index 8db664af04..0daf7dff4e 100644 --- a/resources/views/modules/user_blog/list.phtml +++ b/resources/views/modules/user_blog/list.phtml @@ -19,7 +19,7 @@ use Illuminate\Support\Collection; <?php endif ?> <?php foreach ($articles as $n => $article) : ?> - <?php if ($n === 5 && count($articles) > $limit) : ?> + <?php if ($n === $limit && count($articles) > $limit) : ?> <p> <button class="btn btn-sm btn-secondary" data-toggle="collapse" data-target="#more-news-<?= e($block_id) ?>" role="button" aria-expanded="false" aria-controls="more-news-<?= e($block_id) ?>"> <?= view('icons/add') ?> @@ -50,7 +50,7 @@ use Illuminate\Support\Collection; </div> <?php endforeach ?> -<?php if (count($articles) > 5) : ?> +<?php if (count($articles) > $limit) : ?> </div> <?php endif ?> diff --git a/resources/views/robots-txt.phtml b/resources/views/robots-txt.phtml index dd8b07672b..6cc51cbd3e 100644 --- a/resources/views/robots-txt.phtml +++ b/resources/views/robots-txt.phtml @@ -1,9 +1,10 @@ <?php /** - * @var string $base_path - * @var string $base_url - * @var string $sitemap_url + * @var array<string> $bad_user_agents + * @var string $base_path + * @var string $base_url + * @var string $sitemap_url */ ?> |