@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Get the male (or first female) partner of the family |
103 | 103 | * |
104 | - * @param $access_level int|null |
|
104 | + * @param integer $access_level int|null |
|
105 | 105 | * |
106 | 106 | * @return Individual|null |
107 | 107 | */ |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Get the female (or second male) partner of the family |
120 | 120 | * |
121 | - * @param $access_level int|null |
|
121 | + * @param integer $access_level int|null |
|
122 | 122 | * |
123 | 123 | * @return Individual|null |
124 | 124 | */ |
@@ -388,7 +388,7 @@ |
||
388 | 388 | * (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N" |
389 | 389 | * (c) Level 2 or higher object with the Highlight option set to "Y" |
390 | 390 | * |
391 | - * @return null|Media |
|
391 | + * @return GedcomRecord|null |
|
392 | 392 | */ |
393 | 393 | public function findHighlightedMedia() { |
394 | 394 | $objectA = null; |
@@ -142,7 +142,7 @@ |
||
142 | 142 | * |
143 | 143 | * @param int $fetch_style |
144 | 144 | * |
145 | - * @return \stdClass|array|null |
|
145 | + * @return \stdClass |
|
146 | 146 | */ |
147 | 147 | public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) { |
148 | 148 | if (!$this->executed) { |
@@ -16,8 +16,8 @@ |
||
16 | 16 | namespace Fisharebest\Webtrees; |
17 | 17 | |
18 | 18 | use Exception; |
19 | -use Swift_Mailer; |
|
20 | 19 | use Swift_MailTransport; |
20 | +use Swift_Mailer; |
|
21 | 21 | use Swift_Message; |
22 | 22 | use Swift_NullTransport; |
23 | 23 | use Swift_SmtpTransport; |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @param string $xref2 |
160 | 160 | * @param int $tree_id |
161 | 161 | * |
162 | - * @return array |
|
162 | + * @return string[] |
|
163 | 163 | */ |
164 | 164 | private function allAncestors($xref1, $xref2, $tree_id) { |
165 | 165 | $ancestors = array($xref1, $xref2); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | * @param string $xref2 |
199 | 199 | * @param int $tree_id |
200 | 200 | * |
201 | - * @return array |
|
201 | + * @return string[] |
|
202 | 202 | */ |
203 | 203 | private function excludeFamilies($xref1, $xref2, $tree_id) { |
204 | 204 | return Database::prepare( |
@@ -181,6 +181,7 @@ |
||
181 | 181 | /** |
182 | 182 | * A list of GEDCOM relationships (e.g. for an edit control). |
183 | 183 | * |
184 | + * @param string $relationship |
|
184 | 185 | * @return string[] |
185 | 186 | */ |
186 | 187 | public static function optionsRelationships($relationship) { |
@@ -641,7 +641,7 @@ |
||
641 | 641 | } elseif ($fact === 'REPO') { |
642 | 642 | echo |
643 | 643 | '<div class="input-group">' . |
644 | - '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) . |
|
644 | + '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) . |
|
645 | 645 | '</div>'; |
646 | 646 | } elseif ($fact === 'RESN') { |
647 | 647 | echo Bootstrap4::select(FunctionsEdit::optionsRestrictions(true), $value, ['id' => $element_id, 'name' => $element_name]); |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Fisharebest\Webtrees\Database; |
20 | 20 | use Fisharebest\Webtrees\Filter; |
21 | 21 | use Fisharebest\Webtrees\Functions\FunctionsDate; |
22 | -use Fisharebest\Webtrees\Functions\FunctionsPrint; |
|
23 | 22 | use Fisharebest\Webtrees\I18N; |
24 | 23 | use Fisharebest\Webtrees\Theme; |
25 | 24 |
@@ -109,7 +109,7 @@ |
||
109 | 109 | </option> |
110 | 110 | </select> |
111 | 111 | </td> |
112 | - <?php else: ?> |
|
112 | + <?php else : ?> |
|
113 | 113 | <td class="descriptionbox wrap"></td> |
114 | 114 | <td class="optionbox wrap"></td> |
115 | 115 | <?php endif ?> |
@@ -109,7 +109,8 @@ discard block |
||
109 | 109 | </option> |
110 | 110 | </select> |
111 | 111 | </td> |
112 | - <?php else: ?> |
|
112 | + <?php else { |
|
113 | + : ?> |
|
113 | 114 | <td class="descriptionbox wrap"></td> |
114 | 115 | <td class="optionbox wrap"></td> |
115 | 116 | <?php endif ?> |
@@ -133,6 +134,7 @@ discard block |
||
133 | 134 | <?php |
134 | 135 | foreach (['10', '20', '30', '40', '50', '75', '100', '125', '150', '200'] as $selectEntry) { |
135 | 136 | echo '<option value="', $selectEntry, '" '; |
137 | +} |
|
136 | 138 | if ($selectEntry == $max) { |
137 | 139 | echo 'selected'; |
138 | 140 | } |
@@ -519,7 +519,8 @@ discard block |
||
519 | 519 | <div class="bg-danger text-danger"> |
520 | 520 | <?= $resn->xref ?> — <?= I18N::translate('this record does not exist') ?> |
521 | 521 | </div> |
522 | - <?php else: ?> |
|
522 | + <?php else { |
|
523 | + : ?> |
|
523 | 524 | <div class="text-muted"> |
524 | 525 | <?= I18N::translate('All records') ?> |
525 | 526 | </div> |
@@ -638,6 +639,7 @@ discard block |
||
638 | 639 | <span class="input-group-addon"> |
639 | 640 | <?php |
640 | 641 | $person = Individual::getInstance($WT_TREE->getPreference('PEDIGREE_ROOT_ID'), $WT_TREE); |
642 | +} |
|
641 | 643 | if ($person) { |
642 | 644 | echo $person->getFullName(), ' ', $person->getLifeSpan(); |
643 | 645 | } else { |
@@ -1470,7 +1470,7 @@ |
||
1470 | 1470 | '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'), |
1471 | 1471 | '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'), |
1472 | 1472 | ], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])), |
1473 | - Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
1473 | + Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES']) |
|
1474 | 1474 | ) ?> |
1475 | 1475 | <p class="small text-muted"> |
1476 | 1476 | <?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?> |