Completed
Pull Request — master (#1439)
by Rico
08:52
created
placelist.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,8 @@  discard block
 block discarded – undo
200 200
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
201 201
 				<?php if (empty($myindilist)): ?>
202 202
 					<p><?= I18N::translate('No results found.') ?></p>
203
-				<?php else: ?>
203
+				<?php else {
204
+	: ?>
204 205
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
205 206
 				<?php endif ?>
206 207
 			</div>
@@ -216,6 +217,7 @@  discard block
 block discarded – undo
216 217
 		<?php
217 218
 	}
218 219
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
220
+}
219 221
 
220 222
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
221 223
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);
Please login to merge, or discard this patch.
admin_trees_config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1505,7 +1505,7 @@
 block discarded – undo
1505 1505
 						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
1506 1506
 						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
1507 1507
 					], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
1508
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1508
+					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1509 1509
 				) ?>
1510 1510
 				<p class="small text-muted">
1511 1511
 					<?= /* 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>.') ?>
Please login to merge, or discard this patch.
app/Module.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 					}
136 136
 				} catch (\Exception $ex) {
137 137
 					// The module has been deleted or is broken? Disable it.
138
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
138
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
139 139
 					Database::prepare(
140 140
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
141 141
 					)->execute([
Please login to merge, or discard this patch.
relationship.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,8 @@  discard block
 block discarded – undo
82 82
 				<?php if ($ancestors_only === '1'): ?>
83 83
 					<input type="hidden" name="ancestors" value="1">
84 84
 					<?= I18N::translate('Find relationships via ancestors') ?>
85
-				<?php else: ?>
85
+				<?php else {
86
+	: ?>
86 87
 					<?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?>
87 88
 			<?php endif ?>
88 89
 			</div>
@@ -115,6 +116,7 @@  discard block
 block discarded – undo
115 116
 if ($person1 && $person2) {
116 117
 	if (I18N::direction() === 'ltr') {
117 118
 		$diagonal1        = Theme::theme()->parameter('image-dline');
119
+}
118 120
 		$diagonal2        = Theme::theme()->parameter('image-dline2');
119 121
 	} else {
120 122
 		$diagonal1        = Theme::theme()->parameter('image-dline2');
Please login to merge, or discard this patch.
app/Controller/IndividualController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	public function getTabs() {
97 97
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
98 98
 
99
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
99
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
100 100
 	}
101 101
 
102 102
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
 		if ($n === 0) {
143 143
 			$content_class = 'collapse show';
144
-			$aria  = 'true';
144
+			$aria = 'true';
145 145
 		}
146 146
 		if ($fact->isPendingDeletion()) {
147 147
 			$container_class .= ' old';
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 		}
244 244
 
245 245
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
246
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
246
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
247 247
 
248 248
 		} else {
249 249
 			$edit_links = '';
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 		<div class="' . $container_class . '">
254 254
 			<div class="card-header" role="tab" id="name-header-add">
255 255
 				<div class="card-title mb-0">
256
-					<b>' . I18N::translate('Gender') . '</b> ' .  $sex . $edit_links . '
256
+					<b>' . I18N::translate('Gender') . '</b> ' . $sex . $edit_links . '
257 257
 				</div>
258 258
 			</div>
259 259
 		</div>';
Please login to merge, or discard this patch.
app/Select2.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 
177 177
 		$flag_files = [];
178 178
 		foreach ($it as $file) {
179
-			$file_path = substr($file->getPathname() , strlen($directory));
179
+			$file_path = substr($file->getPathname(), strlen($directory));
180 180
 			if ($file->getExtension() === 'png' && stripos($file_path, $query) !== false) {
181 181
 				if ($offset > 0) {
182 182
 					// Skip results
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 			if ($place_name === $query) {
454 454
 				$found = true;
455 455
 			}
456
-			$results[]  = [
456
+			$results[] = [
457 457
 				'id'   => $place_name,
458 458
 				'text' => $place_name,
459 459
 			];
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
 					if ($place_name === $query) {
489 489
 						$found = true;
490 490
 					}
491
-					$results[]  = [
491
+					$results[] = [
492 492
 						'id'   => $place_name,
493 493
 						'text' => $place_name,
494 494
 					];
Please login to merge, or discard this patch.
app/Filter.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -334,7 +334,7 @@
 block discarded – undo
334 334
 	 * @param string|null $regexp
335 335
 	 * @param string      $default
336 336
 	 *
337
-	 * @return string[]|string[][]
337
+	 * @return string[]
338 338
 	 */
339 339
 	public static function postArray($variable, $regexp = null, $default = '') {
340 340
 		return self::inputArray(INPUT_POST, $variable, $regexp, $default);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,6 @@
 block discarded – undo
17 17
 
18 18
 use Fisharebest\Webtrees\CommonMark\CensusTableExtension;
19 19
 use Fisharebest\Webtrees\CommonMark\XrefExtension;
20
-use Fisharebest\Webtrees\CommonMark\XrefParser;
21 20
 use League\CommonMark\Block\Renderer\DocumentRenderer;
22 21
 use League\CommonMark\Block\Renderer\ParagraphRenderer;
23 22
 use League\CommonMark\Converter;
Please login to merge, or discard this patch.
app/Census/CensusColumnAgeFemale5Years.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 				$years -= $years % 5;
41 41
 			}
42 42
 
43
-			return (string)$years;
43
+			return (string) $years;
44 44
 		}
45 45
 	}
46 46
 }
Please login to merge, or discard this patch.
app/Census/CensusColumnYearsMarried.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 		if ($marriage_date === null) {
46 46
 			return '';
47 47
 		} else {
48
-			return (string)Date::getAge($marriage_date, $this->date(), 0);
48
+			return (string) Date::getAge($marriage_date, $this->date(), 0);
49 49
 		}
50 50
 	}
51 51
 }
Please login to merge, or discard this patch.