From 30158ae76837ce51811d3e0fca2ea5852182f42e Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Mon, 12 Nov 2018 06:07:05 +0000 Subject: Rename GedcomRecord::getFacts() to facts() --- app/Census/AbstractCensusColumnCondition.php | 4 +- app/Census/CensusColumnAgeMarried.php | 2 +- app/Census/CensusColumnFullName.php | 2 +- app/Census/CensusColumnMarriedWithinYear.php | 2 +- .../CensusColumnMonthIfMarriedWithinYear.php | 2 +- app/Census/CensusColumnNationality.php | 2 +- app/Census/CensusColumnOccupation.php | 2 +- app/Census/CensusColumnYearsMarried.php | 2 +- app/Family.php | 4 +- app/Functions/Functions.php | 18 +- app/Functions/FunctionsCharts.php | 2 +- app/Functions/FunctionsPrint.php | 8 +- app/GedcomRecord.php | 16 +- app/Http/Controllers/AdminController.php | 18 +- app/Http/Controllers/AdminTreesController.php | 8 +- app/Http/Controllers/AncestorsChartController.php | 2 +- app/Http/Controllers/BranchesController.php | 2 +- .../Controllers/DescendantsChartController.php | 2 +- app/Http/Controllers/EditFamilyController.php | 16 +- .../Controllers/EditGedcomRecordController.php | 12 +- app/Http/Controllers/EditIndividualController.php | 12 +- app/Http/Controllers/FamilyController.php | 2 +- app/Http/Controllers/GedcomRecordController.php | 2 +- app/Http/Controllers/IndividualController.php | 12 +- app/Http/Controllers/MediaController.php | 2 +- app/Http/Controllers/NoteController.php | 2 +- app/Http/Controllers/RepositoryController.php | 2 +- app/Http/Controllers/SourceController.php | 2 +- app/Http/Controllers/TimelineChartController.php | 4 +- app/Individual.php | 16 +- app/Media.php | 2 +- app/MediaFile.php | 4 +- app/Module/AlbumModule.php | 6 +- app/Module/ExtraInformationModule.php | 2 +- app/Module/IndividualFactsTabModule.php | 20 +- app/Module/InteractiveTree/TreeView.php | 6 +- app/Module/MediaTabModule.php | 4 +- app/Module/NotesTabModule.php | 4 +- app/Module/PlacesModule.php | 4 +- app/Module/ResearchTaskModule.php | 2 +- app/Module/SourcesTabModule.php | 4 +- app/Report/ReportParserGenerate.php | 4 +- app/Repository.php | 2 +- app/Services/CalendarService.php | 4 +- app/Source.php | 2 +- app/Theme/AbstractTheme.php | 8 +- resources/views/edit/raw-gedcom-record.phtml | 2 +- resources/views/edit/reorder-children.phtml | 2 +- resources/views/edit/reorder-media.phtml | 2 +- resources/views/edit/reorder-names.phtml | 2 +- resources/views/edit/reorder-spouses.phtml | 2 +- resources/views/individual-page-menu.phtml | 2 +- resources/views/individual-page.phtml | 2 +- resources/views/lifespans-chart.phtml | 2 +- resources/views/lists/families-table.phtml | 6 +- resources/views/modules/relatives/family.phtml | 10 +- resources/views/pending-changes-page.phtml | 2 +- tests/app/Census/CensusColumnAgeMarriedTest.php | 4 +- .../app/Census/CensusColumnConditionDanishTest.php | 28 +- .../Census/CensusColumnConditionEnglishTest.php | 28 +- .../CensusColumnConditionFrenchFemmeTest.php | 28 +- .../CensusColumnConditionFrenchFilleTest.php | 28 +- .../CensusColumnConditionFrenchGarconTest.php | 28 +- .../CensusColumnConditionFrenchHommeTest.php | 28 +- .../Census/CensusColumnConditionFrenchVeufTest.php | 28 +- .../CensusColumnConditionFrenchVeuveTest.php | 28 +- tests/app/Census/CensusColumnConditionUsTest.php | 28 +- .../Census/CensusColumnMarriedWithinYearTest.php | 8 +- .../CensusColumnMonthIfMarriedWithinYearTest.php | 8 +- tests/app/Census/CensusColumnNationalityTest.php | 8 +- tests/app/Census/CensusColumnOccupationTest.php | 4 +- tests/app/Census/CensusColumnYearsMarriedTest.php | 8 +- vendor/composer/autoload_classmap.php | 2917 ++++++++++++++++++++ vendor/composer/autoload_static.php | 2917 ++++++++++++++++++++ vendor/composer/installed.json | 2464 +++++++++++++++-- 75 files changed, 8434 insertions(+), 450 deletions(-) diff --git a/app/Census/AbstractCensusColumnCondition.php b/app/Census/AbstractCensusColumnCondition.php index e0eabd7c8a..a15569bd0f 100644 --- a/app/Census/AbstractCensusColumnCondition.php +++ b/app/Census/AbstractCensusColumnCondition.php @@ -71,7 +71,7 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem $family = $this->spouseFamily($individual); $sex = $individual->getSex(); - if ($family === null || count($family->getFacts('MARR')) === 0) { + if ($family === null || count($family->facts('MARR')) === 0) { if ($this->isChild($individual)) { return $this->conditionChild($sex); } @@ -79,7 +79,7 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem return $this->conditionSingle($sex); } - if (count($family->getFacts('DIV')) > 0) { + if (count($family->facts('DIV')) > 0) { return $this->conditionDivorced($sex); } diff --git a/app/Census/CensusColumnAgeMarried.php b/app/Census/CensusColumnAgeMarried.php index c33d88a134..8185c345de 100644 --- a/app/Census/CensusColumnAgeMarried.php +++ b/app/Census/CensusColumnAgeMarried.php @@ -37,7 +37,7 @@ class CensusColumnAgeMarried extends AbstractCensusColumn implements CensusColum { if ($individual->getBirthDate()->isOK()) { foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts('MARR', true) as $fact) { + foreach ($family->facts('MARR', true) as $fact) { if ($fact->date()->isOK()) { return (string) Date::getAgeYears($individual->getBirthDate(), $fact->date()); } diff --git a/app/Census/CensusColumnFullName.php b/app/Census/CensusColumnFullName.php index d285d186a9..85044997d3 100644 --- a/app/Census/CensusColumnFullName.php +++ b/app/Census/CensusColumnFullName.php @@ -55,7 +55,7 @@ class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnI $name = $names[0]; foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts('MARR') as $marriage) { + foreach ($family->facts('MARR') as $marriage) { if ($marriage->date()->isOK() && Date::compare($marriage->date(), $census_date) < 0) { $spouse = $family->getSpouse($individual); foreach ($names as $individual_name) { diff --git a/app/Census/CensusColumnMarriedWithinYear.php b/app/Census/CensusColumnMarriedWithinYear.php index 2ef4f38da4..d19f4efa81 100644 --- a/app/Census/CensusColumnMarriedWithinYear.php +++ b/app/Census/CensusColumnMarriedWithinYear.php @@ -35,7 +35,7 @@ class CensusColumnMarriedWithinYear extends AbstractCensusColumn implements Cens public function generate(Individual $individual, Individual $head): string { foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts('MARR') as $fact) { + foreach ($family->facts('MARR') as $fact) { $marriage_jd = $fact->date()->julianDay(); $census_jd = $this->date()->julianDay(); if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) { diff --git a/app/Census/CensusColumnMonthIfMarriedWithinYear.php b/app/Census/CensusColumnMonthIfMarriedWithinYear.php index 176f510464..a972017e51 100644 --- a/app/Census/CensusColumnMonthIfMarriedWithinYear.php +++ b/app/Census/CensusColumnMonthIfMarriedWithinYear.php @@ -35,7 +35,7 @@ class CensusColumnMonthIfMarriedWithinYear extends AbstractCensusColumn implemen public function generate(Individual $individual, Individual $head): string { foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts('MARR') as $fact) { + foreach ($family->facts('MARR') as $fact) { $marriage_jd = $fact->date()->julianDay(); $census_jd = $this->date()->julianDay(); if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) { diff --git a/app/Census/CensusColumnNationality.php b/app/Census/CensusColumnNationality.php index 26581bfb02..eaf3272b67 100644 --- a/app/Census/CensusColumnNationality.php +++ b/app/Census/CensusColumnNationality.php @@ -52,7 +52,7 @@ class CensusColumnNationality extends AbstractCensusColumn implements CensusColu } // Did we emigrate or naturalise? - foreach ($individual->getFacts('IMMI|EMIG|NATU', true) as $fact) { + foreach ($individual->facts('IMMI|EMIG|NATU', true) as $fact) { if (Date::compare($fact->date(), $this->date()) <= 0) { $place = $fact->place()->getGedcomName(); } diff --git a/app/Census/CensusColumnOccupation.php b/app/Census/CensusColumnOccupation.php index eb92580f00..ad84e4ade4 100644 --- a/app/Census/CensusColumnOccupation.php +++ b/app/Census/CensusColumnOccupation.php @@ -34,7 +34,7 @@ class CensusColumnOccupation extends AbstractCensusColumn implements CensusColum */ public function generate(Individual $individual, Individual $head): string { - foreach ($individual->getFacts('OCCU') as $fact) { + foreach ($individual->facts('OCCU') as $fact) { return $fact->value(); } diff --git a/app/Census/CensusColumnYearsMarried.php b/app/Census/CensusColumnYearsMarried.php index 1bf08f3b57..1b7eb60097 100644 --- a/app/Census/CensusColumnYearsMarried.php +++ b/app/Census/CensusColumnYearsMarried.php @@ -38,7 +38,7 @@ class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusCol $marriage_date = null; foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts('MARR', true) as $fact) { + foreach ($family->facts('MARR', true) as $fact) { if ($fact->date()->isOK() && Date::compare($fact->date(), $this->date()) <= 0) { $marriage_date = $fact->date(); } diff --git a/app/Family.php b/app/Family.php index f9cca0345c..62fe2347f4 100644 --- a/app/Family.php +++ b/app/Family.php @@ -242,7 +242,7 @@ class Family extends GedcomRecord $SHOW_PRIVATE_RELATIONSHIPS = (bool) $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS'); $children = []; - foreach ($this->getFacts('CHIL', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { + foreach ($this->facts('CHIL', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { $child = $fact->target(); if ($child instanceof Individual && ($SHOW_PRIVATE_RELATIONSHIPS || $child->canShowName($access_level))) { $children[] = $child; @@ -273,7 +273,7 @@ class Family extends GedcomRecord public function getNumberOfChildren(): int { $nchi = count($this->getChildren()); - foreach ($this->getFacts('NCHI') as $fact) { + foreach ($this->facts('NCHI') as $fact) { $nchi = max($nchi, (int) $fact->value()); } diff --git a/app/Functions/Functions.php b/app/Functions/Functions.php index 63f5609dfc..493a8a7661 100644 --- a/app/Functions/Functions.php +++ b/app/Functions/Functions.php @@ -677,15 +677,15 @@ class Functions if ($person1 && $person2) { foreach ($person1->getSpouseFamilies() as $family) { if ($person2 === $family->getSpouse($person1)) { - if ($family->getFacts('MARR')) { - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts('MARR')) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translate('ex-husband'); } return I18N::translate('husband'); } - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translateContext('MALE', 'ex-partner'); } } @@ -697,15 +697,15 @@ class Functions if ($person1 && $person2) { foreach ($person1->getSpouseFamilies() as $family) { if ($person2 === $family->getSpouse($person1)) { - if ($family->getFacts('MARR')) { - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts('MARR')) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translate('ex-wife'); } return I18N::translate('wife'); } - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translateContext('FEMALE', 'ex-partner'); } } @@ -717,15 +717,15 @@ class Functions if ($person1 && $person2) { foreach ($person1->getSpouseFamilies() as $family) { if ($person2 === $family->getSpouse($person1)) { - if ($family->getFacts('MARR')) { - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts('MARR')) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translate('ex-spouse'); } return I18N::translate('spouse'); } - if ($family->getFacts(WT_EVENTS_DIV)) { + if ($family->facts(WT_EVENTS_DIV)) { return I18N::translate('ex-partner'); } } diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php index 175ffc05e0..9b9829e8b1 100644 --- a/app/Functions/FunctionsCharts.php +++ b/app/Functions/FunctionsCharts.php @@ -198,7 +198,7 @@ class FunctionsCharts echo ''; echo '
'; if ($sosa && $family->canShow()) { - foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR) as $fact) { echo ''; echo $fact->summary(); echo ''; diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php index 364dc669ec..2f1e10dbd5 100644 --- a/app/Functions/FunctionsPrint.php +++ b/app/Functions/FunctionsPrint.php @@ -600,13 +600,13 @@ class FunctionsPrint */ public static function getLdsSummary(Individual $individual): string { - $BAPL = $individual->getFacts('BAPL') ? 'B' : '_'; - $ENDL = $individual->getFacts('ENDL') ? 'E' : '_'; - $SLGC = $individual->getFacts('SLGC') ? 'C' : '_'; + $BAPL = $individual->facts('BAPL') ? 'B' : '_'; + $ENDL = $individual->facts('ENDL') ? 'E' : '_'; + $SLGC = $individual->facts('SLGC') ? 'C' : '_'; $SLGS = '_'; foreach ($individual->getSpouseFamilies() as $family) { - if ($family->getFacts('SLGS')) { + if ($family->facts('SLGS')) { $SLGS = ''; } } diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php index d5a70dcacc..d692050493 100644 --- a/app/GedcomRecord.php +++ b/app/GedcomRecord.php @@ -499,7 +499,7 @@ class GedcomRecord list($gedrec) = explode("\n", $this->gedcom, 2); // Check each of the facts for access - foreach ($this->getFacts('', false, $access_level) as $fact) { + foreach ($this->facts('', false, $access_level) as $fact) { $gedrec .= "\n" . $fact->gedcom(); } @@ -813,7 +813,7 @@ class GedcomRecord */ public function formatFirstMajorFact(string $facts, int $style): string { - foreach ($this->getFacts($facts, true) as $event) { + foreach ($this->facts($facts, true) as $event) { // Only display if it has a date or place (or both) if ($event->date()->isOK() && !$event->place()->isEmpty()) { $joiner = ' — '; @@ -1045,7 +1045,7 @@ class GedcomRecord public function getAllEventDates(string $event_type): array { $dates = []; - foreach ($this->getFacts($event_type) as $event) { + foreach ($this->facts($event_type) as $event) { if ($event->date()->isOK()) { $dates[] = $event->date(); } @@ -1064,7 +1064,7 @@ class GedcomRecord public function getAllEventPlaces(string $event_type): array { $places = []; - foreach ($this->getFacts($event_type) as $event) { + foreach ($this->facts($event_type) as $event) { if (preg_match_all('/\n(?:2 PLAC|3 (?:ROMN|FONE|_HEB)) +(.+)/', $event->gedcom(), $ged_places)) { foreach ($ged_places[1] as $ged_place) { $places[] = new Place($ged_place, $this->tree); @@ -1084,7 +1084,7 @@ class GedcomRecord */ public function getFirstFact(string $tag) { - foreach ($this->getFacts() as $fact) { + foreach ($this->facts() as $fact) { if ($fact->getTag() === $tag) { return $fact; } @@ -1103,7 +1103,7 @@ class GedcomRecord * * @return Fact[] */ - public function getFacts(string $filter = '', bool $sort = false, int $access_level = null, bool $override = false): array + public function facts(string $filter = '', bool $sort = false, int $access_level = null, bool $override = false): array { if ($access_level === null) { $access_level = Auth::accessLevel($this->tree); @@ -1242,7 +1242,7 @@ class GedcomRecord list($new_gedcom) = explode("\n", $old_gedcom, 2); // Replacing (or deleting) an existing fact - foreach ($this->getFacts('', false, Auth::PRIV_HIDE) as $fact) { + foreach ($this->facts('', false, Auth::PRIV_HIDE) as $fact) { if (!$fact->isPendingDeletion()) { if ($fact->id() === $fact_id) { if ($gedcom !== '') { @@ -1375,7 +1375,7 @@ class GedcomRecord { $value = '@' . $xref . '@'; - foreach ($this->getFacts() as $fact) { + foreach ($this->facts() as $fact) { if ($fact->value() === $value) { $this->deleteFact($fact->id(), $update_chan); } elseif (preg_match_all('/\n(\d) ' . WT_REGEX_TAG . ' ' . $value . '/', $fact->gedcom(), $matches, PREG_SET_ORDER)) { diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index c0a665ec1e..d13e61d5c9 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -409,10 +409,10 @@ class AdminController extends AbstractBaseController $media = Media::getInstance($obje_xref, $tree); if ($individual !== null && $media !== null) { - foreach ($individual->getFacts() as $fact1) { + foreach ($individual->facts() as $fact1) { if ($fact1->id() === $fact_id) { $individual->updateFact($fact_id, $fact1->gedcom() . "\n2 OBJE @" . $obje_xref . '@', false); - foreach ($individual->getFacts('OBJE') as $fact2) { + foreach ($individual->facts('OBJE') as $fact2) { if ($fact2->target() === $media) { $individual->deleteFact($fact2->id(), false); } @@ -496,14 +496,14 @@ class AdminController extends AbstractBaseController $media = Media::getInstance($datum->m_id, $tree, $datum->m_gedcom); $individual = Individual::getInstance($datum->i_id, $tree, $datum->i_gedcom); - $facts = $individual->getFacts('', true); + $facts = $individual->facts('', true); $facts = array_filter($facts, function (Fact $fact) use ($ignore_facts): bool { return !$fact->isPendingDeletion() && !in_array($fact->getTag(), $ignore_facts); }); // The link to the media object may have been deleted in a pending change. $deleted = true; - foreach ($individual->getFacts('OBJE') as $fact) { + foreach ($individual->facts('OBJE') as $fact) { if ($fact->target() === $media && !$fact->isPendingDeletion()) { $deleted = false; } @@ -595,7 +595,7 @@ class AdminController extends AbstractBaseController } else { // The media object already has an image. Show this custom one in preference. $gedcom = '0 @' . $media_object->xref() . "@ OBJE\n" . $gedcom; - foreach ($media_object->getFacts() as $fact) { + foreach ($media_object->facts() as $fact) { $gedcom .= "\n" . $fact->gedcom(); } $media_object->updateRecord($gedcom, true); @@ -758,13 +758,13 @@ class AdminController extends AbstractBaseController $facts1 = []; $facts2 = []; - foreach ($record1->getFacts() as $fact) { + foreach ($record1->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts1[$fact->id()] = $fact; } } - foreach ($record2->getFacts() as $fact) { + foreach ($record2->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts2[$fact->id()] = $fact; } @@ -812,13 +812,13 @@ class AdminController extends AbstractBaseController $facts1 = []; $facts2 = []; - foreach ($record1->getFacts() as $fact) { + foreach ($record1->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts1[$fact->id()] = $fact; } } - foreach ($record2->getFacts() as $fact) { + foreach ($record2->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts2[$fact->id()] = $fact; } diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index 3a71cab1f6..3df65a2470 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -1685,7 +1685,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Individual::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1705,7 +1705,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Family::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1744,7 +1744,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Individual::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1766,7 +1766,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Family::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); diff --git a/app/Http/Controllers/AncestorsChartController.php b/app/Http/Controllers/AncestorsChartController.php index 9f2e0c291f..4b66c8b08d 100644 --- a/app/Http/Controllers/AncestorsChartController.php +++ b/app/Http/Controllers/AncestorsChartController.php @@ -198,7 +198,7 @@ class AncestorsChartController extends AbstractChartController echo ' ', I18N::number($sosa * 2), ' ', I18N::translate('and'); echo ' ', I18N::number($sosa * 2 + 1), ''; if ($family->canShow()) { - foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR) as $fact) { echo ' ', $fact->summary(), ''; } } diff --git a/app/Http/Controllers/BranchesController.php b/app/Http/Controllers/BranchesController.php index 6ec1ce60b8..74041dbcdd 100644 --- a/app/Http/Controllers/BranchesController.php +++ b/app/Http/Controllers/BranchesController.php @@ -274,7 +274,7 @@ class BranchesController extends AbstractBaseController // If this is not a birth pedigree (e.g. an adoption), highlight it if ($parents) { $pedi = ''; - foreach ($individual->getFacts('FAMC') as $fact) { + foreach ($individual->facts('FAMC') as $fact) { if ($fact->target() === $parents) { $pedi = $fact->attribute('PEDI'); break; diff --git a/app/Http/Controllers/DescendantsChartController.php b/app/Http/Controllers/DescendantsChartController.php index 0a5a4a5abd..677de9dfe8 100644 --- a/app/Http/Controllers/DescendantsChartController.php +++ b/app/Http/Controllers/DescendantsChartController.php @@ -251,7 +251,7 @@ class DescendantsChartController extends AbstractChartController echo ''; echo ''; if ($family->canShow()) { - foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR) as $fact) { echo ' ', $fact->summary(), ''; } } diff --git a/app/Http/Controllers/EditFamilyController.php b/app/Http/Controllers/EditFamilyController.php index 912c294b82..9b24c06096 100644 --- a/app/Http/Controllers/EditFamilyController.php +++ b/app/Http/Controllers/EditFamilyController.php @@ -72,7 +72,7 @@ class EditFamilyController extends AbstractEditController $keep_facts = []; // Split facts into FAMS and other - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { if ($fact->getTag() === 'CHIL') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -166,7 +166,7 @@ class EditFamilyController extends AbstractEditController // Insert new child at the right place $done = false; - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { $old_child = $fact->target(); if ($old_child instanceof Individual && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) { // Insert before this child @@ -343,13 +343,13 @@ class EditFamilyController extends AbstractEditController if ($old_father !== $new_father) { if ($old_father) { // Remove old FAMS link - foreach ($old_father->getFacts('FAMS') as $fact) { + foreach ($old_father->facts('FAMS') as $fact) { if ($fact->target() === $family) { $old_father->deleteFact($fact->id(), true); } } // Remove old HUSB link - foreach ($family->getFacts('HUSB|WIFE') as $fact) { + foreach ($family->facts('HUSB|WIFE') as $fact) { if ($fact->target() === $old_father) { $family->deleteFact($fact->id(), true); } @@ -366,13 +366,13 @@ class EditFamilyController extends AbstractEditController if ($old_mother !== $new_mother) { if ($old_mother) { // Remove old FAMS link - foreach ($old_mother->getFacts('FAMS') as $fact) { + foreach ($old_mother->facts('FAMS') as $fact) { if ($fact->target() === $family) { $old_mother->deleteFact($fact->id(), true); } } // Remove old WIFE link - foreach ($family->getFacts('HUSB|WIFE') as $fact) { + foreach ($family->facts('HUSB|WIFE') as $fact) { if ($fact->target() === $old_mother) { $family->deleteFact($fact->id(), true); } @@ -389,13 +389,13 @@ class EditFamilyController extends AbstractEditController foreach ($old_children as $old_child) { if ($old_child && !in_array($old_child, $new_children)) { // Remove old FAMC link - foreach ($old_child->getFacts('FAMC') as $fact) { + foreach ($old_child->facts('FAMC') as $fact) { if ($fact->target() === $family) { $old_child->deleteFact($fact->id(), true); } } // Remove old CHIL link - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { if ($fact->target() === $old_child) { $family->deleteFact($fact->id(), true); } diff --git a/app/Http/Controllers/EditGedcomRecordController.php b/app/Http/Controllers/EditGedcomRecordController.php index da2ee31527..f69d5632c0 100644 --- a/app/Http/Controllers/EditGedcomRecordController.php +++ b/app/Http/Controllers/EditGedcomRecordController.php @@ -57,7 +57,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() == $fact_id) { switch ($fact->getTag()) { case 'NOTE': @@ -108,7 +108,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() == $fact_id && $fact->canShow() && $fact->canEdit()) { $record->deleteFact($fact_id, true); break; @@ -216,7 +216,7 @@ class EditGedcomRecordController extends AbstractEditController $title = I18N::translate('Edit the raw GEDCOM') . ' - ' . $record->getFullName(); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->id() === $fact_id) { return $this->viewResponse('edit/raw-gedcom-fact', [ 'pattern' => self::GEDCOM_FACT_REGEX, @@ -249,7 +249,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->id() === $fact_id && $fact->canEdit()) { $record->updateFact($fact_id, $gedcom, false); break; @@ -299,7 +299,7 @@ class EditGedcomRecordController extends AbstractEditController $gedcom = '0 @' . $record->xref() . '@ ' . $record::RECORD_TYPE; // Retain any private facts - foreach ($record->getFacts('', false, Auth::PRIV_HIDE) as $fact) { + foreach ($record->facts('', false, Auth::PRIV_HIDE) as $fact) { if (!in_array($fact->id(), $fact_ids) && !$fact->isPendingDeletion()) { $gedcom .= "\n" . $fact->gedcom(); } @@ -358,7 +358,7 @@ class EditGedcomRecordController extends AbstractEditController // Find the fact to edit $edit_fact = null; - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() === $fact_id && $fact->canEdit()) { $edit_fact = $fact; break; diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php index ecfde6a07a..9cabe04ace 100644 --- a/app/Http/Controllers/EditIndividualController.php +++ b/app/Http/Controllers/EditIndividualController.php @@ -72,7 +72,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into OBJE and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'OBJE') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -133,7 +133,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into NAME and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'NAME') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -194,7 +194,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into FAMS and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'FAMS') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -586,7 +586,7 @@ class EditIndividualController extends AbstractEditController $this->checkIndividualAccess($individual, true); // Find the fact to edit - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->id() === $fact_id && $fact->canEdit()) { return $this->viewResponse('edit/new-individual', [ 'tree' => $tree, @@ -713,7 +713,7 @@ class EditIndividualController extends AbstractEditController // Replace any existing child->family link (we may be changing the PEDI); $fact_id = ''; - foreach ($individual->getFacts('FAMC') as $fact) { + foreach ($individual->facts('FAMC') as $fact) { if ($family === $fact->target()) { $fact_id = $fact->id(); break; @@ -725,7 +725,7 @@ class EditIndividualController extends AbstractEditController // Only set the family->child link if it does not already exist $chil_link_exists = false; - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { if ($individual === $fact->target()) { $chil_link_exists = true; break; diff --git a/app/Http/Controllers/FamilyController.php b/app/Http/Controllers/FamilyController.php index f80bbd1b88..942449f0dd 100644 --- a/app/Http/Controllers/FamilyController.php +++ b/app/Http/Controllers/FamilyController.php @@ -44,7 +44,7 @@ class FamilyController extends AbstractBaseController $this->checkFamilyAccess($family, false); return $this->viewResponse('family-page', [ - 'facts' => $family->getFacts('', true), + 'facts' => $family->facts('', true), 'meta_robots' => 'index,follow', 'record' => $family, 'significant' => $this->significant($family), diff --git a/app/Http/Controllers/GedcomRecordController.php b/app/Http/Controllers/GedcomRecordController.php index 82da802ef4..961a3a5030 100644 --- a/app/Http/Controllers/GedcomRecordController.php +++ b/app/Http/Controllers/GedcomRecordController.php @@ -54,7 +54,7 @@ class GedcomRecordController extends AbstractBaseController } return $this->viewResponse('gedcom-record-page', [ - 'facts' => $record->getFacts(), + 'facts' => $record->facts(), 'families' => $record->linkedFamilies($record::RECORD_TYPE), 'individuals' => $record->linkedIndividuals($record::RECORD_TYPE), 'meta_robots' => 'index,follow', diff --git a/app/Http/Controllers/IndividualController.php b/app/Http/Controllers/IndividualController.php index 171c13d36d..8251fe3118 100644 --- a/app/Http/Controllers/IndividualController.php +++ b/app/Http/Controllers/IndividualController.php @@ -105,7 +105,7 @@ class IndividualController extends AbstractBaseController // What images are linked to this individual $individual_media = []; - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { $media_object = $fact->target(); if ($media_object instanceof Media) { $individual_media[] = $media_object->firstImageFile(); @@ -114,12 +114,12 @@ class IndividualController extends AbstractBaseController $individual_media = array_filter($individual_media); $name_records = []; - foreach ($individual->getFacts('NAME') as $n => $name_fact) { + foreach ($individual->facts('NAME') as $n => $name_fact) { $name_records[] = $this->formatNameRecord($tree, $n, $name_fact); } $sex_records = []; - foreach ($individual->getFacts('SEX') as $n => $sex_fact) { + foreach ($individual->facts('SEX') as $n => $sex_fact) { $sex_records[] = $this->formatSexRecord($sex_fact); } @@ -195,9 +195,9 @@ class IndividualController extends AbstractBaseController $this->checkIndividualAccess($individual, false); - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } @@ -226,7 +226,7 @@ class IndividualController extends AbstractBaseController { $count = 0; - foreach ($individual->getFacts($fact_name) as $fact) { + foreach ($individual->facts($fact_name) as $fact) { if (!$fact->isPendingDeletion()) { $count++; } diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 6454f4a080..cc342ebe5a 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -62,7 +62,7 @@ class MediaController extends AbstractBaseController */ private function facts(Media $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); array_filter($facts, function (Fact $fact): bool { return $fact->getTag() !== 'FILE'; diff --git a/app/Http/Controllers/NoteController.php b/app/Http/Controllers/NoteController.php index 8db41e20a2..4161fdb061 100644 --- a/app/Http/Controllers/NoteController.php +++ b/app/Http/Controllers/NoteController.php @@ -65,7 +65,7 @@ class NoteController extends AbstractBaseController private function facts(Note $record): array { $facts = []; - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->getTag() != 'CONT') { $facts[] = $fact; } diff --git a/app/Http/Controllers/RepositoryController.php b/app/Http/Controllers/RepositoryController.php index a36b88b97c..73999a58e1 100644 --- a/app/Http/Controllers/RepositoryController.php +++ b/app/Http/Controllers/RepositoryController.php @@ -59,7 +59,7 @@ class RepositoryController extends AbstractBaseController */ private function facts(Repository $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); usort( $facts, diff --git a/app/Http/Controllers/SourceController.php b/app/Http/Controllers/SourceController.php index 557d30f975..1470f8e454 100644 --- a/app/Http/Controllers/SourceController.php +++ b/app/Http/Controllers/SourceController.php @@ -62,7 +62,7 @@ class SourceController extends AbstractBaseController */ private function facts(Source $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); usort( $facts, diff --git a/app/Http/Controllers/TimelineChartController.php b/app/Http/Controllers/TimelineChartController.php index 50f0d30e5e..1ae3ed54fa 100644 --- a/app/Http/Controllers/TimelineChartController.php +++ b/app/Http/Controllers/TimelineChartController.php @@ -165,9 +165,9 @@ class TimelineChartController extends AbstractChartController $birthdays [$individual->xref()] = max(1, $date->day); } // find all the fact information - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } diff --git a/app/Individual.php b/app/Individual.php index c99846aad4..cafb0279bc 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -183,7 +183,7 @@ class Individual extends GedcomRecord 0 => [$user_individual], 1 => [], ]; - foreach ($user_individual->getFacts('FAM[CS]', false, Auth::PRIV_HIDE) as $fact) { + foreach ($user_individual->facts('FAM[CS]', false, Auth::PRIV_HIDE) as $fact) { $family = $fact->target(); if ($family instanceof Family) { $cache[1][] = $family; @@ -211,7 +211,7 @@ class Individual extends GedcomRecord if ($n % 2 == 0) { // Add FAM->INDI links foreach ($cache[$n - 1] as $family) { - foreach ($family->getFacts('HUSB|WIFE|CHIL', false, Auth::PRIV_HIDE) as $fact) { + foreach ($family->facts('HUSB|WIFE|CHIL', false, Auth::PRIV_HIDE) as $fact) { $individual = $fact->target(); // Don’t backtrack if ($individual instanceof Individual && !in_array($individual, $cache[$n - 2], true)) { @@ -225,7 +225,7 @@ class Individual extends GedcomRecord } else { // Add INDI->FAM links foreach ($cache[$n - 1] as $individual) { - foreach ($individual->getFacts('FAM[CS]', false, Auth::PRIV_HIDE) as $fact) { + foreach ($individual->facts('FAM[CS]', false, Auth::PRIV_HIDE) as $fact) { $family = $fact->target(); // Don’t backtrack if ($family instanceof Family && !in_array($family, $cache[$n - 2], true)) { @@ -254,7 +254,7 @@ class Individual extends GedcomRecord $rec = '0 @' . $this->xref . '@ INDI'; if ($this->tree->getPreference('SHOW_LIVING_NAMES') >= $access_level) { // Show all the NAME tags, including subtags - foreach ($this->getFacts('NAME') as $fact) { + foreach ($this->facts('NAME') as $fact) { $rec .= "\n" . $fact->gedcom(); } } @@ -422,7 +422,7 @@ class Individual extends GedcomRecord */ public function findHighlightedMediaFile() { - foreach ($this->getFacts('OBJE') as $fact) { + foreach ($this->facts('OBJE') as $fact) { $media = $fact->target(); if ($media instanceof Media) { foreach ($media->mediaFiles() as $media_file) { @@ -822,7 +822,7 @@ class Individual extends GedcomRecord $SHOW_PRIVATE_RELATIONSHIPS = (bool) $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS'); $families = []; - foreach ($this->getFacts('FAMS', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { + foreach ($this->facts('FAMS', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { $family = $fact->target(); if ($family instanceof Family && ($SHOW_PRIVATE_RELATIONSHIPS || $family->canShow($access_level))) { $families[] = $family; @@ -888,7 +888,7 @@ class Individual extends GedcomRecord $SHOW_PRIVATE_RELATIONSHIPS = (bool) $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS'); $families = []; - foreach ($this->getFacts('FAMC', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { + foreach ($this->facts('FAMC', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) { $family = $fact->target(); if ($family instanceof Family && ($SHOW_PRIVATE_RELATIONSHIPS || $family->canShow($access_level))) { $families[] = $family; @@ -1317,7 +1317,7 @@ class Individual extends GedcomRecord $this->extractNamesFromFacts( 1, 'NAME', - $this->getFacts( + $this->facts( 'NAME', false, Auth::accessLevel($this->tree), diff --git a/app/Media.php b/app/Media.php index 1105e80fb1..4251492f04 100644 --- a/app/Media.php +++ b/app/Media.php @@ -105,7 +105,7 @@ class Media extends GedcomRecord { $media_files = []; - foreach ($this->getFacts('FILE') as $fact) { + foreach ($this->facts('FILE') as $fact) { $media_files[] = new MediaFile($fact->gedcom(), $this); } diff --git a/app/MediaFile.php b/app/MediaFile.php index c4c89cf741..98e79f4c17 100644 --- a/app/MediaFile.php +++ b/app/MediaFile.php @@ -183,7 +183,7 @@ class MediaFile */ public function isPendingAddition(): bool { - foreach ($this->media->getFacts() as $fact) { + foreach ($this->media->facts() as $fact) { if ($fact->id() === $this->fact_id) { return $fact->isPendingAddition(); } @@ -197,7 +197,7 @@ class MediaFile */ public function isPendingDeletion(): bool { - foreach ($this->media->getFacts() as $fact) { + foreach ($this->media->facts() as $fact) { if ($fact->id() === $this->fact_id) { return $fact->isPendingDeletion(); } diff --git a/app/Module/AlbumModule.php b/app/Module/AlbumModule.php index d0f0b79550..242dfd31e7 100644 --- a/app/Module/AlbumModule.php +++ b/app/Module/AlbumModule.php @@ -112,9 +112,9 @@ class AlbumModule extends AbstractModule implements ModuleTabInterface { if ($this->media_list === null) { // Use facts from this individual and all their spouses - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } @@ -136,7 +136,7 @@ class AlbumModule extends AbstractModule implements ModuleTabInterface $this->media_list = array_unique($this->media_list); // Sort these using _WT_OBJE_SORT $wt_obje_sort = []; - foreach ($individual->getFacts('_WT_OBJE_SORT') as $fact) { + foreach ($individual->facts('_WT_OBJE_SORT') as $fact) { $wt_obje_sort[] = trim($fact->value(), '@'); } usort($this->media_list, function (Media $x, Media $y) use ($wt_obje_sort): int { diff --git a/app/Module/ExtraInformationModule.php b/app/Module/ExtraInformationModule.php index c25a477ec6..752245ea2e 100644 --- a/app/Module/ExtraInformationModule.php +++ b/app/Module/ExtraInformationModule.php @@ -65,7 +65,7 @@ class ExtraInformationModule extends AbstractModule implements ModuleSidebarInte { $indifacts = []; // The individual’s own facts - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if (self::showFact($fact)) { $indifacts[] = $fact; } diff --git a/app/Module/IndividualFactsTabModule.php b/app/Module/IndividualFactsTabModule.php index bcea13632c..c62981b368 100644 --- a/app/Module/IndividualFactsTabModule.php +++ b/app/Module/IndividualFactsTabModule.php @@ -66,7 +66,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf $indifacts = []; // The individual’s own facts - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { switch ($fact->getTag()) { case 'SEX': case 'NAME': @@ -86,7 +86,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf // Add spouse-family facts foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { switch ($fact->getTag()) { case 'SOUR': case 'NOTE': @@ -175,7 +175,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf $facts = []; if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT_SPOU')) { - foreach ($spouse->getFacts(WT_EVENTS_DEAT) as $fact) { + foreach ($spouse->facts(WT_EVENTS_DEAT) as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { // Convert the event to a close relatives event. $rela_fact = clone($fact); @@ -242,7 +242,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf } // add child’s birth if (strpos($SHOW_RELATIVES_EVENTS, '_BIRT' . str_replace('_HSIB', '_SIBL', $option)) !== false) { - foreach ($child->getFacts(WT_EVENTS_BIRT) as $fact) { + foreach ($child->facts(WT_EVENTS_BIRT) as $fact) { // Always show _BIRT_CHIL, even if the dates are not known if ($option == '_CHIL' || self::includeFact($fact, $min_date, $max_date)) { if ($option == '_GCHI' && $relation == 'dau') { @@ -266,7 +266,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf } // add child’s death if (strpos($SHOW_RELATIVES_EVENTS, '_DEAT' . str_replace('_HSIB', '_SIBL', $option)) !== false) { - foreach ($child->getFacts(WT_EVENTS_DEAT) as $fact) { + foreach ($child->facts(WT_EVENTS_DEAT) as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { if ($option == '_GCHI' && $relation == 'dau') { // Convert the event to a close relatives event. @@ -290,7 +290,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf // add child’s marriage if (strstr($SHOW_RELATIVES_EVENTS, '_MARR' . str_replace('_HSIB', '_SIBL', $option))) { foreach ($child->getSpouseFamilies() as $sfamily) { - foreach ($sfamily->getFacts('MARR') as $fact) { + foreach ($sfamily->facts('MARR') as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { if ($option == '_GCHI' && $relation == 'dau') { // Convert the event to a close relatives event. @@ -358,7 +358,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf if (strstr($SHOW_RELATIVES_EVENTS, '_MARR_PARE')) { // add father/mother marriages foreach ($person->getChildFamilies() as $sfamily) { - foreach ($sfamily->getFacts('MARR') as $fact) { + foreach ($sfamily->facts('MARR') as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { // marriage of parents (to each other) $rela_fact = clone($fact); @@ -368,7 +368,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf } } foreach ($person->getChildStepFamilies() as $sfamily) { - foreach ($sfamily->getFacts('MARR') as $fact) { + foreach ($sfamily->facts('MARR') as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { // marriage of a parent (to another spouse) // Convert the event to a close relatives event @@ -384,7 +384,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf foreach ($person->getChildFamilies() as $family) { foreach ($family->getSpouses() as $parent) { if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT' . ($sosa == 1 ? '_PARE' : '_GPAR'))) { - foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) { + foreach ($parent->facts(WT_EVENTS_DEAT) as $fact) { if (self::includeFact($fact, $min_date, $max_date)) { switch ($sosa) { case 1: @@ -466,7 +466,7 @@ class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterf $person->linkedFamilies('_ASSO') ); foreach ($associates as $associate) { - foreach ($associate->getFacts() as $fact) { + foreach ($associate->facts() as $fact) { $arec = $fact->attribute('_ASSO'); if (!$arec) { $arec = $fact->attribute('ASSO'); diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php index 8c4255d90a..220248e70a 100644 --- a/app/Module/InteractiveTree/TreeView.php +++ b/app/Module/InteractiveTree/TreeView.php @@ -152,15 +152,15 @@ class TreeView $hmtl = $this->getThumbnail($individual); $hmtl .= '' . $individual->getFullName() . ' '; - foreach ($individual->getFacts(WT_EVENTS_BIRT, true) as $fact) { + foreach ($individual->facts(WT_EVENTS_BIRT, true) as $fact) { $hmtl .= $fact->summary(); } if ($family) { - foreach ($family->getFacts(WT_EVENTS_MARR, true) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR, true) as $fact) { $hmtl .= $fact->summary(); } } - foreach ($individual->getFacts(WT_EVENTS_DEAT, true) as $fact) { + foreach ($individual->facts(WT_EVENTS_DEAT, true) as $fact) { $hmtl .= $fact->summary(); } diff --git a/app/Module/MediaTabModule.php b/app/Module/MediaTabModule.php index 8e230ecfff..35dcadb2c4 100644 --- a/app/Module/MediaTabModule.php +++ b/app/Module/MediaTabModule.php @@ -82,10 +82,10 @@ class MediaTabModule extends AbstractModule implements ModuleTabInterface private function getFactsWithMedia(Individual $individual): array { if ($this->facts === null) { - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { if ($family->canShow()) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } diff --git a/app/Module/NotesTabModule.php b/app/Module/NotesTabModule.php index 36c280bedf..e8e05dfe89 100644 --- a/app/Module/NotesTabModule.php +++ b/app/Module/NotesTabModule.php @@ -82,10 +82,10 @@ class NotesTabModule extends AbstractModule implements ModuleTabInterface private function getFactsWithNotes(Individual $individual): array { if ($this->facts === null) { - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { if ($family->canShow()) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } diff --git a/app/Module/PlacesModule.php b/app/Module/PlacesModule.php index b5e47cecbb..d7ae6458b0 100644 --- a/app/Module/PlacesModule.php +++ b/app/Module/PlacesModule.php @@ -139,9 +139,9 @@ class PlacesModule extends AbstractModule implements ModuleTabInterface */ private function getPersonalFacts(Individual $individual): array { - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - $facts = array_merge($facts, $family->getFacts()); + $facts = array_merge($facts, $family->facts()); // Add birth of children from this family to the facts array foreach ($family->getChildren() as $child) { $childsBirth = $child->getFirstFact('BIRT'); diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php index 042e0b0e4f..a2014406ab 100644 --- a/app/Module/ResearchTaskModule.php +++ b/app/Module/ResearchTaskModule.php @@ -85,7 +85,7 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface $tasks = []; foreach ($records as $record) { - foreach ($record->getFacts('_TODO') as $task) { + foreach ($record->facts('_TODO') as $task) { $user_name = $task->getAttribute('_WT_USER'); if ($user_name === Auth::user()->getUserName() || empty($user_name) && $show_unassigned || !empty($user_name) && $show_other) { diff --git a/app/Module/SourcesTabModule.php b/app/Module/SourcesTabModule.php index 8f41730745..c3c2d6eed9 100644 --- a/app/Module/SourcesTabModule.php +++ b/app/Module/SourcesTabModule.php @@ -82,10 +82,10 @@ class SourcesTabModule extends AbstractModule implements ModuleTabInterface private function getFactsWithSources(Individual $individual): array { if ($this->facts === null) { - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { if ($family->canShow()) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php index 3b41d54e76..3eee391d0e 100644 --- a/app/Report/ReportParserGenerate.php +++ b/app/Report/ReportParserGenerate.php @@ -1295,7 +1295,7 @@ class ReportParserGenerate extends ReportParserBase $record = GedcomRecord::getInstance($id, $this->tree); if (empty($attrs['diff']) && !empty($id)) { - $facts = $record->getFacts(); + $facts = $record->facts(); Functions::sortFacts($facts); $this->repeats = []; $nonfacts = explode(',', $tag); @@ -1305,7 +1305,7 @@ class ReportParserGenerate extends ReportParserBase } } } else { - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->isPendingAddition() && $fact->getTag() !== 'CHAN') { $this->repeats[] = $fact->gedcom(); } diff --git a/app/Repository.php b/app/Repository.php index cbf183fb0a..c9f8b1b77e 100644 --- a/app/Repository.php +++ b/app/Repository.php @@ -86,6 +86,6 @@ class Repository extends GedcomRecord */ public function extractNames() { - parent::extractNamesFromFacts(1, 'NAME', $this->getFacts('NAME')); + parent::extractNamesFromFacts(1, 'NAME', $this->facts('NAME')); } } diff --git a/app/Services/CalendarService.php b/app/Services/CalendarService.php index a854b48165..95d70d116b 100644 --- a/app/Services/CalendarService.php +++ b/app/Services/CalendarService.php @@ -120,7 +120,7 @@ class CalendarService $record = Family::getInstance($row->xref, $tree, $row->gedcom); } $anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { // For date ranges, we need a match on either the start/end. if (($fact->date()->minimumJulianDay() === $anniv_date->minimumJulianDay() || $fact->date()->maximumJulianDay() == $anniv_date->maximumJulianDay()) && $fact->getTag() === $row->d_fact) { $fact->anniv = 0; @@ -379,7 +379,7 @@ class CalendarService $record = Family::getInstance($row->xref, $tree, $row->gedcom); } $anniv_date = new Date($row->d_type . ' ' . $row->d_day . ' ' . $row->d_month . ' ' . $row->d_year); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if (($fact->date()->minimumJulianDay() === $anniv_date->minimumJulianDay() || $fact->date()->maximumJulianDay() === $anniv_date->maximumJulianDay()) && $fact->getTag() === $row->d_fact) { $fact->anniv = $row->d_year === '0' ? 0 : $anniv->year - $row->d_year; $fact->jd = $jd; diff --git a/app/Source.php b/app/Source.php index 54b27deb19..5c56844f87 100644 --- a/app/Source.php +++ b/app/Source.php @@ -108,6 +108,6 @@ class Source extends GedcomRecord */ public function extractNames() { - parent::extractNamesFromFacts(1, 'TITL', $this->getFacts('TITL')); + parent::extractNamesFromFacts(1, 'TITL', $this->facts('TITL')); } } diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index fb5614c1a6..8d9d25f81c 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -905,13 +905,13 @@ abstract class AbstractTheme public function individualBoxLdsSummary(Individual $individual) { if ($individual->tree()->getPreference('SHOW_LDS_AT_GLANCE')) { - $BAPL = $individual->getFacts('BAPL') ? 'B' : '_'; - $ENDL = $individual->getFacts('ENDL') ? 'E' : '_'; - $SLGC = $individual->getFacts('SLGC') ? 'C' : '_'; + $BAPL = $individual->facts('BAPL') ? 'B' : '_'; + $ENDL = $individual->facts('ENDL') ? 'E' : '_'; + $SLGC = $individual->facts('SLGC') ? 'C' : '_'; $SLGS = '_'; foreach ($individual->getSpouseFamilies() as $family) { - if ($family->getFacts('SLGS')) { + if ($family->facts('SLGS')) { $SLGS = ''; } } diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml index c09dd9e59c..c0717daa0f 100644 --- a/resources/views/edit/raw-gedcom-record.phtml +++ b/resources/views/edit/raw-gedcom-record.phtml @@ -26,7 +26,7 @@
- getFacts() as $fact) : ?> + facts() as $fact) : ?> isPendingDeletion()) : ?>