fisharebest / webtrees

app/Http/Controllers/RelationshipsChartController.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
 		$recursion = (int) $request->get('recursion', '0');
 		$ancestors = (bool) $request->get('ancestors', '0');
 
-		$max_recursion  = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
+		$max_recursion = (int) $tree->getPreference('RELATIONSHIP_RECURSION', RelationshipsChartModule::DEFAULT_RECURSION);
 
 		$recursion = min($recursion, $max_recursion);
 
@@ -153,14 +153,14 @@ 
 							case 'sis':
 							case 'sib':
 								$table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center;  width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . FontAwesome::decorativeIcon('arrow-end') . '</div></div>';
-								$x                 += 2;
+								$x += 2;
 								break;
 							case 'son':
 							case 'dau':
 							case 'chi':
 								if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) {
 									$table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y - 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
@@ -172,7 +172,7 @@ 
 							case 'par':
 								if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) {
 									$table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . FontAwesome::decorativeIcon('arrow-down') . '</div></div>';
-									$x                     += 2;
+									$x += 2;
 								} else {
 									$table[$x][$y + 1] = '<div style="background:url(' . Theme::theme()
 											->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . FontAwesome::decorativeIcon('arrow-up') . '</div></div>';

app/FactLocation.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 

resources/views/modules/openstreetmap/event-sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -9,14 +9,14 @@
     </a>
 <?php endif ?>
 
-<?php if($value): ?>
+<?php if ($value): ?>
     <span>
         <?= $value ?>
     </span>
 <?php endif ?>
 
 <div>
-    <?php if($addtag): ?>
+    <?php if ($addtag): ?>
         <?= GedcomTag::getLabel('BIRT') ?>:
     <?php endif ?>
     <?= $date ?>

resources/views/modules/openstreetmap/admin-places.php

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 </div>
 <form method="POST"
 	  action="<?=e(route('admin-module',
-		  ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
+			['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
 
 	<?= csrf_field() ?>
 	<?= Bootstrap4::checkbox(
@@ -54,12 +54,12 @@ 
 		<tr>
             <td>
                 <a href="<?= e(route('admin-module',
-					   ['module' => $module,
-					    'action' => 'AdminPlaces',
-					    'parent_id' => $place->pl_id,
-					    'inactive' => $inactive]
-				   )
-				   ) ?>">
+						 ['module' => $module,
+							'action' => 'AdminPlaces',
+							'parent_id' => $place->pl_id,
+							'inactive' => $inactive]
+					 )
+					 ) ?>">
 					<?= e($place->pl_place) ?>
                     <span class="badge badge-pill badge-<?= $place->badge ?>">
 				        <?= I18N::number($place->child_count) ?>
@@ -68,11 +68,11 @@ 
             </td>
 			<td>
 				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+										strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+										strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

Spacing +3 added lines, -5 removed lines

@@ -67,12 +67,10 @@ 
                 </a>
             </td>
 			<td>
-				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
-				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>
@@ -194,7 +192,7 @@ 
 	</tfoot>
 </table>
 
-<form method="POST" action="<?= e(route('admin-module',[
+<form method="POST" action="<?= e(route('admin-module', [
 		'module' => $module,
 		'action' => 'AdminImportPlaces'
 	])) ?>">

resources/views/media-page.php

Spacing +2 added lines, -2 removed lines

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

app/Location.php

Spacing +6 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 
@@ -30,14 +30,14 @@ 
 	 * @param array $record
 	 * @throws \Exception
 	 */
-	public function __construct($gedcomName, $record=[]) {
+	public function __construct($gedcomName, $record = []) {
 		$tmp = $this->getRecordFromName($gedcomName);
 		if ($tmp !== null) {
 			$this->record = $tmp;
 		} elseif (!empty($record)) {
-			$this->record = (object)$record;
+			$this->record = (object) $record;
 		} else {
-			$this->record = (object)[
+			$this->record = (object) [
 				'fqpn'         => '',
 				'pl_id'        => 0,
 				'pl_parent_id' => 0,
@@ -67,8 +67,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_lati ?
-					(float)strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) :
-					$this->record->pl_lati;
+					(float) strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) : $this->record->pl_lati;
 			default:
 				return $this->record->pl_lati;
 		}
@@ -83,8 +82,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_long ?
-					(float)strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) :
-					$this->record->pl_long;
+					(float) strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) : $this->record->pl_long;
 			default:
 				return $this->record->pl_long;
 		}

resources/views/tables/surnames.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>

app/Http/Controllers/SearchController.php

Spacing +39 added lines, -39 removed lines

@@ -603,7 +603,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -650,7 +650,7 @@ 
 	 * @return Family[]
 	 */
 	private function searchFamilyNames(array $search_terms, array $search_trees): array {
-		$sql  =
+		$sql =
 			"SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
 			" FROM `##families`" .
 			" LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -659,7 +659,7 @@ 
 		$args = [];
 
 		foreach ($search_terms as $n => $q) {
-			$sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+			$sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
 			$args['husb_collate_' . $n] = I18N::collation();
 			$args['husb_query_' . $n]   = Database::escapeLike($q);
 			$args['wife_collate_' . $n] = I18N::collation();
@@ -710,7 +710,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -855,7 +855,7 @@ 
 		}
 
 		// Add the where clause
-		$sql    .= " WHERE ind.i_file=?";
+		$sql .= " WHERE ind.i_file=?";
 		$bind[] = $this->tree()->getTreeId();
 
 		foreach ($fields as $field_name => $field_value) {
@@ -866,15 +866,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_givn=?";
+								$sql .= " AND i_n.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -888,7 +888,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -904,7 +904,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -913,15 +913,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_surname=?";
+								$sql .= " AND i_n.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -935,7 +935,7 @@ 
 									$sql .= " AND (" . implode(' OR ', $sdx) . ")";
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -952,7 +952,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -961,7 +961,7 @@ 
 					case '_MARNM':
 					case '_HEB':
 					case '_AKA':
-						$sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+						$sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
 						$bind[] = $parts[1];
 						$bind[] = $field_value;
 						break;
@@ -971,7 +971,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * ($modifiers[$field_name] ?? 0);
-					$sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+					$sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
 					$bind[] = $parts[0];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -981,7 +981,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * $modifiers[$field_name];
-					$sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+					$sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
 					$bind[] = $parts[1];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -989,12 +989,12 @@ 
 			} elseif ($parts[1] === 'PLAC') {
 				// *:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
 				// FAMS:*:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
 				$table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -1003,15 +1003,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_givn=?";
+								$sql .= " AND {$table}.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1025,7 +1025,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1042,7 +1042,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -1050,15 +1050,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_surname=?";
+								$sql .= " AND {$table}.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1072,7 +1072,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1088,7 +1088,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1097,17 +1097,17 @@ 
 				}
 			} elseif ($parts[0] === 'FAMS') {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[1];
 				$bind[] = $field_value;
 			} elseif ($parts[1] === 'TYPE') {
 				// e.g. FACT:TYPE or EVEN:TYPE
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			} else {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			}
@@ -1185,7 +1185,7 @@ 
 		$sql .= ")";
 
 		if ($givn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$givn_sdx = explode(':', $givn_sdx);
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n > 0 ? " OR " : "";
@@ -1203,7 +1203,7 @@ 
 		}
 
 		if ($surn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$surn_sdx = explode(':', $surn_sdx);
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1221,7 +1221,7 @@ 
 		}
 
 		if ($plac_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$plac_sdx = explode(':', $plac_sdx);
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1267,7 +1267,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1322,7 +1322,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1377,7 +1377,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}

app/Http/Controllers/PlaceHierarchyController.php

Spacing +7 added lines, -7 removed lines

@@ -50,14 +50,14 @@ 
 		$osm_module = Module::getModuleByName(self::MAP_MODULE);
 		$method     = 'assets';
 		$showmap    = $osm_module &&
-			(bool)$osm_module->getPreference('place_hierarchy') &&
+			(bool) $osm_module->getPreference('place_hierarchy') &&
 			method_exists($osm_module, $method) &&
 			strpos($action, 'hierarchy') === 0;
 		$data       = null;
 		$note       = false;
 
 		if ($showmap) {
-			$note    = true;
+			$note = true;
 			$content .= view('modules/openstreetmap/map',
 				[
 					'assets' => $osm_module->$method(),
@@ -70,14 +70,14 @@ 
 
 		switch ($action) {
 			case 'list':
-				$nextaction      = ['hierarchy' => I18N::translate('Show place hierarchy')];
-				$content         .= view('place-list', $this->getList($tree));
+				$nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')];
+				$content .= view('place-list', $this->getList($tree));
 				break;
 			case 'hierarchy':
 			case 'hierarchy-e':
 				$nextaction      = ['list' => I18N::translate('Show all places in a list')];
 				$data            = $this->getHierarchy($tree, $place, $parent);
-				$content         .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
+				$content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
 				if (null === $data || $action === 'hierarchy-e') {
 					$content .= view('place-events', $this->getEvents($tree, $place));
 				}
@@ -117,7 +117,7 @@ 
 
 		return
 			[
-				'columns' => array_chunk($list_places, (int)ceil($numfound / $divisor)),
+				'columns' => array_chunk($list_places, (int) ceil($numfound / $divisor)),
 			];
 	}
 
@@ -139,7 +139,7 @@ 
 				[
 					'tree'      => $tree,
 					'col_class' => "w-" . ($divisor === 2 ? "25" : "50"),
-					'columns'   => array_chunk($child_places, (int)ceil($numfound / $divisor)),
+					'columns'   => array_chunk($child_places, (int) ceil($numfound / $divisor)),
 					'place'     => $place,
 					'parent'    => $parent,
 				];