diff options
194 files changed, 830 insertions, 820 deletions
diff --git a/app/Fact.php b/app/Fact.php index 02e62ef936..5f2f93af5a 100644 --- a/app/Fact.php +++ b/app/Fact.php @@ -750,9 +750,9 @@ class Fact * using the compare type function * 3. Then merge the arrays back into the original array using the compare type function * - * @param Collection<Fact> $unsorted + * @param Collection<int,Fact> $unsorted * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public static function sortFacts(Collection $unsorted): Collection { @@ -807,9 +807,9 @@ class Fact /** * Sort fact/event tags using the same order that we use for facts. * - * @param Collection<string> $unsorted + * @param Collection<int,string> $unsorted * - * @return Collection<string> + * @return Collection<int,string> */ public static function sortFactTags(Collection $unsorted): Collection { diff --git a/app/Factories/AbstractGedcomRecordFactory.php b/app/Factories/AbstractGedcomRecordFactory.php index 6b6adde7d7..6d273b411e 100644 --- a/app/Factories/AbstractGedcomRecordFactory.php +++ b/app/Factories/AbstractGedcomRecordFactory.php @@ -33,7 +33,7 @@ abstract class AbstractGedcomRecordFactory /** * @param Tree $tree * - * @return Collection<object> + * @return Collection<int,object> */ protected function pendingChanges(Tree $tree): Collection { diff --git a/app/Family.php b/app/Family.php index 093381cb16..3f2c67cb68 100644 --- a/app/Family.php +++ b/app/Family.php @@ -198,7 +198,7 @@ class Family extends GedcomRecord * * @param int|null $access_level * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function spouses(int $access_level = null): Collection { @@ -215,7 +215,7 @@ class Family extends GedcomRecord * * @param int|null $access_level * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function children(int $access_level = null): Collection { diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index c1d74decd6..957047c568 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -551,7 +551,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function linkedIndividuals(string $link): Collection { @@ -575,7 +575,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Family> + * @return Collection<int,Family> */ public function linkedFamilies(string $link): Collection { @@ -599,7 +599,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Source> + * @return Collection<int,Source> */ public function linkedSources(string $link): Collection { @@ -623,7 +623,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Media> + * @return Collection<int,Media> */ public function linkedMedia(string $link): Collection { @@ -647,7 +647,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Note> + * @return Collection<int,Note> */ public function linkedNotes(string $link): Collection { @@ -672,7 +672,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Repository> + * @return Collection<int,Repository> */ public function linkedRepositories(string $link): Collection { @@ -697,7 +697,7 @@ class GedcomRecord * * @param string $link * - * @return Collection<Location> + * @return Collection<int,Location> */ public function linkedLocations(string $link): Collection { @@ -769,7 +769,7 @@ class GedcomRecord * @param int|null $access_level * @param bool $ignore_deleted * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function facts( array $filter = [], @@ -1215,7 +1215,7 @@ class GedcomRecord * * @param int $level * @param string $fact_type - * @param Collection<Fact> $facts + * @param Collection<int,Fact> $facts * * @return void */ diff --git a/app/Http/RequestHandlers/AbstractAutocompleteHandler.php b/app/Http/RequestHandlers/AbstractAutocompleteHandler.php index a4648a101a..7e4271540c 100644 --- a/app/Http/RequestHandlers/AbstractAutocompleteHandler.php +++ b/app/Http/RequestHandlers/AbstractAutocompleteHandler.php @@ -67,7 +67,7 @@ abstract class AbstractAutocompleteHandler implements RequestHandlerInterface /** * @param ServerRequestInterface $request * - * @return Collection<string> + * @return Collection<int,string> */ abstract protected function search(ServerRequestInterface $request): Collection; } diff --git a/app/Http/RequestHandlers/AbstractTomSelectHandler.php b/app/Http/RequestHandlers/AbstractTomSelectHandler.php index 90b88e1aef..7411ef7e54 100644 --- a/app/Http/RequestHandlers/AbstractTomSelectHandler.php +++ b/app/Http/RequestHandlers/AbstractTomSelectHandler.php @@ -84,7 +84,7 @@ abstract class AbstractTomSelectHandler implements RequestHandlerInterface * @param int $limit * @param string $at "@" or "" * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ abstract protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection; } diff --git a/app/Http/RequestHandlers/AutoCompleteFolder.php b/app/Http/RequestHandlers/AutoCompleteFolder.php index d95c7063f7..8b10b33626 100644 --- a/app/Http/RequestHandlers/AutoCompleteFolder.php +++ b/app/Http/RequestHandlers/AutoCompleteFolder.php @@ -45,7 +45,7 @@ class AutoCompleteFolder extends AbstractAutocompleteHandler /** * @param ServerRequestInterface $request * - * @return Collection<string> + * @return Collection<int,string> */ protected function search(ServerRequestInterface $request): Collection { diff --git a/app/Http/RequestHandlers/AutoCompletePlace.php b/app/Http/RequestHandlers/AutoCompletePlace.php index 899452ca44..0fe25ab498 100644 --- a/app/Http/RequestHandlers/AutoCompletePlace.php +++ b/app/Http/RequestHandlers/AutoCompletePlace.php @@ -50,7 +50,7 @@ class AutoCompletePlace extends AbstractAutocompleteHandler /** * @param ServerRequestInterface $request * - * @return Collection<string> + * @return Collection<int,string> */ protected function search(ServerRequestInterface $request): Collection { diff --git a/app/Http/RequestHandlers/AutoCompleteSurname.php b/app/Http/RequestHandlers/AutoCompleteSurname.php index f8dd20be3e..2f3541b15b 100644 --- a/app/Http/RequestHandlers/AutoCompleteSurname.php +++ b/app/Http/RequestHandlers/AutoCompleteSurname.php @@ -33,7 +33,7 @@ class AutoCompleteSurname extends AbstractAutocompleteHandler /** * @param ServerRequestInterface $request * - * @return Collection<string> + * @return Collection<int,string> */ protected function search(ServerRequestInterface $request): Collection { diff --git a/app/Http/RequestHandlers/ControlPanel.php b/app/Http/RequestHandlers/ControlPanel.php index 4373ecc4ad..8c0db3ee7c 100644 --- a/app/Http/RequestHandlers/ControlPanel.php +++ b/app/Http/RequestHandlers/ControlPanel.php @@ -237,7 +237,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of individuals in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalIndividuals(): Collection { @@ -253,7 +253,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of families in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalFamilies(): Collection { @@ -269,7 +269,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of sources in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalSources(): Collection { @@ -285,7 +285,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of media objects in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalMediaObjects(): Collection { @@ -299,9 +299,9 @@ class ControlPanel implements RequestHandlerInterface } /** - * Count the number of repositorie in each tree. + * Count the number of repositories in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalRepositories(): Collection { @@ -321,7 +321,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of notes in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalNotes(): Collection { @@ -341,7 +341,7 @@ class ControlPanel implements RequestHandlerInterface /** * Count the number of submitters in each tree. * - * @return Collection<string,int> + * @return Collection<int,int> */ private function totalSubmitters(): Collection { diff --git a/app/Http/RequestHandlers/DataFixUpdateAll.php b/app/Http/RequestHandlers/DataFixUpdateAll.php index f4d15db153..165ce2f8cd 100644 --- a/app/Http/RequestHandlers/DataFixUpdateAll.php +++ b/app/Http/RequestHandlers/DataFixUpdateAll.php @@ -90,7 +90,7 @@ class DataFixUpdateAll implements RequestHandlerInterface return $this->createUpdateRanges($tree, $module, $rows, $params); } - /** @var Collection<GedcomRecord> $records */ + /** @var Collection<int,GedcomRecord> $records */ $records = $rows->map(function (object $row) use ($tree): ?GedcomRecord { return $this->data_fix_service->getRecordByType($row->xref, $tree, $row->type); })->filter(static function (?GedcomRecord $record) use ($module, $params): bool { @@ -107,7 +107,7 @@ class DataFixUpdateAll implements RequestHandlerInterface /** * @param Tree $tree * @param ModuleDataFixInterface $module - * @param Collection<object> $rows + * @param Collection<int,object> $rows * @param array<string> $params * * @return ResponseInterface diff --git a/app/Http/RequestHandlers/IndividualPage.php b/app/Http/RequestHandlers/IndividualPage.php index a19b949dbf..86a236fd8c 100644 --- a/app/Http/RequestHandlers/IndividualPage.php +++ b/app/Http/RequestHandlers/IndividualPage.php @@ -247,7 +247,7 @@ class IndividualPage implements RequestHandlerInterface * * @param Individual $individual * - * @return Collection<ModuleSidebarInterface> + * @return Collection<int,ModuleSidebarInterface> */ public function getSidebars(Individual $individual): Collection { @@ -264,7 +264,7 @@ class IndividualPage implements RequestHandlerInterface * * @param Individual $individual * - * @return Collection<ModuleTabInterface> + * @return Collection<int,ModuleTabInterface> */ public function getTabs(Individual $individual): Collection { diff --git a/app/Http/RequestHandlers/SearchReplaceAction.php b/app/Http/RequestHandlers/SearchReplaceAction.php index f4978e2c1c..a063590b5f 100644 --- a/app/Http/RequestHandlers/SearchReplaceAction.php +++ b/app/Http/RequestHandlers/SearchReplaceAction.php @@ -124,9 +124,9 @@ class SearchReplaceAction implements RequestHandlerInterface } /** - * @param Collection<GedcomRecord> $records - * @param string $search - * @param string $replace + * @param Collection<int,GedcomRecord> $records + * @param string $search + * @param string $replace * * @return int */ @@ -149,10 +149,10 @@ class SearchReplaceAction implements RequestHandlerInterface } /** - * @param Collection<GedcomRecord> $records - * @param string $search - * @param string $replace - * @param array<string> $name_tags + * @param Collection<int,GedcomRecord> $records + * @param string $search + * @param string $replace + * @param array<string> $name_tags * * @return int */ @@ -176,9 +176,9 @@ class SearchReplaceAction implements RequestHandlerInterface } /** - * @param Collection<GedcomRecord> $records - * @param string $search - * @param string $replace + * @param Collection<int,GedcomRecord> $records + * @param string $search + * @param string $replace * * @return int */ diff --git a/app/Http/RequestHandlers/TomSelectFamily.php b/app/Http/RequestHandlers/TomSelectFamily.php index 6913bef7d3..1ec2f3ea02 100644 --- a/app/Http/RequestHandlers/TomSelectFamily.php +++ b/app/Http/RequestHandlers/TomSelectFamily.php @@ -55,7 +55,7 @@ class TomSelectFamily extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectIndividual.php b/app/Http/RequestHandlers/TomSelectIndividual.php index c01c6a7ec0..6f4cde38d1 100644 --- a/app/Http/RequestHandlers/TomSelectIndividual.php +++ b/app/Http/RequestHandlers/TomSelectIndividual.php @@ -54,7 +54,7 @@ class TomSelectIndividual extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectLocation.php b/app/Http/RequestHandlers/TomSelectLocation.php index b878c94740..52fe57ae3a 100644 --- a/app/Http/RequestHandlers/TomSelectLocation.php +++ b/app/Http/RequestHandlers/TomSelectLocation.php @@ -54,7 +54,7 @@ class TomSelectLocation extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectMediaObject.php b/app/Http/RequestHandlers/TomSelectMediaObject.php index 420973ba94..7d4844b3ee 100644 --- a/app/Http/RequestHandlers/TomSelectMediaObject.php +++ b/app/Http/RequestHandlers/TomSelectMediaObject.php @@ -56,7 +56,7 @@ class TomSelectMediaObject extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectNote.php b/app/Http/RequestHandlers/TomSelectNote.php index bc62d4a61f..d7afe661f4 100644 --- a/app/Http/RequestHandlers/TomSelectNote.php +++ b/app/Http/RequestHandlers/TomSelectNote.php @@ -54,7 +54,7 @@ class TomSelectNote extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectPlace.php b/app/Http/RequestHandlers/TomSelectPlace.php index 029ff3c55e..8ac29176b4 100644 --- a/app/Http/RequestHandlers/TomSelectPlace.php +++ b/app/Http/RequestHandlers/TomSelectPlace.php @@ -48,7 +48,7 @@ class TomSelectPlace extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectRepository.php b/app/Http/RequestHandlers/TomSelectRepository.php index c85e89db81..82c81b987e 100644 --- a/app/Http/RequestHandlers/TomSelectRepository.php +++ b/app/Http/RequestHandlers/TomSelectRepository.php @@ -54,7 +54,7 @@ class TomSelectRepository extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectSource.php b/app/Http/RequestHandlers/TomSelectSource.php index fd473afba6..ec2c85c5db 100644 --- a/app/Http/RequestHandlers/TomSelectSource.php +++ b/app/Http/RequestHandlers/TomSelectSource.php @@ -56,7 +56,7 @@ class TomSelectSource extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectSubmission.php b/app/Http/RequestHandlers/TomSelectSubmission.php index 6411799bd9..2a3e144643 100644 --- a/app/Http/RequestHandlers/TomSelectSubmission.php +++ b/app/Http/RequestHandlers/TomSelectSubmission.php @@ -54,7 +54,7 @@ class TomSelectSubmission extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Http/RequestHandlers/TomSelectSubmitter.php b/app/Http/RequestHandlers/TomSelectSubmitter.php index 91341a4069..62d41c7a08 100644 --- a/app/Http/RequestHandlers/TomSelectSubmitter.php +++ b/app/Http/RequestHandlers/TomSelectSubmitter.php @@ -54,7 +54,7 @@ class TomSelectSubmitter extends AbstractTomSelectHandler * @param int $limit * @param string $at * - * @return Collection<array<string,string>> + * @return Collection<int,array<string,string>> */ protected function search(Tree $tree, string $query, int $offset, int $limit, string $at): Collection { diff --git a/app/Individual.php b/app/Individual.php index 9adf392e58..c0a594d255 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -690,7 +690,7 @@ class Individual extends GedcomRecord * * @param int|null $access_level * - * @return Collection<Family> + * @return Collection<int,Family> */ public function spouseFamilies(int $access_level = null): Collection { @@ -756,7 +756,7 @@ class Individual extends GedcomRecord * * @param int|null $access_level * - * @return Collection<Family> + * @return Collection<int,Family> */ public function childFamilies(int $access_level = null): Collection { @@ -781,7 +781,7 @@ class Individual extends GedcomRecord /** * Get a list of step-parent families. * - * @return Collection<Family> + * @return Collection<int,Family> */ public function childStepFamilies(): Collection { @@ -805,7 +805,7 @@ class Individual extends GedcomRecord /** * Get a list of step-parent families. * - * @return Collection<Family> + * @return Collection<int,Family> */ public function spouseStepFamilies(): Collection { diff --git a/app/Media.php b/app/Media.php index fea90b81b3..8b68d48031 100644 --- a/app/Media.php +++ b/app/Media.php @@ -62,7 +62,7 @@ class Media extends GedcomRecord /** * Get the media files for this media object * - * @return Collection<MediaFile> + * @return Collection<int,MediaFile> */ public function mediaFiles(): Collection { diff --git a/app/Module/AlbumModule.php b/app/Module/AlbumModule.php index 0a0fecbd4d..b678e79d80 100644 --- a/app/Module/AlbumModule.php +++ b/app/Module/AlbumModule.php @@ -82,7 +82,7 @@ class AlbumModule extends MediaTabModule * * @param Individual $individual * - * @return Collection<Media> + * @return Collection<int,Media> */ private function getMedia(Individual $individual): Collection { diff --git a/app/Module/AustrianHistoricEvents.php b/app/Module/AustrianHistoricEvents.php index 7f16137620..df946337f2 100644 --- a/app/Module/AustrianHistoricEvents.php +++ b/app/Module/AustrianHistoricEvents.php @@ -52,7 +52,7 @@ class AustrianHistoricEvents extends AbstractModule implements ModuleHistoricEve /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/AustrianPresidents.php b/app/Module/AustrianPresidents.php index 6f9f796ad4..ae80d1caa4 100644 --- a/app/Module/AustrianPresidents.php +++ b/app/Module/AustrianPresidents.php @@ -52,7 +52,7 @@ class AustrianPresidents extends AbstractModule implements ModuleHistoricEventsI /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/BritishMonarchs.php b/app/Module/BritishMonarchs.php index b2e6089dbd..6f11473873 100644 --- a/app/Module/BritishMonarchs.php +++ b/app/Module/BritishMonarchs.php @@ -52,7 +52,7 @@ class BritishMonarchs extends AbstractModule implements ModuleHistoricEventsInte /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/BritishPrimeMinisters.php b/app/Module/BritishPrimeMinisters.php index ee8350f1b7..d8a3b70093 100644 --- a/app/Module/BritishPrimeMinisters.php +++ b/app/Module/BritishPrimeMinisters.php @@ -52,7 +52,7 @@ class BritishPrimeMinisters extends AbstractModule implements ModuleHistoricEven /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/BritishSocialHistory.php b/app/Module/BritishSocialHistory.php index 845be08355..1849641724 100644 --- a/app/Module/BritishSocialHistory.php +++ b/app/Module/BritishSocialHistory.php @@ -52,7 +52,7 @@ class BritishSocialHistory extends AbstractModule implements ModuleHistoricEvent /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/CzechMonarchsAndPresidents.php b/app/Module/CzechMonarchsAndPresidents.php index 7ba46f91be..a4fe17cbc1 100644 --- a/app/Module/CzechMonarchsAndPresidents.php +++ b/app/Module/CzechMonarchsAndPresidents.php @@ -52,7 +52,7 @@ class CzechMonarchsAndPresidents extends AbstractModule implements ModuleHistori /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/DutchMonarchs.php b/app/Module/DutchMonarchs.php index c832bfd60c..ff9258d300 100644 --- a/app/Module/DutchMonarchs.php +++ b/app/Module/DutchMonarchs.php @@ -52,7 +52,7 @@ class DutchMonarchs extends AbstractModule implements ModuleHistoricEventsInterf /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/DutchPrimeMinisters.php b/app/Module/DutchPrimeMinisters.php index 750b2bec6b..4f5cc63349 100644 --- a/app/Module/DutchPrimeMinisters.php +++ b/app/Module/DutchPrimeMinisters.php @@ -52,7 +52,7 @@ class DutchPrimeMinisters extends AbstractModule implements ModuleHistoricEvents /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/FixCemeteryTag.php b/app/Module/FixCemeteryTag.php index 72375f0df0..b7ad82369f 100644 --- a/app/Module/FixCemeteryTag.php +++ b/app/Module/FixCemeteryTag.php @@ -100,7 +100,7 @@ class FixCemeteryTag extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { diff --git a/app/Module/FixDuplicateLinks.php b/app/Module/FixDuplicateLinks.php index 45c3412b1c..079d77f3c2 100644 --- a/app/Module/FixDuplicateLinks.php +++ b/app/Module/FixDuplicateLinks.php @@ -76,7 +76,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function familiesToFix(Tree $tree, array $params): Collection { @@ -92,7 +92,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { @@ -108,7 +108,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function mediaToFix(Tree $tree, array $params): Collection { @@ -124,7 +124,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function notesToFix(Tree $tree, array $params): Collection { @@ -140,7 +140,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function repositoriesToFix(Tree $tree, array $params): Collection { @@ -156,7 +156,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function sourcesToFix(Tree $tree, array $params): Collection { @@ -172,7 +172,7 @@ class FixDuplicateLinks extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ protected function submittersToFix(Tree $tree, array $params): Collection { diff --git a/app/Module/FixMissingDeaths.php b/app/Module/FixMissingDeaths.php index 66ac4e74cd..5279165e2e 100644 --- a/app/Module/FixMissingDeaths.php +++ b/app/Module/FixMissingDeaths.php @@ -75,7 +75,7 @@ class FixMissingDeaths extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { diff --git a/app/Module/FixNameSlashesAndSpaces.php b/app/Module/FixNameSlashesAndSpaces.php index e0fb6e60fd..f11f2360f2 100644 --- a/app/Module/FixNameSlashesAndSpaces.php +++ b/app/Module/FixNameSlashesAndSpaces.php @@ -76,7 +76,7 @@ class FixNameSlashesAndSpaces extends AbstractModule implements ModuleDataFixInt * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { diff --git a/app/Module/FixNameTags.php b/app/Module/FixNameTags.php index 5b5ab5f2d7..391ab98472 100644 --- a/app/Module/FixNameTags.php +++ b/app/Module/FixNameTags.php @@ -100,7 +100,7 @@ class FixNameTags extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ public function individualsToFix(Tree $tree, array $params): Collection { diff --git a/app/Module/FixPlaceNames.php b/app/Module/FixPlaceNames.php index 1898974e11..548d0ef07e 100644 --- a/app/Module/FixPlaceNames.php +++ b/app/Module/FixPlaceNames.php @@ -91,7 +91,7 @@ class FixPlaceNames extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function familiesToFix(Tree $tree, array $params): ?Collection { @@ -113,7 +113,7 @@ class FixPlaceNames extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { diff --git a/app/Module/FixPrimaryTag.php b/app/Module/FixPrimaryTag.php index 0c9e7f3415..9f3ed91a51 100644 --- a/app/Module/FixPrimaryTag.php +++ b/app/Module/FixPrimaryTag.php @@ -65,7 +65,7 @@ class FixPrimaryTag extends AbstractModule implements ModuleDataFixInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string> + * @return Collection<int,string> */ public function mediaToFix(Tree $tree, array $params): Collection { diff --git a/app/Module/FixSearchAndReplace.php b/app/Module/FixSearchAndReplace.php index 66efa6a202..451669cb64 100644 --- a/app/Module/FixSearchAndReplace.php +++ b/app/Module/FixSearchAndReplace.php @@ -133,7 +133,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function familiesToFix(Tree $tree, array $params): ?Collection { @@ -154,7 +154,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(Tree $tree, array $params): ?Collection { @@ -177,7 +177,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function locationsToFix(Tree $tree, array $params): ?Collection { @@ -201,7 +201,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function mediaToFix(Tree $tree, array $params): ?Collection { @@ -224,7 +224,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function notesToFix(Tree $tree, array $params): ?Collection { @@ -248,7 +248,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function repositoriesToFix(Tree $tree, array $params): ?Collection { @@ -272,7 +272,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function sourcesToFix(Tree $tree, array $params): ?Collection { @@ -294,7 +294,7 @@ class FixSearchAndReplace extends AbstractModule implements ModuleDataFixInterfa * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function submittersToFix(Tree $tree, array $params): ?Collection { diff --git a/app/Module/FrenchHistory.php b/app/Module/FrenchHistory.php index c306305313..85e217536b 100644 --- a/app/Module/FrenchHistory.php +++ b/app/Module/FrenchHistory.php @@ -54,7 +54,7 @@ class FrenchHistory extends AbstractModule implements ModuleHistoricEventsInterf /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index d563b4aa9e..bbdc473d34 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -407,7 +407,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon /** * @param Tree $tree * - * @return Collection<object> + * @return Collection<int,object> */ private function faqsForTree(Tree $tree): Collection { diff --git a/app/Module/IndividualFactsTabModule.php b/app/Module/IndividualFactsTabModule.php index 41d484283b..c6158d1fa5 100644 --- a/app/Module/IndividualFactsTabModule.php +++ b/app/Module/IndividualFactsTabModule.php @@ -184,7 +184,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf * @param Date $min_date * @param Date $max_date * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function spouseFacts(Individual $individual, Individual $spouse, Date $min_date, Date $max_date): Collection { @@ -274,7 +274,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf * @param Date $min_date * @param Date $max_date * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function childFacts(Individual $person, Family $family, string $option, string $relation, Date $min_date, Date $max_date): Collection { @@ -706,7 +706,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf * @param Date $min_date * @param Date $max_date * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function parentFacts(Individual $person, int $sosa, Date $min_date, Date $max_date): Collection { @@ -873,7 +873,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf * * @param Individual $person * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function associateFacts(Individual $person): Collection { @@ -917,7 +917,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function historicFacts(Individual $individual): Collection { @@ -953,7 +953,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/IndividualMetadataModule.php b/app/Module/IndividualMetadataModule.php index 32965bdfcc..34ecea1ba1 100644 --- a/app/Module/IndividualMetadataModule.php +++ b/app/Module/IndividualMetadataModule.php @@ -109,7 +109,7 @@ class IndividualMetadataModule extends AbstractModule implements ModuleSidebarIn /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php index 2b301c2b52..aa6aa8c614 100644 --- a/app/Module/InteractiveTree/TreeView.php +++ b/app/Module/InteractiveTree/TreeView.php @@ -176,9 +176,9 @@ class TreeView /** * Draw the children for some families * - * @param Collection<Family> $familyList array of families to draw the children for - * @param int $gen number of generations to draw - * @param bool $ajax true for an ajax call + * @param Collection<int,Family> $familyList array of families to draw the children for + * @param int $gen number of generations to draw + * @param bool $ajax true for an ajax call * * @return string */ diff --git a/app/Module/LowCountriesRulers.php b/app/Module/LowCountriesRulers.php index 60c8e8f1a5..395dad8fc0 100644 --- a/app/Module/LowCountriesRulers.php +++ b/app/Module/LowCountriesRulers.php @@ -52,7 +52,7 @@ class LowCountriesRulers extends AbstractModule implements ModuleHistoricEventsI /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Module/MediaListModule.php b/app/Module/MediaListModule.php index 388889ad5d..e4e2433056 100644 --- a/app/Module/MediaListModule.php +++ b/app/Module/MediaListModule.php @@ -259,7 +259,7 @@ class MediaListModule extends AbstractModule implements ModuleListInterface, Req * @param string $filter optional search string * @param string $format option OBJE/FILE/FORM/TYPE * - * @return Collection<Media> + * @return Collection<int,Media> */ private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $format): Collection { diff --git a/app/Module/MediaTabModule.php b/app/Module/MediaTabModule.php index edf0dbf401..3aa6b3b12d 100644 --- a/app/Module/MediaTabModule.php +++ b/app/Module/MediaTabModule.php @@ -127,7 +127,7 @@ class MediaTabModule extends AbstractModule implements ModuleTabInterface * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ protected function getFactsWithMedia(Individual $individual): Collection { @@ -161,7 +161,7 @@ class MediaTabModule extends AbstractModule implements ModuleTabInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/ModuleDataFixInterface.php b/app/Module/ModuleDataFixInterface.php index 8ca44d7a8c..26ed389f3e 100644 --- a/app/Module/ModuleDataFixInterface.php +++ b/app/Module/ModuleDataFixInterface.php @@ -43,7 +43,7 @@ interface ModuleDataFixInterface extends ModuleInterface * @param Tree $tree * @param array<string,string> $params * - * @return Collection<object> + * @return Collection<int,object> */ public function recordsToFix(Tree $tree, array $params): Collection; diff --git a/app/Module/ModuleDataFixTrait.php b/app/Module/ModuleDataFixTrait.php index 5368a915bd..1405142718 100644 --- a/app/Module/ModuleDataFixTrait.php +++ b/app/Module/ModuleDataFixTrait.php @@ -57,7 +57,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<object> + * @return Collection<int,object> */ public function recordsToFix(Tree $tree, array $params): Collection { @@ -155,7 +155,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function familiesToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -186,7 +186,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function individualsToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -217,7 +217,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function locationsToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -249,7 +249,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function mediaToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -280,7 +280,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function notesToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -312,7 +312,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function repositoriesToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -344,7 +344,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function sourcesToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -375,7 +375,7 @@ trait ModuleDataFixTrait * @param Tree $tree * @param array<string,string> $params * - * @return Collection<string>|null + * @return Collection<int,string>|null */ protected function submittersToFix(/** @scrutinizer ignore-unused */ Tree $tree, /** @scrutinizer ignore-unused */ array $params): ?Collection { @@ -404,11 +404,11 @@ trait ModuleDataFixTrait /** * Merge pending changes of a given type. We need to check all pending records. * - * @param Collection<string> $records - * @param Tree $tree - * @param string $type + * @param Collection<int,string> $records + * @param Tree $tree + * @param string $type * - * @return Collection<object> + * @return Collection<int,object> */ private function mergePendingRecords(Collection $records, Tree $tree, string $type): Collection { diff --git a/app/Module/ModuleHistoricEventsInterface.php b/app/Module/ModuleHistoricEventsInterface.php index e77ed04369..17f4188778 100644 --- a/app/Module/ModuleHistoricEventsInterface.php +++ b/app/Module/ModuleHistoricEventsInterface.php @@ -31,7 +31,7 @@ interface ModuleHistoricEventsInterface extends ModuleInterface /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection; @@ -40,7 +40,7 @@ interface ModuleHistoricEventsInterface extends ModuleInterface * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function historicEventsForIndividual(Individual $individual): Collection; } diff --git a/app/Module/ModuleHistoricEventsTrait.php b/app/Module/ModuleHistoricEventsTrait.php index e0c38b0425..dd5e092727 100644 --- a/app/Module/ModuleHistoricEventsTrait.php +++ b/app/Module/ModuleHistoricEventsTrait.php @@ -43,7 +43,7 @@ trait ModuleHistoricEventsTrait /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { @@ -57,7 +57,7 @@ trait ModuleHistoricEventsTrait * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function historicEventsForIndividual(Individual $individual): Collection { diff --git a/app/Module/ModuleSidebarInterface.php b/app/Module/ModuleSidebarInterface.php index 39263eb1c6..33ff0b70bc 100644 --- a/app/Module/ModuleSidebarInterface.php +++ b/app/Module/ModuleSidebarInterface.php @@ -79,7 +79,7 @@ interface ModuleSidebarInterface extends ModuleInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection; } diff --git a/app/Module/ModuleSidebarTrait.php b/app/Module/ModuleSidebarTrait.php index f1f23454e2..056f6b8f4c 100644 --- a/app/Module/ModuleSidebarTrait.php +++ b/app/Module/ModuleSidebarTrait.php @@ -78,7 +78,7 @@ trait ModuleSidebarTrait /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/ModuleTabInterface.php b/app/Module/ModuleTabInterface.php index 18f8ff8d0d..4ecc6de8be 100644 --- a/app/Module/ModuleTabInterface.php +++ b/app/Module/ModuleTabInterface.php @@ -97,7 +97,7 @@ interface ModuleTabInterface extends ModuleInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection; diff --git a/app/Module/ModuleTabTrait.php b/app/Module/ModuleTabTrait.php index ca5ccc2761..4c5020a370 100644 --- a/app/Module/ModuleTabTrait.php +++ b/app/Module/ModuleTabTrait.php @@ -84,7 +84,7 @@ trait ModuleTabTrait /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/NotesTabModule.php b/app/Module/NotesTabModule.php index d294d2a413..afb7786d34 100644 --- a/app/Module/NotesTabModule.php +++ b/app/Module/NotesTabModule.php @@ -127,7 +127,7 @@ class NotesTabModule extends AbstractModule implements ModuleTabInterface * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function getFactsWithNotes(Individual $individual): Collection { @@ -165,7 +165,7 @@ class NotesTabModule extends AbstractModule implements ModuleTabInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/PlacesModule.php b/app/Module/PlacesModule.php index 434994dd29..68a3d803f2 100644 --- a/app/Module/PlacesModule.php +++ b/app/Module/PlacesModule.php @@ -170,7 +170,7 @@ class PlacesModule extends AbstractModule implements ModuleTabInterface /** * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> * @throws Exception */ private function getPersonalFacts(Individual $individual): Collection diff --git a/app/Module/PrivacyPolicy.php b/app/Module/PrivacyPolicy.php index c7115c46b1..54d7805b78 100644 --- a/app/Module/PrivacyPolicy.php +++ b/app/Module/PrivacyPolicy.php @@ -137,7 +137,7 @@ class PrivacyPolicy extends AbstractModule implements ModuleFooterInterface * @param Tree $tree * @param UserInterface $user * - * @return Collection<ModuleAnalyticsInterface> + * @return Collection<int,ModuleAnalyticsInterface> */ protected function analyticsModules(Tree $tree, UserInterface $user): Collection { diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php index 8b2c6a484f..329b9dfc05 100644 --- a/app/Module/RecentChangesModule.php +++ b/app/Module/RecentChangesModule.php @@ -293,7 +293,7 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface * @param Tree $tree Changes for which tree * @param int $days Number of days * - * @return Collection<object> List of records with changes + * @return Collection<int,object> List of records with changes */ private function getRecentChangesFromDatabase(Tree $tree, int $days): Collection { @@ -329,7 +329,7 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface * @param Tree $tree Changes for which tree * @param int $days Number of days * - * @return Collection<object> List of records with changes + * @return Collection<int,object> List of records with changes */ private function getRecentChangesFromGenealogy(Tree $tree, int $days): Collection { diff --git a/app/Module/RelativesTabModule.php b/app/Module/RelativesTabModule.php index ff4c8acefc..65ef52cb9d 100644 --- a/app/Module/RelativesTabModule.php +++ b/app/Module/RelativesTabModule.php @@ -128,7 +128,7 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index 52a78778c4..371742044d 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -147,7 +147,7 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface * @param Tree $tree * @param int $max_julian_day * - * @return Collection<Individual> + * @return Collection<int,Individual> */ private function individualsWithTasks(Tree $tree, int $max_julian_day): Collection { @@ -171,7 +171,7 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface * @param Tree $tree * @param int $max_julian_day * - * @return Collection<Family> + * @return Collection<int,Family> */ private function familiesWithTasks(Tree $tree, int $max_julian_day): Collection { diff --git a/app/Module/SiteMapModule.php b/app/Module/SiteMapModule.php index d5f2487d65..3c2101431d 100644 --- a/app/Module/SiteMapModule.php +++ b/app/Module/SiteMapModule.php @@ -339,7 +339,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<GedcomRecord> + * @return Collection<int,GedcomRecord> */ private function sitemapRecords(Tree $tree, string $type, int $limit, int $offset): Collection { @@ -389,7 +389,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Family> + * @return Collection<int,Family> */ private function sitemapFamilies(Tree $tree, int $limit, int $offset): Collection { @@ -407,7 +407,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Individual> + * @return Collection<int,Individual> */ private function sitemapIndividuals(Tree $tree, int $limit, int $offset): Collection { @@ -425,7 +425,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Media> + * @return Collection<int,Media> */ private function sitemapMedia(Tree $tree, int $limit, int $offset): Collection { @@ -443,7 +443,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Note> + * @return Collection<int,Note> */ private function sitemapNotes(Tree $tree, int $limit, int $offset): Collection { @@ -462,7 +462,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Repository> + * @return Collection<int,Repository> */ private function sitemapRepositories(Tree $tree, int $limit, int $offset): Collection { @@ -481,7 +481,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Source> + * @return Collection<int,Source> */ private function sitemapSources(Tree $tree, int $limit, int $offset): Collection { @@ -499,7 +499,7 @@ class SiteMapModule extends AbstractModule implements ModuleConfigInterface, Req * @param int $limit * @param int $offset * - * @return Collection<Submitter> + * @return Collection<int,Submitter> */ private function sitemapSubmitters(Tree $tree, int $limit, int $offset): Collection { diff --git a/app/Module/SourcesTabModule.php b/app/Module/SourcesTabModule.php index b9d76c2c31..b564829cd6 100644 --- a/app/Module/SourcesTabModule.php +++ b/app/Module/SourcesTabModule.php @@ -125,7 +125,7 @@ class SourcesTabModule extends AbstractModule implements ModuleTabInterface * * @param Individual $individual * - * @return Collection<Fact> + * @return Collection<int,Fact> */ private function getFactsWithSources(Individual $individual): Collection { @@ -167,7 +167,7 @@ class SourcesTabModule extends AbstractModule implements ModuleTabInterface /** * This module handles the following facts - so don't show them on the "Facts and events" tab. * - * @return Collection<string> + * @return Collection<int,string> */ public function supportedFacts(): Collection { diff --git a/app/Module/USPresidents.php b/app/Module/USPresidents.php index ea7282d5fb..41f99eb6fa 100644 --- a/app/Module/USPresidents.php +++ b/app/Module/USPresidents.php @@ -52,7 +52,7 @@ class USPresidents extends AbstractModule implements ModuleHistoricEventsInterfa /** * All events provided by this module. * - * @return Collection<string> + * @return Collection<int,string> */ public function historicEventsAll(): Collection { diff --git a/app/Place.php b/app/Place.php index 7f25250581..2ab12303a9 100644 --- a/app/Place.php +++ b/app/Place.php @@ -44,7 +44,7 @@ class Place // "Westminster, London, England" private string $place_name; - /** @var Collection<string> The parts of a place name, e.g. ["Westminster", "London", "England"] */ + /** @var Collection<int,string> The parts of a place name, e.g. ["Westminster", "London", "England"] */ private Collection $parts; private Tree $tree; @@ -161,7 +161,7 @@ class Place * * @param int $n * - * @return Collection<string> + * @return Collection<int,string> */ public function firstParts(int $n): Collection { @@ -173,7 +173,7 @@ class Place * * @param int $n * - * @return Collection<string> + * @return Collection<int,string> */ public function lastParts(int $n): Collection { diff --git a/app/PlaceLocation.php b/app/PlaceLocation.php index 576eb48f54..fbb08372b2 100644 --- a/app/PlaceLocation.php +++ b/app/PlaceLocation.php @@ -38,7 +38,7 @@ class PlaceLocation // e.g. "Westminster, London, England" private string $location_name; - /** @var Collection<string> The parts of a location name, e.g. ["Westminster", "London", "England"] */ + /** @var Collection<int,string> The parts of a location name, e.g. ["Westminster", "London", "England"] */ private Collection $parts; /** diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php index 23bef76df2..662070586d 100644 --- a/app/Services/AdminService.php +++ b/app/Services/AdminService.php @@ -245,7 +245,7 @@ class AdminService * * @param FilesystemOperator $filesystem * - * @return Collection<string> + * @return Collection<int,string> */ public function gedcomFiles(FilesystemOperator $filesystem): Collection { diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index 36df192483..b086cb27e9 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -201,7 +201,7 @@ class CalendarService * @param string $sort_by * @param Tree $tree * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function getEventsList(int $jd1, int $jd2, string $events, bool $only_living, string $sort_by, Tree $tree): Collection { diff --git a/app/Services/ChartService.php b/app/Services/ChartService.php index e43eb8761e..e4a06b76dd 100644 --- a/app/Services/ChartService.php +++ b/app/Services/ChartService.php @@ -34,7 +34,7 @@ class ChartService * @param Individual $individual Start with this individual * @param int $generations Fetch this number of generations * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function sosaStradonitzAncestors(Individual $individual, int $generations): Collection { @@ -75,7 +75,7 @@ class ChartService * @param Individual $individual Start with this individual * @param int $generations Fetch this number of generations * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function descendants(Individual $individual, int $generations): Collection { @@ -100,7 +100,7 @@ class ChartService * @param Individual $individual Start with this individual * @param int $generations Fetch this number of generations * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function descendantFamilies(Individual $individual, int $generations): Collection { diff --git a/app/Services/ClipboardService.php b/app/Services/ClipboardService.php index 8b381927b6..ea67879616 100644 --- a/app/Services/ClipboardService.php +++ b/app/Services/ClipboardService.php @@ -96,7 +96,7 @@ class ClipboardService * * @param GedcomRecord $record * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function pastableFacts(GedcomRecord $record): Collection { @@ -115,7 +115,7 @@ class ClipboardService * @param GedcomRecord $record * @param Collection $types * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function pastableFactsOfType(GedcomRecord $record, Collection $types): Collection { diff --git a/app/Services/DatatablesService.php b/app/Services/DatatablesService.php index f1df48b891..e26d1e7ce4 100644 --- a/app/Services/DatatablesService.php +++ b/app/Services/DatatablesService.php @@ -40,7 +40,7 @@ class DatatablesService * Apply filtering and pagination to a collection, and generate a response suitable for datatables. * * @param ServerRequestInterface $request Includes the datatables request parameters. - * @param Collection<mixed> $collection All the data. + * @param Collection<int,mixed> $collection All the data. * @param array<string>|array<int> $search_columns The names of searchable columns. * @param array<string>|array<int> $sort_columns Sort column mapping. * @param Closure $callback Converts a row-object to an array-of-columns. diff --git a/app/Services/GedcomEditService.php b/app/Services/GedcomEditService.php index 1aecfa0e3d..3abb1070b9 100644 --- a/app/Services/GedcomEditService.php +++ b/app/Services/GedcomEditService.php @@ -62,7 +62,7 @@ class GedcomEditService /** * @param Tree $tree * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function newFamilyFacts(Tree $tree): Collection { @@ -78,7 +78,7 @@ class GedcomEditService * @param string $sex * @param array<string> $names * - * @return Collection<Fact> + * @return Collection<int,Fact> */ public function newIndividualFacts(Tree $tree, string $sex, array $names): Collection { diff --git a/app/Services/GedcomExportService.php b/app/Services/GedcomExportService.php index 601f3dad2f..843db9be15 100644 --- a/app/Services/GedcomExportService.php +++ b/app/Services/GedcomExportService.php @@ -63,13 +63,13 @@ class GedcomExportService /** * Write GEDCOM data to a stream. * - * @param Tree $tree - Export data from this tree - * @param bool $sort_by_xref - Write GEDCOM records in XREF order - * @param string $encoding - Convert from UTF-8 to other encoding - * @param int $access_level - Apply privacy filtering - * @param string $media_path - Prepend path to media filenames - * @param string $line_endings - CRLF or LF - * @param Collection<string>|null $records - Just export these records + * @param Tree $tree - Export data from this tree + * @param bool $sort_by_xref - Write GEDCOM records in XREF order + * @param string $encoding - Convert from UTF-8 to other encoding + * @param int $access_level - Apply privacy filtering + * @param string $media_path - Prepend path to media filenames + * @param string $line_endings - CRLF or LF + * @param Collection<int,string>|null $records - Just export these records * * @return resource */ diff --git a/app/Services/HomePageService.php b/app/Services/HomePageService.php index 4e499b3c09..267a2b8db0 100644 --- a/app/Services/HomePageService.php +++ b/app/Services/HomePageService.php @@ -278,9 +278,9 @@ class HomePageService /** * Save the updated blocks for a user. * - * @param int $user_id - * @param Collection<string> $main_block_ids - * @param Collection<string> $side_block_ids + * @param int $user_id + * @param Collection<int,string> $main_block_ids + * @param Collection<int,string> $side_block_ids * * @return void */ @@ -335,9 +335,9 @@ class HomePageService /** * Save the updated blocks for a tree. * - * @param int $tree_id - * @param Collection<string> $main_block_ids - * @param Collection<string> $side_block_ids + * @param int $tree_id + * @param Collection<int,string> $main_block_ids + * @param Collection<int,string> $side_block_ids * * @return void */ @@ -392,7 +392,7 @@ class HomePageService /** * Take a list of block names, and return block (module) objects. * - * @param Collection<string> $blocks + * @param Collection<int,string> $blocks * @param Collection<int,ModuleBlockInterface> $active_blocks * * @return Collection<int,ModuleBlockInterface> diff --git a/app/Services/MapDataService.php b/app/Services/MapDataService.php index d60af56d1a..dbcddd39f5 100644 --- a/app/Services/MapDataService.php +++ b/app/Services/MapDataService.php @@ -214,7 +214,7 @@ class MapDataService * * @param int|null $parent_id * - * @return Collection<object> + * @return Collection<int,object> */ public function getPlaceListLocation(?int $parent_id): Collection { diff --git a/app/Services/MediaFileService.php b/app/Services/MediaFileService.php index d2a6c57d11..13789fcb9d 100644 --- a/app/Services/MediaFileService.php +++ b/app/Services/MediaFileService.php @@ -275,7 +275,7 @@ class MediaFileService * @param string $folder Root folder * @param bool $subfolders Include subfolders * - * @return Collection<string> + * @return Collection<int,string> */ public function allFilesOnDisk(FilesystemOperator $filesystem, string $folder, bool $subfolders): Collection { @@ -299,7 +299,7 @@ class MediaFileService * @param string $media_folder Root folder * @param bool $subfolders Include subfolders * - * @return Collection<string> + * @return Collection<int,string> */ public function allFilesInDatabase(string $media_folder, bool $subfolders): Collection { @@ -325,7 +325,7 @@ class MediaFileService * * @param Tree $tree * - * @return Collection<string> + * @return Collection<int,string> * @throws FilesystemException */ public function mediaFolders(Tree $tree): Collection @@ -345,7 +345,7 @@ class MediaFileService * * @param FilesystemOperator $data_filesystem * - * @return Collection<string,string> + * @return Collection<array-key,string> * @throws FilesystemException */ public function allMediaFolders(FilesystemOperator $data_filesystem): Collection diff --git a/app/Services/MessageService.php b/app/Services/MessageService.php index 69d04d1cdf..4e4af5c306 100644 --- a/app/Services/MessageService.php +++ b/app/Services/MessageService.php @@ -172,7 +172,7 @@ class MessageService * * @param string $to * - * @return Collection<User> + * @return Collection<int,User> */ public function recipientUsers(string $to): Collection { diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php index f47b9583b3..47a827cc36 100644 --- a/app/Services/ModuleService.php +++ b/app/Services/ModuleService.php @@ -574,7 +574,7 @@ class ModuleService * @param Tree $tree * @param UserInterface $user * - * @return Collection<ModuleInterface> + * @return Collection<int,ModuleInterface> */ public function findByComponent(string $interface, Tree $tree, UserInterface $user): Collection { @@ -591,7 +591,7 @@ class ModuleService * @param bool $include_disabled * @param bool $sort * - * @return Collection<ModuleInterface> + * @return Collection<int,ModuleInterface> */ public function findByInterface(string $interface, bool $include_disabled = false, bool $sort = false): Collection { @@ -625,7 +625,7 @@ class ModuleService * * @param bool $include_disabled * - * @return Collection<ModuleInterface> + * @return Collection<int,ModuleInterface> */ public function all(bool $include_disabled = false): Collection { @@ -678,7 +678,7 @@ class ModuleService /** * All core modules in the system. * - * @return Collection<ModuleInterface> + * @return Collection<int,ModuleInterface> */ private function coreModules(): Collection { @@ -695,7 +695,7 @@ class ModuleService /** * All custom modules in the system. Custom modules are defined in modules_v4/ * - * @return Collection<ModuleCustomInterface> + * @return Collection<int,ModuleCustomInterface> */ private function customModules(): Collection { @@ -850,7 +850,7 @@ class ModuleService /** * During setup, we'll need access to some languages. * - * @return Collection<ModuleLanguageInterface> + * @return Collection<int,ModuleLanguageInterface> */ public function setupLanguages(): Collection { @@ -885,7 +885,7 @@ class ModuleService * * @param bool $include_disabled * - * @return Collection<ModuleInterface> + * @return Collection<int,ModuleInterface> */ public function otherModules(bool $include_disabled = false): Collection { @@ -904,7 +904,7 @@ class ModuleService /** * Generate a list of module names which exist in the database but not on disk. * - * @return Collection<string> + * @return Collection<int,string> */ public function deletedModules(): Collection { @@ -936,7 +936,7 @@ class ModuleService } /** - * @return Collection<string> + * @return Collection<int,string> */ public function componentsWithAccess(): Collection { @@ -944,7 +944,7 @@ class ModuleService } /** - * @return Collection<string> + * @return Collection<int,string> */ public function componentsWithOrder(): Collection { diff --git a/app/Services/PendingChangesService.php b/app/Services/PendingChangesService.php index 75a612cae5..7c0d6f1607 100644 --- a/app/Services/PendingChangesService.php +++ b/app/Services/PendingChangesService.php @@ -54,7 +54,7 @@ class PendingChangesService * * @param Tree $tree * - * @return Collection<string> + * @return Collection<int,string> */ public function pendingXrefs(Tree $tree): Collection { diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php index 481a495c14..4fee9162f4 100644 --- a/app/Services/SearchService.php +++ b/app/Services/SearchService.php @@ -84,7 +84,7 @@ class SearchService * @param array<Tree> $trees * @param array<string> $search * - * @return Collection<Family> + * @return Collection<int,Family> */ public function searchFamilies(array $trees, array $search): Collection { @@ -109,7 +109,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Family> + * @return Collection<int,Family> */ public function searchFamilyNames(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -144,7 +144,7 @@ class SearchService /** * @param Place $place * - * @return Collection<Family> + * @return Collection<int,Family> */ public function searchFamiliesInPlace(Place $place): Collection { @@ -167,7 +167,7 @@ class SearchService * @param array<Tree> $trees * @param array<string> $search * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function searchIndividuals(array $trees, array $search): Collection { @@ -192,7 +192,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function searchIndividualNames(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -214,7 +214,7 @@ class SearchService /** * @param Place $place * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function searchIndividualsInPlace(Place $place): Collection { @@ -241,7 +241,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Location> + * @return Collection<int,Location> */ public function searchLocations(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -262,7 +262,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Media> + * @return Collection<int,Media> */ public function searchMedia(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -282,7 +282,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Note> + * @return Collection<int,Note> */ public function searchNotes(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -303,7 +303,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Repository> + * @return Collection<int,Repository> */ public function searchRepositories(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -324,7 +324,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Source> + * @return Collection<int,Source> */ public function searchSources(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -344,7 +344,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Source> + * @return Collection<int,Source> */ public function searchSourcesByName(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -365,7 +365,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<string> + * @return Collection<int,string> */ public function searchSurnames(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -390,7 +390,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Submission> + * @return Collection<int,Submission> */ public function searchSubmissions(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -411,7 +411,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Submitter> + * @return Collection<int,Submitter> */ public function searchSubmitters(array $trees, array $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -432,7 +432,7 @@ class SearchService * @param int $offset * @param int $limit * - * @return Collection<Place> + * @return Collection<int,Place> */ public function searchPlaces(Tree $tree, string $search, int $offset = 0, int $limit = PHP_INT_MAX): Collection { @@ -490,7 +490,7 @@ class SearchService * @param array<string,string> $fields * @param array<string,string> $modifiers * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function searchIndividualsAdvanced(array $trees, array $fields, array $modifiers): Collection { @@ -932,7 +932,7 @@ class SearchService * @param string $place * @param array<Tree> $search_trees * - * @return Collection<Individual> + * @return Collection<int,Individual> */ public function searchIndividualsPhonetic(string $soundex, string $lastname, string $firstname, string $place, array $search_trees): Collection { @@ -1009,7 +1009,7 @@ class SearchService * @param int $offset Skip this many rows. * @param int $limit Take this many rows. * - * @return Collection<mixed> + * @return Collection<int,mixed> */ private function paginateQuery(Builder $query, Closure $row_mapper, Closure $row_filter, int $offset, int $limit): Collection { diff --git a/app/Services/ServerCheckService.php b/app/Services/ServerCheckService.php index c541893673..b29284a8db 100644 --- a/app/Services/ServerCheckService.php +++ b/app/Services/ServerCheckService.php @@ -64,7 +64,7 @@ class ServerCheckService * * @param string $driver * - * @return Collection<string> + * @return Collection<int,string> */ public function serverErrors(string $driver = ''): Collection { @@ -88,7 +88,7 @@ class ServerCheckService * * @param string $driver * - * @return Collection<string> + * @return Collection<int,string> */ public function serverWarnings(string $driver = ''): Collection { @@ -274,7 +274,7 @@ class ServerCheckService /** * @param string $driver * - * @return Collection<string> + * @return Collection<int,string> */ private function databaseDriverErrors(string $driver): Collection { @@ -313,7 +313,7 @@ class ServerCheckService /** * @param string $driver * - * @return Collection<string> + * @return Collection<int,string> */ private function databaseDriverWarnings(string $driver): Collection { diff --git a/app/Services/TreeService.php b/app/Services/TreeService.php index 4eef83b229..583f34a771 100644 --- a/app/Services/TreeService.php +++ b/app/Services/TreeService.php @@ -66,7 +66,7 @@ class TreeService /** * All the trees that the current user has permission to access. * - * @return Collection<Tree> + * @return Collection<int,Tree> */ public function all(): Collection { diff --git a/app/Services/UpgradeService.php b/app/Services/UpgradeService.php index ffc2fa335c..23e027e140 100644 --- a/app/Services/UpgradeService.php +++ b/app/Services/UpgradeService.php @@ -117,7 +117,7 @@ class UpgradeService * * @param string $zip_file * - * @return Collection<string> + * @return Collection<int,string> * @throws FilesystemException */ public function webtreesZipContents(string $zip_file): Collection @@ -213,8 +213,8 @@ class UpgradeService * Delete files in $destination that aren't in $source. * * @param FilesystemOperator $filesystem - * @param Collection<string> $folders_to_clean - * @param Collection<string> $files_to_keep + * @param Collection<int,string> $folders_to_clean + * @param Collection<int,string> $files_to_keep * * @return void */ diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 70af99a2b1..844cc9eee4 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -99,7 +99,7 @@ class UserService * * @param Individual $individual * - * @return Collection<User> + * @return Collection<int,User> */ public function findByIndividual(Individual $individual): Collection { @@ -188,7 +188,7 @@ class UserService /** * Get a list of all users. * - * @return Collection<User> + * @return Collection<int,User> */ public function all(): Collection { @@ -202,7 +202,7 @@ class UserService /** * Get a list of all administrators. * - * @return Collection<User> + * @return Collection<int,User> */ public function administrators(): Collection { @@ -220,7 +220,7 @@ class UserService /** * Get a list of all managers. * - * @return Collection<User> + * @return Collection<int,User> */ public function managers(): Collection { @@ -239,7 +239,7 @@ class UserService /** * Get a list of all moderators. * - * @return Collection<User> + * @return Collection<int,User> */ public function moderators(): Collection { @@ -258,7 +258,7 @@ class UserService /** * Get a list of all verified users. * - * @return Collection<User> + * @return Collection<int,User> */ public function unapproved(): Collection { @@ -283,7 +283,7 @@ class UserService /** * Get a list of all verified users. * - * @return Collection<User> + * @return Collection<int,User> */ public function unverified(): Collection { @@ -308,7 +308,7 @@ class UserService /** * Get a list of all users who are currently logged in. * - * @return Collection<User> + * @return Collection<int,User> */ public function allLoggedIn(): Collection { diff --git a/app/Statistics/Google/ChartAge.php b/app/Statistics/Google/ChartAge.php index 74119ec68a..afbb81004e 100644 --- a/app/Statistics/Google/ChartAge.php +++ b/app/Statistics/Google/ChartAge.php @@ -52,7 +52,7 @@ class ChartAge /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartBirth.php b/app/Statistics/Google/ChartBirth.php index 446598bd5a..c09623d89a 100644 --- a/app/Statistics/Google/ChartBirth.php +++ b/app/Statistics/Google/ChartBirth.php @@ -55,7 +55,7 @@ class ChartBirth /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartChildren.php b/app/Statistics/Google/ChartChildren.php index 0aa6830889..663ffdeebe 100644 --- a/app/Statistics/Google/ChartChildren.php +++ b/app/Statistics/Google/ChartChildren.php @@ -48,7 +48,7 @@ class ChartChildren /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartDeath.php b/app/Statistics/Google/ChartDeath.php index 8787a53008..02fd9b383a 100644 --- a/app/Statistics/Google/ChartDeath.php +++ b/app/Statistics/Google/ChartDeath.php @@ -55,7 +55,7 @@ class ChartDeath /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartDivorce.php b/app/Statistics/Google/ChartDivorce.php index a1fdef0ea3..1f83d75abc 100644 --- a/app/Statistics/Google/ChartDivorce.php +++ b/app/Statistics/Google/ChartDivorce.php @@ -55,7 +55,7 @@ class ChartDivorce /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartMarriage.php b/app/Statistics/Google/ChartMarriage.php index c0c15bb965..a096c90465 100644 --- a/app/Statistics/Google/ChartMarriage.php +++ b/app/Statistics/Google/ChartMarriage.php @@ -55,7 +55,7 @@ class ChartMarriage /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/app/Statistics/Google/ChartMarriageAge.php b/app/Statistics/Google/ChartMarriageAge.php index 6a54ea1220..f242ba6953 100644 --- a/app/Statistics/Google/ChartMarriageAge.php +++ b/app/Statistics/Google/ChartMarriageAge.php @@ -52,7 +52,7 @@ class ChartMarriageAge /** * Returns the related database records. * - * @return Collection<object> + * @return Collection<int,object> */ private function queryRecords(): Collection { diff --git a/resources/views/admin/broadcast.phtml b/resources/views/admin/broadcast.phtml index 1625814d9b..44e25076af 100644 --- a/resources/views/admin/broadcast.phtml +++ b/resources/views/admin/broadcast.phtml @@ -8,12 +8,12 @@ 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 + * @var string $body + * @var UserInterface $from + * @var string $subject + * @var string $title + * @var string $to + * @var Collection<int,string> $to_names */ ?> diff --git a/resources/views/admin/components.phtml b/resources/views/admin/components.phtml index cf48848d4c..00096fc173 100644 --- a/resources/views/admin/components.phtml +++ b/resources/views/admin/components.phtml @@ -16,9 +16,9 @@ use Illuminate\Support\Collection; * @var array<string,array<string,string>> $access_summary * @var string $description * @var string $interface - * @var Collection<ModuleInterface> $modules + * @var Collection<int,ModuleInterface> $modules * @var string $title - * @var Collection<Tree> $trees + * @var Collection<int,Tree> $trees * @var bool $uses_access * @var bool $uses_sorting */ diff --git a/resources/views/admin/control-panel.phtml b/resources/views/admin/control-panel.phtml index ff20f79e0b..0e40e4e45b 100644 --- a/resources/views/admin/control-panel.phtml +++ b/resources/views/admin/control-panel.phtml @@ -22,8 +22,8 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ModulesHistoricEventsPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesLanguagesPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesListsPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapAutocompletePage; -use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapLinksPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapGeoLocationsPage; +use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapLinksPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMapProvidersPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesMenusPage; use Fisharebest\Webtrees\Http\RequestHandlers\ModulesReportsPage; @@ -36,8 +36,8 @@ use Fisharebest\Webtrees\Http\RequestHandlers\PhpInformation; use Fisharebest\Webtrees\Http\RequestHandlers\SiteLogsPage; use Fisharebest\Webtrees\Http\RequestHandlers\SitePreferencesPage; use Fisharebest\Webtrees\Http\RequestHandlers\SiteRegistrationPage; -use Fisharebest\Webtrees\Http\RequestHandlers\TreePageDefaultEdit; use Fisharebest\Webtrees\Http\RequestHandlers\SiteTagsPage; +use Fisharebest\Webtrees\Http\RequestHandlers\TreePageDefaultEdit; use Fisharebest\Webtrees\Http\RequestHandlers\UpgradeWizardPage; use Fisharebest\Webtrees\Http\RequestHandlers\UploadMediaPage; use Fisharebest\Webtrees\Http\RequestHandlers\UserAddPage; @@ -81,75 +81,75 @@ use Fisharebest\Webtrees\Webtrees; use Illuminate\Support\Collection; /** - * @var Collection<User> $administrators - * @var Collection<ModuleInterface> $all_modules_disabled - * @var Collection<ModuleInterface> $all_modules_enabled - * @var Collection<Tree> $all_trees - * @var Collection<User> $all_users - * @var Collection<ModuleAnalyticsInterface> $analytics_modules_disabled - * @var Collection<ModuleAnalyticsInterface> $analytics_modules_enabled - * @var Collection<ModuleBlockInterface> $block_modules_disabled - * @var Collection<ModuleBlockInterface> $block_modules_enabled - * @var array<string,int> $changes - * @var Collection<ModuleChartInterface> $chart_modules_disabled - * @var Collection<ModuleChartInterface> $chart_modules_enabled - * @var Collection<ModuleCustomInterface> $custom_updates - * @var Collection<ModuleCustomTagsInterface> $custom_tags_modules_disabled - * @var Collection<ModuleCustomTagsInterface> $custom_tags_modules_enabled - * @var Collection<ModuleDataFixInterface> $data_fix_modules_disabled - * @var Collection<ModuleDataFixInterface> $data_fix_modules_enabled - * @var Collection<string,int> $families - * @var FamilyListModule|null $family_list_module - * @var Collection<ModuleFooterInterface> $footer_modules_disabled - * @var Collection<ModuleFooterInterface> $footer_modules_enabled - * @var Collection<ModuleHistoricEventsInterface> $history_modules_disabled - * @var Collection<ModuleHistoricEventsInterface> $history_modules_enabled - * @var Collection<string,int> $individuals - * @var IndividualListModule|null $individual_list_module - * @var Collection<ModuleLanguageInterface> $language_modules_disabled - * @var Collection<ModuleLanguageInterface> $language_modules_enabled - * @var string $latest_version - * @var Collection<ModuleListInterface> $list_modules_disabled - * @var Collection<ModuleListInterface> $list_modules_enabled - * @var Collection<ModuleMapLinkInterface> $map_link_modules_disabled - * @var Collection<ModuleMapLinkInterface> $map_link_modules_enabled - * @var Collection<ModuleMapAutocompleteInterface> $map_autocomplete_modules_disabled - * @var Collection<ModuleMapAutocompleteInterface> $map_autocomplete_modules_enabled - * @var Collection<ModuleMapProviderInterface> $map_provider_modules_disabled - * @var Collection<ModuleMapProviderInterface> $map_provider_modules_enabled - * @var Collection<ModuleMapGeoLocationInterface> $map_search_modules_disabled - * @var Collection<ModuleMapGeoLocationInterface> $map_search_modules_enabled - * @var Collection<User> $managers - * @var Collection<string,int> $media - * @var MediaListModule|null $media_list_module - * @var Collection<ModuleMenuInterface> $menu_modules_disabled - * @var Collection<ModuleMenuInterface> $menu_modules_enabled - * @var Collection<User> $moderators - * @var Collection<string,int> $notes - * @var NoteListModule|null $note_list_module - * @var Collection<ModuleInterface> $other_modules - * @var Collection<ModuleReportInterface> $report_modules_disabled - * @var Collection<ModuleReportInterface> $report_modules_enabled - * @var Collection<string,int> $repositories - * @var RepositoryListModule|null $repository_list_module - * @var Collection<string> $server_errors - * @var Collection<string> $server_warnings - * @var bool $show_synchronize - * @var Collection<ModuleShareInterface> $share_modules_disabled - * @var Collection<ModuleShareInterface> $share_modules_enabled - * @var Collection<ModuleSidebarInterface> $sidebar_modules_disabled - * @var Collection<ModuleSidebarInterface> $sidebar_modules_enabled - * @var Collection<string,int> $sources - * @var SourceListModule|null $source_list_module - * @var Collection<string,int> $submitters - * @var SubmitterListModule|null $submitter_list_module - * @var Collection<ModuleTabInterface> $tab_modules_disabled - * @var Collection<ModuleTabInterface> $tab_modules_enabled - * @var Collection<ModuleThemeInterface> $theme_modules_disabled - * @var Collection<ModuleThemeInterface> $theme_modules_enabled - * @var string $title - * @var Collection<User> $unapproved - * @var Collection<User> $unverified + * @var Collection<int,User> $administrators + * @var Collection<int,ModuleInterface> $all_modules_disabled + * @var Collection<int,ModuleInterface> $all_modules_enabled + * @var Collection<int,Tree> $all_trees + * @var Collection<int,User> $all_users + * @var Collection<int,ModuleAnalyticsInterface> $analytics_modules_disabled + * @var Collection<int,ModuleAnalyticsInterface> $analytics_modules_enabled + * @var Collection<int,ModuleBlockInterface> $block_modules_disabled + * @var Collection<int,ModuleBlockInterface> $block_modules_enabled + * @var array<string,int> $changes + * @var Collection<int,ModuleChartInterface> $chart_modules_disabled + * @var Collection<int,ModuleChartInterface> $chart_modules_enabled + * @var Collection<int,ModuleCustomInterface> $custom_updates + * @var Collection<int,ModuleCustomTagsInterface> $custom_tags_modules_disabled + * @var Collection<int,ModuleCustomTagsInterface> $custom_tags_modules_enabled + * @var Collection<int,ModuleDataFixInterface> $data_fix_modules_disabled + * @var Collection<int,ModuleDataFixInterface> $data_fix_modules_enabled + * @var Collection<array-key,int> $families + * @var FamilyListModule|null $family_list_module + * @var Collection<int,ModuleFooterInterface> $footer_modules_disabled + * @var Collection<int,ModuleFooterInterface> $footer_modules_enabled + * @var Collection<int,ModuleHistoricEventsInterface> $history_modules_disabled + * @var Collection<int,ModuleHistoricEventsInterface> $history_modules_enabled + * @var Collection<array-key,int> $individuals + * @var IndividualListModule|null $individual_list_module + * @var Collection<int,ModuleLanguageInterface> $language_modules_disabled + * @var Collection<int,ModuleLanguageInterface> $language_modules_enabled + * @var string $latest_version + * @var Collection<int,ModuleListInterface> $list_modules_disabled + * @var Collection<int,ModuleListInterface> $list_modules_enabled + * @var Collection<int,ModuleMapLinkInterface> $map_link_modules_disabled + * @var Collection<int,ModuleMapLinkInterface> $map_link_modules_enabled + * @var Collection<int,ModuleMapAutocompleteInterface> $map_autocomplete_modules_disabled + * @var Collection<int,ModuleMapAutocompleteInterface> $map_autocomplete_modules_enabled + * @var Collection<int,ModuleMapProviderInterface> $map_provider_modules_disabled + * @var Collection<int,ModuleMapProviderInterface> $map_provider_modules_enabled + * @var Collection<int,ModuleMapGeoLocationInterface> $map_search_modules_disabled + * @var Collection<int,ModuleMapGeoLocationInterface> $map_search_modules_enabled + * @var Collection<int,User> $managers + * @var Collection<array-key,int> $media + * @var MediaListModule|null $media_list_module + * @var Collection<int,ModuleMenuInterface> $menu_modules_disabled + * @var Collection<int,ModuleMenuInterface> $menu_modules_enabled + * @var Collection<int,User> $moderators + * @var Collection<array-key,int> $notes + * @var NoteListModule|null $note_list_module + * @var Collection<int,ModuleInterface> $other_modules + * @var Collection<int,ModuleReportInterface> $report_modules_disabled + * @var Collection<int,ModuleReportInterface> $report_modules_enabled + * @var Collection<array-key,int> $repositories + * @var RepositoryListModule|null $repository_list_module + * @var Collection<int,string> $server_errors + * @var Collection<int,string> $server_warnings + * @var bool $show_synchronize + * @var Collection<int,ModuleShareInterface> $share_modules_disabled + * @var Collection<int,ModuleShareInterface> $share_modules_enabled + * @var Collection<int,ModuleSidebarInterface> $sidebar_modules_disabled + * @var Collection<int,ModuleSidebarInterface> $sidebar_modules_enabled + * @var Collection<array-key,int> $sources + * @var SourceListModule|null $source_list_module + * @var Collection<array-key,int> $submitters + * @var SubmitterListModule|null $submitter_list_module + * @var Collection<int,ModuleTabInterface> $tab_modules_disabled + * @var Collection<int,ModuleTabInterface> $tab_modules_enabled + * @var Collection<int,ModuleThemeInterface> $theme_modules_disabled + * @var Collection<int,ModuleThemeInterface> $theme_modules_enabled + * @var string $title + * @var Collection<int,User> $unapproved + * @var Collection<int,User> $unverified */ ?> diff --git a/resources/views/admin/data-fix-select.phtml b/resources/views/admin/data-fix-select.phtml index b52d1db478..1443b05c91 100644 --- a/resources/views/admin/data-fix-select.phtml +++ b/resources/views/admin/data-fix-select.phtml @@ -9,10 +9,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<ModuleDataFixInterface> $data_fixes - * @var string $latest_version - * @var string $title - * @var Tree $tree + * @var Collection<int,ModuleDataFixInterface> $data_fixes + * @var string $latest_version + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/admin/gedcom-export-options.phtml b/resources/views/admin/gedcom-export-options.phtml index 56b7d66bfc..2ba1f8d77a 100644 --- a/resources/views/admin/gedcom-export-options.phtml +++ b/resources/views/admin/gedcom-export-options.phtml @@ -6,6 +6,11 @@ use Fisharebest\Webtrees\Encodings\ASCII; use Fisharebest\Webtrees\Encodings\UTF16BE; use Fisharebest\Webtrees\Encodings\UTF8; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; + +/** + * @var Tree $tree + */ ?> diff --git a/resources/views/admin/locations.phtml b/resources/views/admin/locations.phtml index b1b8cd0b3f..0bf5af8ccf 100644 --- a/resources/views/admin/locations.phtml +++ b/resources/views/admin/locations.phtml @@ -15,7 +15,7 @@ use Illuminate\Support\Collection; /** * @var array<object> $active - * @var Collection<Tree> $all_trees + * @var Collection<int,Tree> $all_trees * @var array<string,string> $breadcrumbs * @var int $parent_id * @var array<object> $placelist diff --git a/resources/views/admin/media-upload.phtml b/resources/views/admin/media-upload.phtml index 049ddec388..39d78e7a4d 100644 --- a/resources/views/admin/media-upload.phtml +++ b/resources/views/admin/media-upload.phtml @@ -7,10 +7,10 @@ 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 + * @var string $filesize + * @var int $max_upload_files + * @var Collection<array-key,string> $media_folders + * @var string $title */ ?> diff --git a/resources/views/admin/media.phtml b/resources/views/admin/media.phtml index 38df68bbe0..f45170dabc 100644 --- a/resources/views/admin/media.phtml +++ b/resources/views/admin/media.phtml @@ -8,13 +8,13 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var string $data_folder - * @var string $files - * @var string $media_folder - * @var Collection<string> $media_folders - * @var array<int|string,string> $media_types - * @var string $subfolders - * @var string $title + * @var string $data_folder + * @var string $files + * @var string $media_folder + * @var Collection<int,string> $media_folders + * @var array<string> $media_types + * @var string $subfolders + * @var string $title */ ?> diff --git a/resources/views/admin/modules.phtml b/resources/views/admin/modules.phtml index 2fba32e374..9f1df3492d 100644 --- a/resources/views/admin/modules.phtml +++ b/resources/views/admin/modules.phtml @@ -24,9 +24,9 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Collection<string> $deleted_modules - * @var Collection<ModuleInterface> $modules - * @var string $title + * @var Collection<int,string> $deleted_modules + * @var Collection<int,ModuleInterface> $modules + * @var string $title */ ?> diff --git a/resources/views/admin/site-logs.phtml b/resources/views/admin/site-logs.phtml index 8310d0b2dd..b57bdc97d9 100644 --- a/resources/views/admin/site-logs.phtml +++ b/resources/views/admin/site-logs.phtml @@ -10,18 +10,18 @@ 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 + * @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<array-key,string> $tree_options + * @var string $type + * @var string $username + * @var Collection<array-key,string> $user_options */ ?> diff --git a/resources/views/admin/trees-import.phtml b/resources/views/admin/trees-import.phtml index 32b8dd36da..48b5d5a868 100644 --- a/resources/views/admin/trees-import.phtml +++ b/resources/views/admin/trees-import.phtml @@ -10,12 +10,12 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var string $data_folder - * @var string $default_gedcom_file - * @var Collection<string> $gedcom_files - * @var string $gedcom_media_path - * @var string $title - * @var Tree $tree + * @var string $data_folder + * @var string $default_gedcom_file + * @var Collection<int,string> $gedcom_files + * @var string $gedcom_media_path + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml index d0f2d3a98f..dd62b57306 100644 --- a/resources/views/admin/trees-preferences.phtml +++ b/resources/views/admin/trees-preferences.phtml @@ -13,23 +13,23 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var array<string,string> $all_family_facts - * @var array<string,string> $all_individual_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 array<string,string> $all_family_facts + * @var array<string,string> $all_individual_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<int,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/users-cleanup.phtml b/resources/views/admin/users-cleanup.phtml index 3fe49c1733..6fea68659d 100644 --- a/resources/views/admin/users-cleanup.phtml +++ b/resources/views/admin/users-cleanup.phtml @@ -10,9 +10,9 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<UserInterface> $inactive_users - * @var string $title - * @var Collection<UserInterface> $unverified_users + * @var Collection<int,UserInterface> $inactive_users + * @var string $title + * @var Collection<int,UserInterface> $unverified_users */ ?> diff --git a/resources/views/admin/users-edit.phtml b/resources/views/admin/users-edit.phtml index cd49e37acc..78a3f84956 100644 --- a/resources/views/admin/users-edit.phtml +++ b/resources/views/admin/users-edit.phtml @@ -18,7 +18,7 @@ use Illuminate\Support\Collection; * @var array<string,string> $roles * @var array<string,string> $theme_options * @var string $title - * @var Collection<Tree> $trees + * @var Collection<int,Tree> $trees * @var UserInterface $user */ diff --git a/resources/views/calendar-list.phtml b/resources/views/calendar-list.phtml index c6e2187909..5675ef57c2 100644 --- a/resources/views/calendar-list.phtml +++ b/resources/views/calendar-list.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $family_anniversaries - * @var Collection<Fact> $individual_anniversaries + * @var Collection<int,Fact> $family_anniversaries + * @var Collection<int,Fact> $individual_anniversaries */ ?> diff --git a/resources/views/components/select-number.phtml b/resources/views/components/select-number.phtml index dc58c75f76..65118dab21 100644 --- a/resources/views/components/select-number.phtml +++ b/resources/views/components/select-number.phtml @@ -1,5 +1,7 @@ <?php +use Fisharebest\Webtrees\I18N; + /** * @var string|null $class * @var string|null $id @@ -8,8 +10,6 @@ * @var array<string> $options */ -use Fisharebest\Webtrees\I18N; - ?> <select diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml index 07ea3a500e..8f69fd556f 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -8,12 +8,12 @@ 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 + * @var Collection<int,Individual> $children + * @var Family $family + * @var Individual|null $father + * @var Individual|null $mother + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/edit/reorder-families.phtml b/resources/views/edit/reorder-families.phtml index 245fd830bd..6546bc7962 100644 --- a/resources/views/edit/reorder-families.phtml +++ b/resources/views/edit/reorder-families.phtml @@ -11,11 +11,11 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $famc_facts - * @var Collection<Fact> $fams_facts - * @var Individual $individual - * @var string $title - * @var Tree $tree + * @var Collection<int,Fact> $famc_facts + * @var Collection<int,Fact> $fams_facts + * @var Individual $individual + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/expand-chart-box.phtml b/resources/views/expand-chart-box.phtml index 4d8cac5f52..2cccc8bd2d 100644 --- a/resources/views/expand-chart-box.phtml +++ b/resources/views/expand-chart-box.phtml @@ -4,7 +4,7 @@ use Fisharebest\Webtrees\Fact; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $facts + * @var Collection<int,Fact> $facts */ ?> diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml index f5f7abf7ce..d7ec852ae8 100644 --- a/resources/views/family-page-menu.phtml +++ b/resources/views/family-page-menu.phtml @@ -14,9 +14,9 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var bool $can_upload_media - * @var Collection<Fact> $clipboard_facts - * @var Family $record + * @var bool $can_upload_media + * @var Collection<int,Fact> $clipboard_facts + * @var Family $record */ ?> diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index b2b18df9ec..5807fdaf55 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -6,10 +6,10 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var bool $can_upload_media - * @var Collection<Fact> $clipboard_facts - * @var Collection<Fact> $facts - * @var Family $record + * @var bool $can_upload_media + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Fact> $facts + * @var Family $record */ ?> diff --git a/resources/views/individual-page-images.phtml b/resources/views/individual-page-images.phtml index e641ef4a65..63877c906f 100644 --- a/resources/views/individual-page-images.phtml +++ b/resources/views/individual-page-images.phtml @@ -11,17 +11,17 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var string $age - * @var bool $can_upload_media - * @var Collection<Media> $individual_media - * @var Collection<Fact> $name_records - * @var Individual $record - * @var Collection<Fact> $sex_records - * @var Collection<string> $shares - * @var Collection<ModuleSidebarInterface> $sidebars - * @var Collection<ModuleTabInterface> $tabs - * @var Tree $tree - * @var string $user_link + * @var string $age + * @var bool $can_upload_media + * @var Collection<int,Media> $individual_media + * @var Collection<int,Fact> $name_records + * @var Individual $record + * @var Collection<int,Fact> $sex_records + * @var Collection<int,string> $shares + * @var Collection<int,ModuleSidebarInterface> $sidebars + * @var Collection<int,ModuleTabInterface> $tabs + * @var Tree $tree + * @var string $user_link */ ?> diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml index 0fccec5e91..cb6e7fc4d1 100644 --- a/resources/views/individual-page-menu.phtml +++ b/resources/views/individual-page-menu.phtml @@ -14,10 +14,10 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var bool $can_upload_media - * @var Collection<Fact> $clipboard_facts - * @var Individual $record - * @var Collection<string> $shares + * @var bool $can_upload_media + * @var Collection<int,Fact> $clipboard_facts + * @var Individual $record + * @var Collection<int,string> $shares */ ?> diff --git a/resources/views/individual-page-sidebars.phtml b/resources/views/individual-page-sidebars.phtml index 9ed851d1f3..0a5bcaa7b3 100644 --- a/resources/views/individual-page-sidebars.phtml +++ b/resources/views/individual-page-sidebars.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\Module\ModuleSidebarInterface; use Illuminate\Support\Collection; /** - * @var Individual $record - * @var Collection<ModuleSidebarInterface> $sidebars + * @var Individual $record + * @var Collection<int,ModuleSidebarInterface> $sidebars */ ?> diff --git a/resources/views/individual-page-tabs.phtml b/resources/views/individual-page-tabs.phtml index 238f69d4c5..a99a6790de 100644 --- a/resources/views/individual-page-tabs.phtml +++ b/resources/views/individual-page-tabs.phtml @@ -6,8 +6,8 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Individual $record - * @var Collection<ModuleTabInterface> $tabs + * @var Individual $record + * @var Collection<int,ModuleTabInterface> $tabs */ ?> diff --git a/resources/views/individual-page-title.phtml b/resources/views/individual-page-title.phtml index efbbf4e614..e3323765e0 100644 --- a/resources/views/individual-page-title.phtml +++ b/resources/views/individual-page-title.phtml @@ -6,9 +6,9 @@ use Fisharebest\Webtrees\User; use Illuminate\Support\Collection; /** - * @var string $age - * @var Individual $record - * @var Collection<User> $users + * @var string $age + * @var Individual $record + * @var Collection<int,User> $users */ ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 0e0255169e..be70cadf30 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -11,16 +11,16 @@ use Fisharebest\Webtrees\User; use Illuminate\Support\Collection; /** - * @var string $age - * @var bool $can_upload_media - * @var Collection<Fact> $clipboard_facts - * @var Collection<Media> $individual_media - * @var Individual $record - * @var Collection<string> $shares - * @var Collection<ModuleSidebarInterface> $sidebars - * @var Collection<ModuleTabInterface> $tabs - * @var Tree $tree - * @var Collection<User> $users + * @var string $age + * @var bool $can_upload_media + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Media> $individual_media + * @var Individual $record + * @var Collection<int,string> $shares + * @var Collection<int,ModuleSidebarInterface> $sidebars + * @var Collection<int,ModuleTabInterface> $tabs + * @var Tree $tree + * @var Collection<int,User> $users */ ?> diff --git a/resources/views/layouts/administration.phtml b/resources/views/layouts/administration.phtml index 9e1602042f..b031e58aa9 100644 --- a/resources/views/layouts/administration.phtml +++ b/resources/views/layouts/administration.phtml @@ -11,8 +11,10 @@ use Fisharebest\Webtrees\Module\ModuleGlobalInterface; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\View; -/** @var string $title */ -/** @var string $content */ +/** + * @var string $title + * @var string $content + */ ?> diff --git a/resources/views/lists/anniversaries-list.phtml b/resources/views/lists/anniversaries-list.phtml index 10a274c890..c0fce7ce2c 100644 --- a/resources/views/lists/anniversaries-list.phtml +++ b/resources/views/lists/anniversaries-list.phtml @@ -8,10 +8,10 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $facts - * @var int $id - * @var int $limit_low - * @var int $limit_high + * @var Collection<int,Fact> $facts + * @var int $id + * @var int $limit_low + * @var int $limit_high */ ?> diff --git a/resources/views/lists/anniversaries-table.phtml b/resources/views/lists/anniversaries-table.phtml index 956667bfc5..f1a1b7bbe7 100644 --- a/resources/views/lists/anniversaries-table.phtml +++ b/resources/views/lists/anniversaries-table.phtml @@ -7,7 +7,7 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $facts + * @var Collection<int,Fact> $facts * @var int $limit_high * @var int $limit_low * @var array<array<int,string>> $order diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml index 195568b261..4dad3b20ff 100644 --- a/resources/views/lists/families-table.phtml +++ b/resources/views/lists/families-table.phtml @@ -21,8 +21,8 @@ $today_jd = Carbon::now()->julianDay(); $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); /** - * @var Tree $tree - * @var Collection<Family> $families + * @var Tree $tree + * @var Collection<int,Family> $families */ ?> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 549d1208f1..b121bc3fea 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -18,9 +18,9 @@ use Illuminate\Support\Collection; use Ramsey\Uuid\Uuid; /** - * @var Collection<Individual> $individuals - * @var bool $sosa - * @var Tree $tree + * @var Collection<int,Individual> $individuals + * @var bool $sosa + * @var Tree $tree */ // lists requires a unique ID in case there are multiple lists per page diff --git a/resources/views/lists/locations-table.phtml b/resources/views/lists/locations-table.phtml index 31e419db24..13c6bb6b96 100644 --- a/resources/views/lists/locations-table.phtml +++ b/resources/views/lists/locations-table.phtml @@ -9,8 +9,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Location> $locations - * @var Tree $tree + * @var Collection<int,Location> $locations + * @var Tree $tree */ ?> diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index a75dc94e82..a44f9f55cb 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -9,8 +9,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Media> $media_objects - * @var Tree $tree + * @var Collection<int,Media> $media_objects + * @var Tree $tree */ ?> diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index aa0ec0dcb1..75a64d5a86 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -9,8 +9,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Note> $notes - * @var Tree $tree + * @var Collection<int,Note> $notes + * @var Tree $tree */ ?> diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index 032a9af06e..5fa61234ed 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -9,8 +9,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Repository> $repositories - * @var Tree $tree + * @var Collection<int,Repository> $repositories + * @var Tree $tree */ ?> diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index 2352d3647e..24f1613e57 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -10,8 +10,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Source> $sources - * @var Tree $tree + * @var Collection<int,Source> $sources + * @var Tree $tree */ ?> diff --git a/resources/views/lists/submitters-table.phtml b/resources/views/lists/submitters-table.phtml index 61bb431005..869a2bbf99 100644 --- a/resources/views/lists/submitters-table.phtml +++ b/resources/views/lists/submitters-table.phtml @@ -9,8 +9,8 @@ use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** - * @var Collection<Submitter> $submitters - * @var Tree $tree + * @var Collection<int,Submitter> $submitters + * @var Tree $tree */ ?> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index e87b2511a6..7a24e5b7cc 100644 --- a/resources/views/media-page-menu.phtml +++ b/resources/views/media-page-menu.phtml @@ -12,8 +12,8 @@ use Fisharebest\Webtrees\Media; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $clipboard_facts - * @var Media $record + * @var Collection<int,Fact> $clipboard_facts + * @var Media $record */ ?> diff --git a/resources/views/modals/shares.phtml b/resources/views/modals/shares.phtml index a42cd86503..9a52d5a98b 100644 --- a/resources/views/modals/shares.phtml +++ b/resources/views/modals/shares.phtml @@ -1,12 +1,12 @@ <?php +use Illuminate\Support\Collection; + /** - * @var Collection<string> $shares - * @var string $title + * @var Collection<int,string> $shares + * @var string $title */ -use Illuminate\Support\Collection; - ?> <div class="modal fade" id="wt-shares-modal" tabindex="-1" role="dialog" aria-label="<?= e($title) ?>" aria-hidden="true"> <div class="modal-dialog modal-lg" role="document"> diff --git a/resources/views/modules/family-book-chart/children.phtml b/resources/views/modules/family-book-chart/children.phtml index 12e4841320..999e95367c 100644 --- a/resources/views/modules/family-book-chart/children.phtml +++ b/resources/views/modules/family-book-chart/children.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $children - * @var int $generations + * @var Collection<int,Individual> $children + * @var int $generations */ ?> diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml index 943d757094..5a2c7daf97 100644 --- a/resources/views/modules/faq/config.phtml +++ b/resources/views/modules/faq/config.phtml @@ -7,12 +7,12 @@ 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 + * @var Collection<int,object> $faqs + * @var string $max_block_order + * @var string $min_block_order + * @var string $title + * @var Tree $tree + * @var array<string,string> $tree_names */ ?> diff --git a/resources/views/modules/faq/show.phtml b/resources/views/modules/faq/show.phtml index 18ecf30119..137d3a12b4 100644 --- a/resources/views/modules/faq/show.phtml +++ b/resources/views/modules/faq/show.phtml @@ -4,8 +4,8 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<object> $faqs - * @var string $title + * @var Collection<int,object> $faqs + * @var string $title */ ?> diff --git a/resources/views/modules/favorites/favorites.phtml b/resources/views/modules/favorites/favorites.phtml index f3f2c07732..5c10cde2ad 100644 --- a/resources/views/modules/favorites/favorites.phtml +++ b/resources/views/modules/favorites/favorites.phtml @@ -6,11 +6,11 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var int $block_id - * @var bool $can_edit - * @var Collection<object> $favorites - * @var string $module_name - * @var Tree $tree + * @var int $block_id + * @var bool $can_edit + * @var Collection<int,object> $favorites + * @var string $module_name + * @var Tree $tree */ ?> diff --git a/resources/views/modules/gedcom_news/list.phtml b/resources/views/modules/gedcom_news/list.phtml index f897382d55..5d762693f7 100644 --- a/resources/views/modules/gedcom_news/list.phtml +++ b/resources/views/modules/gedcom_news/list.phtml @@ -6,10 +6,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<object> $articles - * @var int $block_id - * @var int $limit - * @var Tree $tree + * @var Collection<int,object> $articles + * @var int $block_id + * @var int $limit + * @var Tree $tree */ ?> diff --git a/resources/views/modules/hourglass-chart/children.phtml b/resources/views/modules/hourglass-chart/children.phtml index 64e5929905..9d10abedac 100644 --- a/resources/views/modules/hourglass-chart/children.phtml +++ b/resources/views/modules/hourglass-chart/children.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $children - * @var int $generations - * @var bool $spouses + * @var Collection<int,Individual> $children + * @var int $generations + * @var bool $spouses */ ?> diff --git a/resources/views/modules/lightbox/tab.phtml b/resources/views/modules/lightbox/tab.phtml index 593e23ca7e..819bcd86dc 100644 --- a/resources/views/modules/lightbox/tab.phtml +++ b/resources/views/modules/lightbox/tab.phtml @@ -4,7 +4,7 @@ use Fisharebest\Webtrees\Media; use Illuminate\Support\Collection; /** - * @var Collection<Media> $media_list + * @var Collection<int,Media> $media_list */ ?> diff --git a/resources/views/modules/location-list/page.phtml b/resources/views/modules/location-list/page.phtml index 60fba39002..908ff6076e 100644 --- a/resources/views/modules/location-list/page.phtml +++ b/resources/views/modules/location-list/page.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Location> $locations - * @var string $title - * @var Tree $tree + * @var Collection<int,Location> $locations + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/modules/media-list/page.phtml b/resources/views/modules/media-list/page.phtml index 522082f12a..f743723694 100644 --- a/resources/views/modules/media-list/page.phtml +++ b/resources/views/modules/media-list/page.phtml @@ -11,21 +11,21 @@ use Illuminate\Support\Collection; use League\Flysystem\FilesystemOperator; /** - * @var int $count - * @var FilesystemOperator $data_filesystem - * @var string $filter - * @var string $folder - * @var array<string> $folders - * @var string $format - * @var array<string> $formats - * @var int $max - * @var Collection<Media> $media_objects - * @var ModuleListInterface $module - * @var int $page - * @var int $pages - * @var string $subdirs - * @var string $title - * @var Tree $tree + * @var int $count + * @var FilesystemOperator $data_filesystem + * @var string $filter + * @var string $folder + * @var array<string> $folders + * @var string $format + * @var array<string> $formats + * @var int $max + * @var Collection<int,Media> $media_objects + * @var ModuleListInterface $module + * @var int $page + * @var int $pages + * @var string $subdirs + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/modules/media/tab.phtml b/resources/views/modules/media/tab.phtml index 479c51d78d..03bdaa82b9 100644 --- a/resources/views/modules/media/tab.phtml +++ b/resources/views/modules/media/tab.phtml @@ -6,10 +6,10 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var bool $can_edit - * @var Collection<Fact> $clipboard_facts - * @var Collection<Fact> $facts - * @var Individual $individual + * @var bool $can_edit + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Fact> $facts + * @var Individual $individual */ ?> diff --git a/resources/views/modules/note-list/page.phtml b/resources/views/modules/note-list/page.phtml index d446963960..24dea84f8b 100644 --- a/resources/views/modules/note-list/page.phtml +++ b/resources/views/modules/note-list/page.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Note> $notes - * @var string $title - * @var Tree $tree + * @var Collection<int,Note> $notes + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index 22d559f6d5..232175ff8e 100644 --- a/resources/views/modules/notes/tab.phtml +++ b/resources/views/modules/notes/tab.phtml @@ -11,10 +11,10 @@ use Fisharebest\Webtrees\Registry; use Illuminate\Support\Collection; /** - * @var bool $can_edit - * @var Collection<Fact> $clipboard_facts - * @var Collection<Fact> $facts - * @var Individual $individual + * @var bool $can_edit + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Fact> $facts + * @var Individual $individual */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-down.phtml b/resources/views/modules/pedigree-chart/chart-down.phtml index 4827eed8c0..59b850d5c3 100644 --- a/resources/views/modules/pedigree-chart/chart-down.phtml +++ b/resources/views/modules/pedigree-chart/chart-down.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection<string> $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<int,Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<int,string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-left.phtml b/resources/views/modules/pedigree-chart/chart-left.phtml index d325b0be55..b820d9f201 100644 --- a/resources/views/modules/pedigree-chart/chart-left.phtml +++ b/resources/views/modules/pedigree-chart/chart-left.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection<string> $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<int,Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<int,string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart-right.phtml b/resources/views/modules/pedigree-chart/chart-right.phtml index 9d8f712724..f5789b068e 100644 --- a/resources/views/modules/pedigree-chart/chart-right.phtml +++ b/resources/views/modules/pedigree-chart/chart-right.phtml @@ -4,12 +4,12 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $ancestors Indexed by sosa number - * @var int $generation Draw this generation - * @var int $generations Final generation to draw - * @var Collection<string> $links Links to extend the tree - * @var int $sosa Draw this individual - * @var string $spacer + * @var Collection<int,Individual> $ancestors Indexed by sosa number + * @var int $generation Draw this generation + * @var int $generations Final generation to draw + * @var Collection<int,string> $links Links to extend the tree + * @var int $sosa Draw this individual + * @var string $spacer */ ?> diff --git a/resources/views/modules/pedigree-chart/chart.phtml b/resources/views/modules/pedigree-chart/chart.phtml index 0b61b9f916..20a0763386 100644 --- a/resources/views/modules/pedigree-chart/chart.phtml +++ b/resources/views/modules/pedigree-chart/chart.phtml @@ -4,11 +4,11 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Individual> $ancestors - * @var int $generations - * @var Collection<string> $links - * @var string $spacer - * @var string $style + * @var Collection<int,Individual> $ancestors + * @var int $generations + * @var Collection<int,string> $links + * @var string $spacer + * @var string $style */ ?> diff --git a/resources/views/modules/personal_facts/tab.phtml b/resources/views/modules/personal_facts/tab.phtml index 8768028d1f..e765e52c01 100644 --- a/resources/views/modules/personal_facts/tab.phtml +++ b/resources/views/modules/personal_facts/tab.phtml @@ -6,13 +6,13 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var bool $can_edit - * @var Collection<Fact> $clipboard_facts - * @var Collection<Fact> $facts - * @var bool $has_associate_facts - * @var bool $has_historic_facts - * @var bool $has_relative_facts - * @var Individual $individual + * @var bool $can_edit + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Fact> $facts + * @var bool $has_associate_facts + * @var bool $has_historic_facts + * @var bool $has_relative_facts + * @var Individual $individual */ ?> diff --git a/resources/views/modules/place-hierarchy/events.phtml b/resources/views/modules/place-hierarchy/events.phtml index c69eb19234..fe49c2de7a 100644 --- a/resources/views/modules/place-hierarchy/events.phtml +++ b/resources/views/modules/place-hierarchy/events.phtml @@ -7,9 +7,9 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Family> $famlist - * @var Collection<Individual> $indilist - * @var Tree $tree + * @var Collection<int,Family> $famlist + * @var Collection<int,Individual> $indilist + * @var Tree $tree */ ?> diff --git a/resources/views/modules/privacy-policy/page.phtml b/resources/views/modules/privacy-policy/page.phtml index bfa62632d8..0d5b3b9a2b 100644 --- a/resources/views/modules/privacy-policy/page.phtml +++ b/resources/views/modules/privacy-policy/page.phtml @@ -6,9 +6,9 @@ use Fisharebest\Webtrees\Module\ModuleAnalyticsInterface; use Illuminate\Support\Collection; /** - * @var Collection<UserInterface> $administrators - * @var Collection<ModuleAnalyticsInterface> $analytics - * @var string $title + * @var Collection<int,UserInterface> $administrators + * @var Collection<int,ModuleAnalyticsInterface> $analytics + * @var string $title */ ?> diff --git a/resources/views/modules/recent_changes/changes-list.phtml b/resources/views/modules/recent_changes/changes-list.phtml index ab921e28c2..7f397bc489 100644 --- a/resources/views/modules/recent_changes/changes-list.phtml +++ b/resources/views/modules/recent_changes/changes-list.phtml @@ -5,12 +5,12 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var int $id - * @var int $limit_low - * @var int $limit_high - * @var Collection<object> $rows - * @var bool $show_date - * @var bool $show_user + * @var int $id + * @var int $limit_low + * @var int $limit_high + * @var Collection<int,object> $rows + * @var bool $show_date + * @var bool $show_user */ ?> diff --git a/resources/views/modules/recent_changes/changes-table.phtml b/resources/views/modules/recent_changes/changes-table.phtml index ab048d29b0..66c81593f6 100644 --- a/resources/views/modules/recent_changes/changes-table.phtml +++ b/resources/views/modules/recent_changes/changes-table.phtml @@ -15,7 +15,7 @@ use Illuminate\Support\Collection; * @var int $limit_high * @var int $limit_low * @var array<array<int,string>> $order - * @var Collection<object> $rows + * @var Collection<int,object> $rows * @var bool $show_date * @var bool $show_user */ diff --git a/resources/views/modules/relationships-chart/config.phtml b/resources/views/modules/relationships-chart/config.phtml index b7be878525..f911c88de6 100644 --- a/resources/views/modules/relationships-chart/config.phtml +++ b/resources/views/modules/relationships-chart/config.phtml @@ -7,12 +7,12 @@ 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 + * @var Collection<int,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/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml index 4eb17b0149..3e0e952bda 100644 --- a/resources/views/modules/relatives/tab.phtml +++ b/resources/views/modules/relatives/tab.phtml @@ -12,13 +12,13 @@ use Fisharebest\Webtrees\Individual; 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 + * @var bool $can_edit + * @var int $fam_access_level + * @var Individual $individual + * @var Collection<int,Family> $parent_families + * @var Collection<int,Family> $spouse_families + * @var Collection<int,Family> $step_child_families + * @var Collection<int,Family> $step_parent_families */ ?> diff --git a/resources/views/modules/repository-list/page.phtml b/resources/views/modules/repository-list/page.phtml index e28aa413a9..40375f4ed9 100644 --- a/resources/views/modules/repository-list/page.phtml +++ b/resources/views/modules/repository-list/page.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Repository> $repositories - * @var string $title - * @var Tree $tree + * @var Collection<int,Repository> $repositories + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/modules/share-anniversary/share.phtml b/resources/views/modules/share-anniversary/share.phtml index 7ed2e5df1b..9de39c7940 100644 --- a/resources/views/modules/share-anniversary/share.phtml +++ b/resources/views/modules/share-anniversary/share.phtml @@ -6,9 +6,9 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $facts - * @var Individual $record - * @var string $url + * @var Collection<int,Fact> $facts + * @var Individual $record + * @var string $url */ ?> diff --git a/resources/views/modules/sitemap/config.phtml b/resources/views/modules/sitemap/config.phtml index 6b39edfd42..1fb5d6c3f5 100644 --- a/resources/views/modules/sitemap/config.phtml +++ b/resources/views/modules/sitemap/config.phtml @@ -7,7 +7,7 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Tree> $all_trees + * @var Collection<int,Tree> $all_trees * @var string $sitemap_url * @var array<string,string> $submit_urls * @var string $title diff --git a/resources/views/modules/sitemap/sitemap-file-xml.phtml b/resources/views/modules/sitemap/sitemap-file-xml.phtml index 8edc4bb58f..3ed7500040 100644 --- a/resources/views/modules/sitemap/sitemap-file-xml.phtml +++ b/resources/views/modules/sitemap/sitemap-file-xml.phtml @@ -8,10 +8,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var float $priority - * @var Collection<GedcomRecord> $records - * @var string $sitemap_xsl - * @var Tree $tree + * @var float $priority + * @var Collection<int,GedcomRecord> $records + * @var string $sitemap_xsl + * @var Tree $tree */ ?> diff --git a/resources/views/modules/source-list/page.phtml b/resources/views/modules/source-list/page.phtml index 70fa0d7113..1d927018b4 100644 --- a/resources/views/modules/source-list/page.phtml +++ b/resources/views/modules/source-list/page.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Source> $sources - * @var string $title - * @var Tree $tree + * @var Collection<int,Source> $sources + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/modules/sources_tab/tab.phtml b/resources/views/modules/sources_tab/tab.phtml index 99604f8eb9..d5362e2c37 100644 --- a/resources/views/modules/sources_tab/tab.phtml +++ b/resources/views/modules/sources_tab/tab.phtml @@ -7,10 +7,10 @@ use Fisharebest\Webtrees\Individual; use Illuminate\Support\Collection; /** - * @var bool $can_edit - * @var Collection<Fact> $clipboard_facts - * @var Collection<Fact> $facts - * @var Individual $individual + * @var bool $can_edit + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Fact> $facts + * @var Individual $individual */ ?> diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml index b84ce59e10..c278bd73b6 100644 --- a/resources/views/modules/stories/config.phtml +++ b/resources/views/modules/stories/config.phtml @@ -7,10 +7,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<object> $stories - * @var string $title - * @var Tree $tree - * @var array<string> $tree_names + * @var Collection<int,object> $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 3341bb26ef..41b90f2329 100644 --- a/resources/views/modules/stories/list.phtml +++ b/resources/views/modules/stories/list.phtml @@ -4,8 +4,8 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<object> $stories - * @var string $title + * @var Collection<int,object> $stories + * @var string $title */ ?> diff --git a/resources/views/modules/submitter-list/page.phtml b/resources/views/modules/submitter-list/page.phtml index 505a0f96dc..8915c95363 100644 --- a/resources/views/modules/submitter-list/page.phtml +++ b/resources/views/modules/submitter-list/page.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Submitter> $submitters - * @var string $title + * @var Collection<int,Submitter> $submitters + * @var string $title * @var Tree $tree */ diff --git a/resources/views/modules/timeline-chart/chart.phtml b/resources/views/modules/timeline-chart/chart.phtml index e025fafde8..54c50cbaf4 100644 --- a/resources/views/modules/timeline-chart/chart.phtml +++ b/resources/views/modules/timeline-chart/chart.phtml @@ -9,6 +9,9 @@ use Fisharebest\Webtrees\Individual; /** * @var int $baseyear * @var int $bheight + * @var array<int> $birthdays + * @var array<int> $birthmonths + * @var array<int> $birthyears * @var int $scale * @var int $topyear * @var array<Fact> $indifacts diff --git a/resources/views/modules/timeline-chart/page.phtml b/resources/views/modules/timeline-chart/page.phtml index 63f1c913cd..abda4ab5fa 100644 --- a/resources/views/modules/timeline-chart/page.phtml +++ b/resources/views/modules/timeline-chart/page.phtml @@ -6,14 +6,14 @@ 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 + * @var string $ajax_url + * @var Collection<int,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/todo/research-tasks.phtml b/resources/views/modules/todo/research-tasks.phtml index 836189991d..ecd5b99cab 100644 --- a/resources/views/modules/todo/research-tasks.phtml +++ b/resources/views/modules/todo/research-tasks.phtml @@ -5,9 +5,9 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var int $limit_high - * @var int $limit_low - * @var Collection<Fact> $tasks + * @var int $limit_high + * @var int $limit_low + * @var Collection<int,Fact> $tasks */ ?> diff --git a/resources/views/modules/user-messages/user-messages.phtml b/resources/views/modules/user-messages/user-messages.phtml index 0084fb7cff..3c07855469 100644 --- a/resources/views/modules/user-messages/user-messages.phtml +++ b/resources/views/modules/user-messages/user-messages.phtml @@ -12,13 +12,13 @@ use Fisharebest\Webtrees\User; use Illuminate\Support\Collection; /** - * @var int $block_id - * @var string $context - * @var ModuleInterface $module - * @var Tree $tree - * @var Collection<object> $messages - * @var Collection<User> $users - * @var UserService $user_service + * @var int $block_id + * @var string $context + * @var ModuleInterface $module + * @var Tree $tree + * @var Collection<int,object> $messages + * @var Collection<int,User> $users + * @var UserService $user_service */ ?> diff --git a/resources/views/modules/user_blog/list.phtml b/resources/views/modules/user_blog/list.phtml index 043994a889..5811e35caa 100644 --- a/resources/views/modules/user_blog/list.phtml +++ b/resources/views/modules/user_blog/list.phtml @@ -6,10 +6,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<object> $articles - * @var int $block_id - * @var int $limit - * @var Tree $tree + * @var Collection<int,object> $articles + * @var int $block_id + * @var int $limit + * @var Tree $tree */ ?> diff --git a/resources/views/modules/yahrzeit/list.phtml b/resources/views/modules/yahrzeit/list.phtml index e0c0354083..4aba302677 100644 --- a/resources/views/modules/yahrzeit/list.phtml +++ b/resources/views/modules/yahrzeit/list.phtml @@ -5,10 +5,10 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var int $id - * @var int $limit_low - * @var int $limit_high - * @var Collection<object> $yahrzeits + * @var int $id + * @var int $limit_low + * @var int $limit_high + * @var Collection<int,object> $yahrzeits */ ?> diff --git a/resources/views/modules/yahrzeit/table.phtml b/resources/views/modules/yahrzeit/table.phtml index 4631248fb0..799d8cae8e 100644 --- a/resources/views/modules/yahrzeit/table.phtml +++ b/resources/views/modules/yahrzeit/table.phtml @@ -4,9 +4,9 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var int $limit_high - * @var int $limit_low - * @var Collection<object> $yahrzeits + * @var int $limit_high + * @var int $limit_low + * @var Collection<int,object> $yahrzeits */ ?> diff --git a/resources/views/note-page-details.phtml b/resources/views/note-page-details.phtml index f7a516ff47..0d1bf4cb31 100644 --- a/resources/views/note-page-details.phtml +++ b/resources/views/note-page-details.phtml @@ -9,9 +9,9 @@ use Fisharebest\Webtrees\Registry; use Illuminate\Support\Collection; /** - * @var Note $record - * @var Collection<Fact> $clipboard_facts - * @var string $text + * @var Note $record + * @var Collection<int,Fact> $clipboard_facts + * @var string $text */ ?> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index 969ad09d5f..76a84da128 100644 --- a/resources/views/note-page.phtml +++ b/resources/views/note-page.phtml @@ -10,13 +10,13 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Note $record - * @var Collection<Fact> $clipboard_facts - * @var Collection<Family> $linked_families - * @var Collection<Individual> $linked_individuals - * @var Collection<Media> $linked_media_objects - * @var Collection<Source> $linked_sources - * @var Tree $tree + * @var Note $record + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Family> $linked_families + * @var Collection<int,Individual> $linked_individuals + * @var Collection<int,Media> $linked_media_objects + * @var Collection<int,Source> $linked_sources + * @var Tree $tree */ ?> diff --git a/resources/views/record-page-links.phtml b/resources/views/record-page-links.phtml index e1f0b6fdf0..af6da071ab 100644 --- a/resources/views/record-page-links.phtml +++ b/resources/views/record-page-links.phtml @@ -10,13 +10,13 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var string $details - * @var ?Collection<Family> $linked_families - * @var ?Collection<Individual> $linked_individuals - * @var ?Collection<Media> $linked_media_objects - * @var ?Collection<Note> $linked_notes - * @var ?Collection<Source> $linked_sources - * @var Tree $tree + * @var string $details + * @var ?Collection<int,Family> $linked_families + * @var ?Collection<int,Individual> $linked_individuals + * @var ?Collection<int,Media> $linked_media_objects + * @var ?Collection<int,Note> $linked_notes + * @var ?Collection<int,Source> $linked_sources + * @var Tree $tree */ ?> diff --git a/resources/views/record-page-menu-clipboard.phtml b/resources/views/record-page-menu-clipboard.phtml index 0cda3551c2..6de2942bab 100644 --- a/resources/views/record-page-menu-clipboard.phtml +++ b/resources/views/record-page-menu-clipboard.phtml @@ -8,8 +8,8 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $clipboard_facts - * @var GedcomRecord $record + * @var Collection<int,Fact> $clipboard_facts + * @var GedcomRecord $record */ ?> diff --git a/resources/views/record-page-menu.phtml b/resources/views/record-page-menu.phtml index 58abd346f7..71fc6cba1e 100644 --- a/resources/views/record-page-menu.phtml +++ b/resources/views/record-page-menu.phtml @@ -9,8 +9,8 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $clipboard_facts - * @var GedcomRecord $record + * @var Collection<int,Fact> $clipboard_facts + * @var GedcomRecord $record */ ?> diff --git a/resources/views/record-page.phtml b/resources/views/record-page.phtml index c0afca5b56..037ece3fef 100644 --- a/resources/views/record-page.phtml +++ b/resources/views/record-page.phtml @@ -11,14 +11,14 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Fact> $clipboard_facts - * @var Collection<Family> $linked_families - * @var Collection<Individual> $linked_individuals - * @var Collection<Media> $linked_media_objects - * @var Collection<Note> $linked_notes - * @var Collection<Source> $linked_sources - * @var GedcomRecord $record - * @var Tree $tree + * @var Collection<int,Fact> $clipboard_facts + * @var Collection<int,Family> $linked_families + * @var Collection<int,Individual> $linked_individuals + * @var Collection<int,Media> $linked_media_objects + * @var Collection<int,Note> $linked_notes + * @var Collection<int,Source> $linked_sources + * @var GedcomRecord $record + * @var Tree $tree */ ?> diff --git a/resources/views/report-select-page.phtml b/resources/views/report-select-page.phtml index 323e884ee3..73c7c20745 100644 --- a/resources/views/report-select-page.phtml +++ b/resources/views/report-select-page.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\Module\ModuleReportInterface; use Illuminate\Support\Collection; /** - * @var Collection<ModuleReportInterface> $reports - * @var string $title + * @var Collection<int,ModuleReportInterface> $reports + * @var string $title */ ?> diff --git a/resources/views/search-advanced-page.phtml b/resources/views/search-advanced-page.phtml index d432a5d712..deadee5d13 100644 --- a/resources/views/search-advanced-page.phtml +++ b/resources/views/search-advanced-page.phtml @@ -7,14 +7,14 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var array<string,string> $date_options - * @var array<string,string> $fields - * @var array<string,string> $field_labels - * @var Collection<Individual> $individuals - * @var array<string,string> $name_options - * @var array<string,string> $other_fields - * @var string $title - * @var Tree $tree + * @var array<string,string> $date_options + * @var array<string,string> $fields + * @var array<string,string> $field_labels + * @var Collection<int,Individual> $individuals + * @var array<string,string> $name_options + * @var array<string,string> $other_fields + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/search-general-page.phtml b/resources/views/search-general-page.phtml index bf00e74a64..96dabc584c 100644 --- a/resources/views/search-general-page.phtml +++ b/resources/views/search-general-page.phtml @@ -12,27 +12,27 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Tree> $all_trees - * @var bool $exist_locations - * @var bool $exist_notes - * @var bool $exist_repositories - * @var bool $exist_sources - * @var Collection<Family> $families - * @var Collection<Individual> $individuals - * @var Collection<Location> $locations - * @var Collection<Note> $notes - * @var string $query - * @var Collection<Repository> $repositories - * @var Collection<Source> $sources - * @var bool $search_families - * @var bool $search_individuals - * @var bool $search_locations - * @var bool $search_notes - * @var bool $search_repositories - * @var bool $search_sources - * @var Collection<Tree> $search_trees - * @var string $title - * @var Tree $tree + * @var Collection<int,Tree> $all_trees + * @var bool $exist_locations + * @var bool $exist_notes + * @var bool $exist_repositories + * @var bool $exist_sources + * @var Collection<int,Family> $families + * @var Collection<int,Individual> $individuals + * @var Collection<int,Location> $locations + * @var Collection<int,Note> $notes + * @var string $query + * @var Collection<int,Repository> $repositories + * @var Collection<int,Source> $sources + * @var bool $search_families + * @var bool $search_individuals + * @var bool $search_locations + * @var bool $search_notes + * @var bool $search_repositories + * @var bool $search_sources + * @var Collection<int,Tree> $search_trees + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/search-phonetic-page.phtml b/resources/views/search-phonetic-page.phtml index 4232ec6c5f..22abae79aa 100644 --- a/resources/views/search-phonetic-page.phtml +++ b/resources/views/search-phonetic-page.phtml @@ -7,15 +7,15 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Tree> $all_trees - * @var string $firstname - * @var Collection<Individual> $individuals - * @var string $lastname - * @var string $place - * @var Collection<Tree> $search_trees - * @var string $soundex - * @var string $title - * @var Tree $tree + * @var Collection<int,Tree> $all_trees + * @var string $firstname + * @var Collection<int,Individual> $individuals + * @var string $lastname + * @var string $place + * @var Collection<int,Tree> $search_trees + * @var string $soundex + * @var string $title + * @var Tree $tree */ ?> diff --git a/resources/views/search-results.phtml b/resources/views/search-results.phtml index 02b54a70cf..d64166324c 100644 --- a/resources/views/search-results.phtml +++ b/resources/views/search-results.phtml @@ -12,19 +12,19 @@ use Fisharebest\Webtrees\View; use Illuminate\Support\Collection; /** - * @var Collection<Family> $families - * @var Collection<Individual> $individuals - * @var Collection<Location> $locations - * @var Collection<Note> $notes - * @var Collection<Repository> $repositories - * @var Collection<Source> $sources - * @var bool $search_families - * @var bool $search_individuals - * @var bool $search_locations - * @var bool $search_notes - * @var bool $search_repositories - * @var bool $search_sources - * @var Tree $tree + * @var Collection<int,Family> $families + * @var Collection<int,Individual> $individuals + * @var Collection<int,Location> $locations + * @var Collection<int,Note> $notes + * @var Collection<int,Repository> $repositories + * @var Collection<int,Source> $sources + * @var bool $search_families + * @var bool $search_individuals + * @var bool $search_locations + * @var bool $search_notes + * @var bool $search_repositories + * @var bool $search_sources + * @var Tree $tree */ ?> diff --git a/resources/views/search-trees.phtml b/resources/views/search-trees.phtml index 29131874ed..8566104112 100644 --- a/resources/views/search-trees.phtml +++ b/resources/views/search-trees.phtml @@ -5,8 +5,8 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<Tree> $all_trees - * @var Collection<Tree> $search_trees + * @var Collection<int,Tree> $all_trees + * @var Collection<int,Tree> $search_trees */ ?> diff --git a/resources/views/setup/step-1-language.phtml b/resources/views/setup/step-1-language.phtml index 5a33168b7f..29eb9a3358 100644 --- a/resources/views/setup/step-1-language.phtml +++ b/resources/views/setup/step-1-language.phtml @@ -5,21 +5,21 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var Collection<LocaleInterface> $locales - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var Collection<int,LocaleInterface> $locales + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-2-server-checks.phtml b/resources/views/setup/step-2-server-checks.phtml index 0cb7e2e034..3c56ed09b7 100644 --- a/resources/views/setup/step-2-server-checks.phtml +++ b/resources/views/setup/step-2-server-checks.phtml @@ -4,22 +4,22 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var int $cpu_limit - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var int $memory_limit - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var int $cpu_limit + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var int $memory_limit + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-3-database-type.phtml b/resources/views/setup/step-3-database-type.phtml index 713da44220..27eb2d498c 100644 --- a/resources/views/setup/step-3-database-type.phtml +++ b/resources/views/setup/step-3-database-type.phtml @@ -4,20 +4,20 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-4-database-mysql.phtml b/resources/views/setup/step-4-database-mysql.phtml index bc0ba0f2c0..3ee5e064c6 100644 --- a/resources/views/setup/step-4-database-mysql.phtml +++ b/resources/views/setup/step-4-database-mysql.phtml @@ -4,20 +4,20 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-4-database-pgsql.phtml b/resources/views/setup/step-4-database-pgsql.phtml index e8b5569176..00ec07aa90 100644 --- a/resources/views/setup/step-4-database-pgsql.phtml +++ b/resources/views/setup/step-4-database-pgsql.phtml @@ -4,20 +4,20 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-4-database-sqlite.phtml b/resources/views/setup/step-4-database-sqlite.phtml index fa76fa4ce4..252953ad01 100644 --- a/resources/views/setup/step-4-database-sqlite.phtml +++ b/resources/views/setup/step-4-database-sqlite.phtml @@ -5,20 +5,20 @@ use Fisharebest\Webtrees\Webtrees; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-4-database-sqlsvr.phtml b/resources/views/setup/step-4-database-sqlsvr.phtml index bdf8d7bede..9dc89d2ca7 100644 --- a/resources/views/setup/step-4-database-sqlsvr.phtml +++ b/resources/views/setup/step-4-database-sqlsvr.phtml @@ -4,20 +4,20 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/setup/step-5-administrator.phtml b/resources/views/setup/step-5-administrator.phtml index 874a9c9e2f..67ab6aec94 100644 --- a/resources/views/setup/step-5-administrator.phtml +++ b/resources/views/setup/step-5-administrator.phtml @@ -4,20 +4,20 @@ use Fisharebest\Webtrees\I18N; use Illuminate\Support\Collection; /** - * @var string $dbhost - * @var string $dbname - * @var string $dbpass - * @var string $dbport - * @var string $dbtype - * @var string $dbuser - * @var Collection<string> $errors - * @var string $lang - * @var string $tblpfx - * @var Collection<string> $warnings - * @var string $wtemail - * @var string $wtname - * @var string $wtpass - * @var string $wtuser + * @var string $dbhost + * @var string $dbname + * @var string $dbpass + * @var string $dbport + * @var string $dbtype + * @var string $dbuser + * @var Collection<int,string> $errors + * @var string $lang + * @var string $tblpfx + * @var Collection<int,string> $warnings + * @var string $wtemail + * @var string $wtname + * @var string $wtpass + * @var string $wtuser */ ?> diff --git a/resources/views/statistics/other/chart-distribution.phtml b/resources/views/statistics/other/chart-distribution.phtml index d08126d9fe..4ccd9f8a3f 100644 --- a/resources/views/statistics/other/chart-distribution.phtml +++ b/resources/views/statistics/other/chart-distribution.phtml @@ -2,10 +2,10 @@ declare(strict_types=1); -/** @var Statistics $stats */ - use Fisharebest\Webtrees\Statistics; +/** @var Statistics $stats */ + ?> <?= $stats->chartDistribution(); |