fisharebest / webtrees

app/Http/Controllers/DescendantsChartController.php

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
 
 		$this->checkModuleIsActive($tree, 'descendancy_chart');
 
-		$xref         = $request->get('xref');
+		$xref = $request->get('xref');
 		$individual = Individual::getInstance($xref, $tree);
 
 		$this->checkIndividualAccess($individual);
@@ -118,7 +118,7 @@ 
 
 		$descendants = $this->descendants($individual, $generations, []);
 
-		switch($chart_style) {
+		switch ($chart_style) {
 			case self::CHART_STYLE_LIST:
 			default:
 				return $this->descendantsList($individual, $generations);
@@ -315,7 +315,7 @@ 
 	 * @return Response
 	 */
 	private function descendantsFamilies(Tree $tree, array $descendants): Response {
-		$families  = [];
+		$families = [];
 		foreach ($descendants as $individual) {
 			foreach ($individual->getChildFamilies() as $family) {
 				$families[$family->getXref()] = $family;

resources/views/lists/notes-table.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $count_media       = Database::prepare(
 	"SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
-$count_sources       = Database::prepare(
+$count_sources = Database::prepare(
 	"SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 ?>

resources/views/lists/chart-by-decade.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 }
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
 $chart_url .= '|2:||';
-$step      = $vmax;
+$step = $vmax;
 for ($d = $vmax; $d > 0; $d--) {
 	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
 		$step = $d;

resources/views/lists/surnames-table.php

Spacing +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
 					<?php endforeach ?>
 				</td>
 
-				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>">
+				<td class="text-center" data-sort="<?= array_sum(array_map(function (array $x) { return count($x); }, $surns)) ?>">
 					<?php foreach ($surns as $indis): ?>
 						<?= I18N::number(count($indis)) ?>
 						<br>
 					<?php endforeach ?>
 
 					<?php if (count($surns) > 1): ?>
-						<?= I18N::number(array_sum(array_map(function(array $x) { return count($x); }, $surns))) ?>
+						<?= I18N::number(array_sum(array_map(function (array $x) { return count($x); }, $surns))) ?>
 					<?php endif ?>
 				</td>
 			</tr>

Braces +5 added lines, -2 removed lines

@@ -12,7 +12,8 @@ 
 			<th>
 				<?php if ($route == 'family-list'):?>
 					<?= I18N::translate('Spouses') ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= I18N::translate('Individuals') ?>
 				<?php endif ?>
 			</th>
@@ -43,7 +44,9 @@ 
 					<?php endforeach ?>
 				</td>
 
-				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>">
+				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x);
+}
+}, $surns)) ?>">
 					<?php foreach ($surns as $indis): ?>
 						<?= I18N::number(count($indis)) ?>
 						<br>

resources/views/lists/individuals-table.php

Braces +5 added lines, -2 removed lines

@@ -319,8 +319,11 @@
 					<?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age): ?>
 						<?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?>
 					<?php endif ?>
-				<?php else: ?>
-					<?php $age_at_death = ''; ?>
+				<?php else {
+	: ?>
+					<?php $age_at_death = '';
+}
+?>
 					<?php $age_at_death_sort = PHP_INT_MAX; ?>
 				<?php endif ?>
 				<td class="center" data-sort="<?= e($age_at_death_sort) ?>">

placelist.php

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,8 @@ 
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
 						<p><?= I18N::translate('No results found.') ?></p>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= view('lists/individuals-table', ['individuals' => $myindilist, 'sosa' => false, 'tree' => $WT_TREE]) ?>
 				<?php endif ?>
 			</div>
@@ -216,6 +217,7 @@ 
 		<?php
 		}
 		echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+}
 
 		if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
 			$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);

resources/views/source-page.php

Spacing +2 added lines, -2 removed lines

@@ -8,13 +8,13 @@
 
 <?php if ($source->isPendingDeletion()): ?>
 	<?php if (Auth::isModerator($source->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($source->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>
 <?php elseif ($source->isPendingAddition()): ?>
 	<?php if (Auth::isModerator($source->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($source->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>

app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	 */
 	public function updateRecord(GedcomRecord $record): string {
 		$old_gedcom = $record->getGedcom();
-		$tree   = $record->getTree();
+		$tree = $record->getTree();
 
 		$SURNAME_TRADITION = $tree->getPreference('SURNAME_TRADITION');
 

app/Module/InteractiveTreeModule.php

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$q  = $request->get('q');
+		$q = $request->get('q');
 		$instance = $request->get('instance');
 		$treeview = new TreeView($instance);