fisharebest / webtrees

app/Module/OpenStreetMapModule.php

Spacing +50 added lines, -50 removed lines

@@ -297,7 +297,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
@@ -329,7 +329,7 @@ 
 								'modules/openstreetmap/event-sidebar',
 								$event->shortSummary($mapType, $id)
 							),
-							'zoom'     => (int)$event->getZoom(),
+							'zoom'     => (int) $event->getZoom(),
 						],
 					];
 				}
@@ -399,7 +399,7 @@ 
 							'stats'    => $placeStats,
 						]
 					),
-					'zoom'    => (int)($location->getZoom() ?? 2),
+					'zoom'    => (int) ($location->getZoom() ?? 2),
 				],
 			];
 		}
@@ -451,7 +451,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')
 		);
@@ -500,14 +500,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) {
@@ -516,7 +516,7 @@ 
 					'provider' => 'openstreetmap',
 					'style'    => 'mapnik',
 				];
-				self::$map_providers  = [
+				self::$map_providers = [
 					'openstreetmap' => [
 						'name'   => 'OpenStreetMap',
 						'styles' => ['mapnik' => 'Mapnik'],
@@ -569,7 +569,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(),
@@ -632,7 +632,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)'),
@@ -688,8 +688,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 = [
@@ -712,7 +712,7 @@ 
 		}
 		$breadcrumbs[] = array_pop($breadcrumbs);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-places',
 			'data' => [
 				'title'       => $title,
@@ -733,9 +733,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);
@@ -771,7 +771,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(),
@@ -797,9 +797,9 @@ 
 	 */
 	public function postAdminSaveAction(Request $request): RedirectResponse {
 		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);
@@ -818,7 +818,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'),
@@ -837,7 +837,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,
 					]
 				);
@@ -870,9 +870,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(
@@ -891,7 +891,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])
@@ -924,9 +924,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminExportAction(Request $request): RedirectResponse {
-		$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   = [];
@@ -978,8 +978,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',
@@ -1015,8 +1015,8 @@ 
 	 * @return object
 	 */
 	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'),
@@ -1031,7 +1031,7 @@ 
 			)                            => $this->getTitle() . ' (' . I18N::translate('Geographic data') . ')',
 			I18N::translate('Import file'),
 		];
-		$files       = $this->findFiles(WT_MODULES_DIR . $this->getName() . '/extra', ['csv', 'geojson', 'json']);
+		$files = $this->findFiles(WT_MODULES_DIR . $this->getName() . '/extra', ['csv', 'geojson', 'json']);
 		uasort(
 			$files,
 			function ($a, $b) {
@@ -1042,7 +1042,7 @@ 
 			}
 		);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-import-form',
 			'data' => [
 				'title'       => I18N::translate('Import geographic data'),
@@ -1106,8 +1106,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';
 					}
 				}
@@ -1147,7 +1147,7 @@ 
 							}
 						);
 						// convert separate place fields into a comma separated placename
-						$row[]    = implode(
+						$row[] = implode(
 							Place::GEDCOM_SEPARATOR,
 							array_filter(
 								array_reverse(
@@ -1163,7 +1163,7 @@ 
 			}
 
 			if ($filetype !== '?') {
-				if ((bool)$request->get('cleardatabase')) {
+				if ((bool) $request->get('cleardatabase')) {
 					Database::exec("TRUNCATE TABLE `##placelocation`");
 				}
 				//process places
@@ -1174,10 +1174,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'];
 						}
 					}
 				);
@@ -1197,7 +1197,7 @@ 
 						)) {
 
 						// overwrite
-						$location->update((object)$place);
+						$location->update((object) $place);
 						$updated++;
 					} elseif (!$valid && $options !== 'update') {
 						//add
@@ -1267,7 +1267,7 @@ 
 	 */
 	public function postAdminImportPlacesAction(Request $request): RedirectResponse {
 		$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 ...
@@ -1323,7 +1323,7 @@ 
 				"INSERT INTO `##placelocation` (pl_id, pl_parent_id, pl_level, pl_place)" .
 				" VALUES (:id, :parent, :level, :place)"
 			);
-			$checkRecordQry  = Database::prepare(
+			$checkRecordQry = Database::prepare(
 				"SELECT pl1.pl_id" .
 				" FROM	  `##placelocation` AS pl1" .
 				" LEFT JOIN `##placelocation` AS pl2 ON (pl1.pl_parent_id = pl2.pl_id)" .
@@ -1486,18 +1486,18 @@ 
 
 			if ($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,
 				]
 			);
@@ -1519,7 +1519,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;
 		}
 
@@ -1534,7 +1534,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])

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -1604,7 +1604,7 @@
 			$height = (int) $attrs['height'];
 		}
 
-		$person      = Individual::getInstance($id, $this->tree);
+		$person = Individual::getInstance($id, $this->tree);
 		$media_file = $person->findHighlightedMediaFile();
 
 		if ($media_file !== null && $media_file->fileExists()) {

app/Module/OpenStreetMap/Schema/Migration3.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 			" DROP COLUMN sv_long," .
 			" DROP COLUMN sv_lati," .
 			" DROP COLUMN sv_bearing," .
-			" DROP COLUMN sv_elevation,".
+			" DROP COLUMN sv_elevation," .
 			" DROP COLUMN sv_zoom," .
 			" DROP INDEX ix1," .
 			" DROP INDEX ix2," .
@@ -56,7 +56,7 @@ 
 			"DELETE FROM `##module_setting` WHERE module_name='openstreetmap' AND setting_name=''"
 			];
 
-		foreach($queries as $query) {
+		foreach ($queries as $query) {
 			try {
 				Database::exec($query);
 			} catch (PDOException $ex) {

app/Http/Controllers/AdminSiteController.php

Spacing +25 added lines, -25 removed lines

@@ -255,35 +255,35 @@ 
 
 		$args = [];
 		if ($search) {
-			$sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
 			$args['search'] = $search;
 		}
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
@@ -309,7 +309,7 @@ 
 		}
 
 		if ($length) {
-			$sql            .= " LIMIT :limit OFFSET :offset";
+			$sql .= " LIMIT :limit OFFSET :offset";
 			$args['limit']  = $length;
 			$args['offset'] = $start;
 		}
@@ -361,35 +361,35 @@ 
 
 		$args = [];
 		if ($search) {
-			$sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
 			$args['search'] = $search;
 		}
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
@@ -421,37 +421,37 @@ 
 
 		$args = [];
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
 		$sql .= " ORDER BY log_id";
 
-		$rows = Database::prepare($sql )->execute($args)->fetchAll();
+		$rows = Database::prepare($sql)->execute($args)->fetchAll();
 
 		$data = '';
 

app/Module/SiteMapModule.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	public function getFileAction(Request $request): Response {
 		$file = $request->get('file', '');
 
-		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match))		 {
+		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) {
 			throw new NotFoundHttpException('Bad sitemap file');
 		}
 

app/Module/ClippingsCartModule.php

Spacing +9 added lines, -9 removed lines

@@ -231,7 +231,7 @@ 
 
 		// Create a source, to indicate the source of the data.
 		$filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
-		$author   = User::find($tree->getPreference('CONTACT_EMAIL'));
+		$author = User::find($tree->getPreference('CONTACT_EMAIL'));
 		if ($author !== null) {
 			$filetext .= '1 AUTH ' . $author->getRealName() . "\n";
 		}
@@ -608,7 +608,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$media  = Media::getInstance($xref, $tree);
+		$media = Media::getInstance($xref, $tree);
 
 		if ($media === null) {
 			throw new NotFoundHttpException;
@@ -649,7 +649,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$media = Media::getInstance($xref, $tree);
 
@@ -673,7 +673,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$note  = Note::getInstance($xref, $tree);
+		$note = Note::getInstance($xref, $tree);
 
 		if ($note === null) {
 			throw new NotFoundHttpException;
@@ -714,7 +714,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$note = Note::getInstance($xref, $tree);
 
@@ -738,7 +738,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$repository  = Repository::getInstance($xref, $tree);
+		$repository = Repository::getInstance($xref, $tree);
 
 		if ($repository === null) {
 			throw new NotFoundHttpException;
@@ -779,7 +779,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$repository = Repository::getInstance($xref, $tree);
 
@@ -803,7 +803,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$source  = Source::getInstance($xref, $tree);
+		$source = Source::getInstance($xref, $tree);
 
 		if ($source === null) {
 			throw new NotFoundHttpException;
@@ -889,7 +889,7 @@ 
 		$records = array_filter($records);
 
 		// Group and sort.
-		uasort($records, function(GedcomRecord $x, GedcomRecord $y) {
+		uasort($records, function (GedcomRecord $x, GedcomRecord $y) {
 			return $x::RECORD_TYPE <=> $y::RECORD_TYPE ?: GedcomRecord::compare($x, $y);
 		});
 

edit_interface.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 					echo view('cards/add-source-citation', [
 						'level'          => 2,
 						'full_citations' => $controller->tree()->getPreference('FULL_SOURCES'),
-					]);				}
+					]); }
 				if ($level1type !== 'OBJE') {
 					if ($controller->tree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($controller->tree())) {
 						echo view('cards/add-media-object', [

resources/views/modules/families/sidebar.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 <?php use Fisharebest\Webtrees\Theme; ?>
 <?php use Fisharebest\Webtrees\View; ?>
 
-<form method="post" action="<?= e(Html::url('module.php' ,['mod' => 'families', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;">
+<form method="post" action="<?= e(Html::url('module.php', ['mod' => 'families', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;">
 	<input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="<?= I18N::translate('Search') ?>">
 	<p>
 		<?php foreach ($initials as $letter => $count): ?>

resources/views/modules/individuals/sidebar.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 <?php use Fisharebest\Webtrees\Theme; ?>
 <?php use Fisharebest\Webtrees\View; ?>
 
-<form method="post" action="<?= e(Html::url('module.php' ,['mod' => 'individuals', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;">
+<form method="post" action="<?= e(Html::url('module.php', ['mod' => 'individuals', 'mod_action' => 'ajax'])) ?>" onsubmit="return false;">
 	<input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="<?= I18N::translate('Search') ?>">
 	<p>
 		<?php foreach ($initials as $letter => $count): ?>