fisharebest / webtrees

app/Date/CalendarDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -842,7 +842,7 @@
 	/**
 	 * Which months follows this one? Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		return [$this->m === $this->calendar->monthsInYear() ? $this->nextYear($this->y) : $this->y, ($this->m % $this->calendar->monthsInYear()) + 1];

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			[

app/Module/StoriesModule.php

Braces +3 added lines, -1 removed lines

@@ -381,7 +381,8 @@ 
 						<a href="<?= $individual->getHtmlUrl() ?>#tab-stories">
 							<?= $individual->getFullName() ?>
 						</a>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							<?= $story->xref ?>
 						<?php endif ?>
 						</td>
@@ -410,6 +411,7 @@ 
 	 */
 	private function showList() {
 		global $controller, $WT_TREE;
+}
 
 		$controller = new PageController;
 		$controller

app/Mail.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -16,8 +16,8 @@
 namespace Fisharebest\Webtrees;
 
 use Exception;
-use Swift_Mailer;
 use Swift_MailTransport;
+use Swift_Mailer;
 use Swift_Message;
 use Swift_NullTransport;
 use Swift_Preferences;

app/Theme/CloudsTheme.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 			if (!empty($menu->getSubmenus())) {
 				// Insert a dummy menu / label into the submenu
 				$submenus = $menu->getSubmenus();
-				array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;']));
+				array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;']));
 				$menu->setSubmenus($submenus);
 			}
 

app/Module/GoogleMapsModule.php

Switch Indentation +18 added lines, -18 removed lines

@@ -1120,24 +1120,24 @@
 										if ($latlongval[$i] == $latlongval[$k]) {
 											$dups++;
 											switch ($dups) {
-												case 1:
-													$marker_number = $curgen . 'L';
-													break;
-												case 2:
-													$marker_number = $curgen . 'R';
-													break;
-												case 3:
-													$marker_number = $curgen . 'Ls';
-													break;
-												case 4:
-													$marker_number = $curgen . 'Rs';
-													break;
-												case 5: //adjust position where markers have same coodinates
-												default:
-													$marker_number = $curgen;
-													$lon[$i] += 0.0025;
-													$lat[$i] += 0.0025;
-													break;
+											case 1:
+												$marker_number = $curgen . 'L';
+												break;
+											case 2:
+												$marker_number = $curgen . 'R';
+												break;
+											case 3:
+												$marker_number = $curgen . 'Ls';
+												break;
+											case 4:
+												$marker_number = $curgen . 'Rs';
+												break;
+											case 5: //adjust position where markers have same coodinates
+											default:
+												$marker_number = $curgen;
+												$lon[$i] += 0.0025;
+												$lat[$i] += 0.0025;
+												break;
 											}
 										}
 									}

Spacing +3 added lines, -3 removed lines

@@ -2247,7 +2247,7 @@ 
 				'place_id' => $place_id,
 			]);
 		} catch (\Exception $ex) {
-			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'),'danger');
+			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'), 'danger');
 		}
 
 		header('Location: module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $parent_id . '&inactive=' . $inactive);
@@ -3295,7 +3295,7 @@ 
 								<?php endif ?>
 						</td>
 						<td>
-							<?= FontAwesome::linkIcon('edit',  I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
+							<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
 						</td>
 						<td>
 							<?php if ($noRows == 0): ?>
@@ -3304,7 +3304,7 @@ 
 									<input type="hidden" name="place_id" value="<?= $place['place_id'] ?>">
 									<input type="hidden" name="inactive" value="<?= $inactive ?>">
 									<button type="submit" class="btn btn-danger">
-										<?= FontAwesome::semanticIcon('delete',  I18N::translate('Delete')) ?>
+										<?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?>
 									</button>
 								</form>
 							<?php else: ?>

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 {
+	: ?>
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
 				<?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);

admin_trees_config.php

Spacing +1 added lines, -1 removed lines

@@ -1505,7 +1505,7 @@
 						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
 						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
 					], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
+					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
 				) ?>
 				<p class="small text-muted">
 					<?= /* 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>.') ?>

app/Module.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 					}
 				} catch (\Exception $ex) {
 					// The module has been deleted or is broken? Disable it.
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
 					Database::prepare(
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
 					)->execute([

Spacing +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 		// Exclude disabled modules
 		$enabled_modules = Database::prepare("SELECT module_name, status FROM `##module` WHERE status='enabled'")->fetchOneColumn();
 
-		return array_filter($modules, function(AbstractModule $module) use ($enabled_modules) {
+		return array_filter($modules, function (AbstractModule $module) use ($enabled_modules) {
 			return in_array($module->getName(), $enabled_modules);
 		});
 	}