fisharebest / webtrees

app/Http/Controllers/ListController.php

Spacing +12 added lines, -12 removed lines

@@ -287,7 +287,7 @@ 
 					}
 					// Don't sublists short lists.
 					if ($count < $tree->getPreference('SUBLIST_TRIGGER_I')) {
-						$falpha              = '';
+						$falpha = '';
 					} else {
 						$givn_initials = $this->givenAlpha($surname, $alpha, $show_marnm === 'yes', $families);
 						// Break long lists by initial letter of given name
@@ -508,7 +508,7 @@ 
 	 */
 	private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array {
 		// All files in the folder, plus external files
-		$sql  =
+		$sql =
 			"SELECT m_id AS xref, m_gedcom AS gedcom" .
 			" FROM `##media`" .
 			" JOIN `##media_file` USING (m_id, m_file)" .
@@ -527,11 +527,11 @@ 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
 			case 'include':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				break;
 			case 'exclude':
-				$sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
+				$sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
 				$args[] = Database::escapeLike($folder);
 				$args[] = Database::escapeLike($folder);
 				break;
@@ -539,13 +539,13 @@ 
 
 		// Apply search terms
 		if ($filter) {
-			$sql    .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
+			$sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
 			$args[] = Database::escapeLike($filter);
 			$args[] = Database::escapeLike($filter);
 		}
 
 		if ($form_type) {
-			$sql    .= " AND source_media_type = ?";
+			$sql .= " AND source_media_type = ?";
 			$args[] = $form_type;
 		}
 
@@ -1457,7 +1457,7 @@ 
 		];
 
 		foreach ($this->getAlphabetForLocale(WT_LOCALE) as $n => $letter) {
-			$sql                   .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
+			$sql .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
 			$args['collate_' . $n] = I18N::collation();
 			$args['letter_' . $n]  = $letter . '%';
 		}
@@ -1542,7 +1542,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1593,7 +1593,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1606,7 +1606,7 @@ 
 			// All surnames
 			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
 		}
-		$sql               .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
+		$sql .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 
@@ -1646,7 +1646,7 @@ 
 		];
 
 		if ($surn) {
-			$sql               .= " AND n_surn COLLATE :collate_1 = :surn";
+			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
 			$args['collate_1'] = I18N::collation();
 			$args['surn']      = $surn;
 		} elseif ($salpha === ',') {
@@ -1663,7 +1663,7 @@ 
 			$sql .= " AND " . $this->getInitialSql('n_givn', $galpha);
 		}
 
-		$sql               .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
+		$sql .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
 		$args['collate_2'] = I18N::collation();
 		$args['collate_3'] = I18N::collation();
 

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-import-form.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 
 <h3><?= $title ?></h3>
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
-    e(route('admin-module',[
+    e(route('admin-module', [
         'module' => $module,
         'action' => 'AdminImport',
     ])) ?>">
@@ -29,7 +29,7 @@ 
 				</div>
 				<select id="serverfile" name="serverfile" class="form-control">
                     <option class='custom-select' selected disabled value=''><?= I18N::translate('choose a file&hellip;') ?></option>
-                    <?php foreach($files as $file): ?>
+                    <?php foreach ($files as $file): ?>
                         <option value="<?= e($file) ?>"><?= $file ?></option>
                     <?php endforeach ?>
 				</select>

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

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;
 		}

app/Module/OpenStreetmapModule.php

Spacing +49 added lines, -49 removed lines

@@ -206,7 +206,7 @@ 
 	 */
 	public function getBaseDataAction(Request $request) {
 		$provider = $this->getMapProviderData($request);
-		$style    = $provider['selectedStyleName']    = '' ? '' : '.' . $provider['selectedStyleName'];
+		$style    = $provider['selectedStyleName'] = '' ? '' : '.' . $provider['selectedStyleName'];
 
 		switch ($provider['selectedProvIndex']) {
 			case 'mapbox':
@@ -293,7 +293,7 @@ 
 						$color            = self::LINE_COLORS[log($id, 2) % $color_count];
 						$icon['color']    = $color; //make icon color the same as the line
 						$sosa_points[$id] = $event->getLatLonJSArray();
-						$sosa_parent      = (int)floor($id / 2);
+						$sosa_parent      = (int) floor($id / 2);
 						if (array_key_exists($sosa_parent, $sosa_points)) {
 							// Would like to use a GeometryCollection to hold LineStrings
 							// rather than generate polylines but the MarkerCluster library
@@ -325,7 +325,7 @@ 
 								'modules/openstreetmap/event-sidebar',
 								$event->shortSummary($mapType, $id)
 							),
-							'zoom' => (int)$event->getZoom(),
+							'zoom' => (int) $event->getZoom(),
 						],
 					];
 				}
@@ -395,7 +395,7 @@ 
 							'stats'    => $placeStats,
 						]
 					),
-					'zoom' => (int)($location->getZoom() ?? 2),
+					'zoom' => (int) ($location->getZoom() ?? 2),
 				],
 			];
 		}
@@ -447,7 +447,7 @@ 
 		$xref        = $request->get('reference');
 		$tree        = $request->attributes->get('tree');
 		$individual  = Individual::getInstance($xref, $tree);
-		$generations = (int)$request->get(
+		$generations = (int) $request->get(
 			'generations',
 			$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS')
 		);
@@ -496,14 +496,14 @@ 
 						function ($item) {
 							return preg_replace('/[^a-z\d]/i', '', strtolower($item));
 						},
-						(array)$provider->styles
+						(array) $provider->styles
 					);
 
-					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string)$provider->name));
+					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string) $provider->name));
 
 					self::$map_providers[$key] = [
-						'name'   => (string)$provider->name,
-						'styles' => array_combine($style_keys, (array)$provider->styles),
+						'name'   => (string) $provider->name,
+						'styles' => array_combine($style_keys, (array) $provider->styles),
 					];
 				}
 			} catch (\Exception $ex) {
@@ -565,7 +565,7 @@ 
 		$maxgenerations = $tree->getPreference('MAX_PEDIGREE_GENERATIONS');
 		$generations    = $request->get('generations', $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS'));
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/pedigreemap',
 			'data' => [
 				'assets' => $this->assets(),
@@ -628,7 +628,7 @@ 
 	 * @return object
 	 */
 	public function getAdminConfigAction(Request $request) {
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-config',
 			'data' => [
 				'title'        => I18N::translate('Open Street Maps (Configuration)'),
@@ -684,8 +684,8 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlacesAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id', 0);
-		$inactive    = (bool)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id', 0);
+		$inactive    = (bool) $request->get('inactive');
 		$hierarchy   = $this->gethierarchy($parent_id);
 		$title       = I18N::translate('Open Street Maps (Geographic data)');
 		$breadcrumbs = [
@@ -708,7 +708,7 @@ 
 		}
 		$breadcrumbs[] = array_pop($breadcrumbs);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-places',
 			'data' => [
 				'title'       => $title,
@@ -729,9 +729,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlaceEditAction(Request $request) {
-		$parent_id = (int)$request->get('parent_id', 0);
-		$place_id  = (int)$request->get('place_id');
-		$inactive  = (int)$request->get('inactive');
+		$parent_id = (int) $request->get('parent_id', 0);
+		$place_id  = (int) $request->get('place_id');
+		$inactive  = (int) $request->get('inactive');
 		$hierarchy = $this->gethierarchy($place_id);
 		$fqpn      = empty($hierarchy) ? '' : $hierarchy[0]->fqpn;
 		$location  = new Location($fqpn);
@@ -767,7 +767,7 @@ 
 		}
 		$breadcrumbs[] = $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit');
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-place-edit',
 			'data' => [
 				'module'      => $this->getName(),
@@ -793,9 +793,9 @@ 
 	 */
 	public function postAdminSaveAction(Request $request) {
 		if (Filter::checkCsrf()) {
-			$parent_id = (int)$request->get('parent_id');
-			$place_id  = (int)$request->get('place_id');
-			$inactive  = (int)$request->get('inactive');
+			$parent_id = (int) $request->get('parent_id');
+			$place_id  = (int) $request->get('place_id');
+			$inactive  = (int) $request->get('inactive');
 			$lat       = round($request->get('new_place_lati'), 5); // 5 decimal places (locate to within about 1 metre)
 			$lat       = ($lat < 0 ? 'S' : 'N') . abs($lat);
 			$lng       = round($request->get('new_place_long'), 5);
@@ -814,7 +814,7 @@ 
 						  VALUES (:id, :parent, :level, :place, :lng, :lat, :zoom, :icon)"
 				)->execute(
 					[
-					'id'     => (int)Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
+					'id'     => (int) Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
 					'parent' => $parent_id,
 					'level'  => $level,
 					'place'  => $request->get('new_place_name'),
@@ -833,7 +833,7 @@ 
 					'place' => $request->get('new_place_name'),
 					'lat'   => $request->get('lati_control') . $lat,
 					'lng'   => $request->get('long_control') . $lng,
-					'zoom'  => (int)$request->get('new_zoom_factor'),
+					'zoom'  => (int) $request->get('new_zoom_factor'),
 					'icon'  => $icon,
 				]
 				);
@@ -866,9 +866,9 @@ 
 	 */
 	public function postAdminDeleteRecordAction(Request $request): RedirectResponse {
 		if (Filter::checkCsrf()) {
-			$place_id  = (int)$request->get('place_id');
-			$parent_id = (int)$request->get('parent_id');
-			$inactive  = (int)$request->get('inactive');
+			$place_id  = (int) $request->get('place_id');
+			$parent_id = (int) $request->get('parent_id');
+			$inactive  = (int) $request->get('inactive');
 
 			try {
 				Database::prepare(
@@ -887,7 +887,7 @@ 
 				);
 			}
 			// If after deleting there are no more places at this level then go up a level
-			$children = (int)Database::prepare(
+			$children = (int) Database::prepare(
 				"SELECT COUNT(pl_id) FROM `##placelocation` WHERE pl_parent_id = :parent_id"
 			)
 				->execute(['parent_id' => $parent_id])
@@ -920,9 +920,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminExportAction(Request $request) {
-		$parent_id = (int)$request->get('parent_id');
+		$parent_id = (int) $request->get('parent_id');
 		$format    = $request->get('format', 'csv');
-		$maxlevel  = (int)Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
+		$maxlevel  = (int) Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
 		$startfqpn = [];
 		$hierarchy = $this->gethierarchy($parent_id);
 		$geojson   = [];
@@ -974,8 +974,8 @@ 
 							)
 						)
 					);
-					$long = (float)strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
-					$lati = (float)strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
+					$long = (float) strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
+					$lati = (float) strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
 
 					$geojson['features'][] = [
 						'type'     => 'Feature',
@@ -1007,8 +1007,8 @@ 
 	}
 
 	public function getAdminImportFormAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id');
-		$inactive    = (int)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id');
+		$inactive    = (int) $request->get('inactive');
 		$breadcrumbs = [
 			route('admin-control-panel') => I18N::translate('Control panel'),
 			route('admin-modules')       => I18N::translate('Module administration'),
@@ -1034,7 +1034,7 @@ 
 			}
 		);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-import-form',
 			'data' => [
 				'title'       => I18N::translate('Import geographic data'),
@@ -1098,8 +1098,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-						(bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-						(bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+						(bool) preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+						(bool) preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}
@@ -1155,7 +1155,7 @@ 
 			}
 
 			if ($filetype !== '?') {
-				if ((bool)$request->get('cleardatabase')) {
+				if ((bool) $request->get('cleardatabase')) {
 					Database::exec("TRUNCATE TABLE `##placelocation`");
 				}
 				//process places
@@ -1166,10 +1166,10 @@ 
 				usort(
 					$places,
 					function (array $a, array $b) {
-						if ((int)$a['pl_level'] === (int)$b['pl_level']) {
+						if ((int) $a['pl_level'] === (int) $b['pl_level']) {
 							return I18N::strcasecmp($a['fqpn'], $b['fqpn']);
 						} else {
-							return (int)$a['pl_level'] - (int)$b['pl_level'];
+							return (int) $a['pl_level'] - (int) $b['pl_level'];
 						}
 					}
 				);
@@ -1189,7 +1189,7 @@ 
 						)) {
 
 						// overwrite
-						$location->update((object)$place);
+						$location->update((object) $place);
 						$updated++;
 					} elseif (!$valid && $options !== 'update') {
 						//add
@@ -1259,7 +1259,7 @@ 
 	 */
 	public function postAdminImportPlacesAction(Request $request) {
 		$gedcomName = $request->get('ged');
-		$inactive   = (int)$request->get('inactive');
+		$inactive   = (int) $request->get('inactive');
 		$tree       = Tree::findByName($gedcomName);
 
 		// Get all the places from the places table ...
@@ -1478,7 +1478,7 @@ 
 		$list = [];
 		/** @var array $rows */
 		foreach ($rows as $row) {
-			if ((bool)$row['inactive'] && !$show_inactive) {
+			if ((bool) $row['inactive'] && !$show_inactive) {
 				continue;
 			}
 
@@ -1489,20 +1489,20 @@ 
 				]
 			)->fetchOneRow();
 
-			if ((bool)$row['inactive']) {
+			if ((bool) $row['inactive']) {
 				$badge = 'danger';
-			} elseif ((int)$children->no_coord > 0) {
+			} elseif ((int) $children->no_coord > 0) {
 				$badge = 'warning';
-			} elseif ((int)$children->child_count > 0) {
+			} elseif ((int) $children->child_count > 0) {
 				$badge = 'info';
 			} else {
 				$badge = 'secondary';
 			}
 
-			$list[] = (object)array_merge(
+			$list[] = (object) array_merge(
 				$row,
 				[
-					'child_count' => (int)$children->child_count,
+					'child_count' => (int) $children->child_count,
 					'badge'       => $badge,
 				]
 			);
@@ -1524,7 +1524,7 @@ 
 			$row       = $statement->execute(['id' => $id])->fetchOneRow();
 			$fqpn[]    = $row->pl_place;
 			$row->fqpn = implode(Place::GEDCOM_SEPARATOR, $fqpn);
-			$id        = (int)$row->pl_parent_id;
+			$id        = (int) $row->pl_parent_id;
 			$arr[]     = $row;
 		}
 
@@ -1539,7 +1539,7 @@ 
 	 */
 	private function buildLevel($parent_id, $placename, &$places) {
 		$level = array_search('', $placename);
-		$rows  = (array)Database::prepare(
+		$rows  = (array) Database::prepare(
 			"SELECT pl_level, pl_id, pl_place, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_parent_id=? ORDER BY pl_place"
 		)
 			->execute([$parent_id])