fisharebest / webtrees

app/Controller/IndividualController.php

Doc Comments -1 removed lines

@@ -127,7 +127,6 @@
 	/**
 	 * Format a name record
 	 *
-	 * @param int  $primary
 	 * @param Fact $name_fact
 	 *
 	 * @return string

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
 	public function getTabs() {
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
 
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 
 		if ($n === 0) {
 			$content_class = 'collapse show';
-			$aria  = 'true';
+			$aria = 'true';
 
 			// Display gender icon
 			foreach ($individual->getFacts('SEX') as $sex_fact) {
@@ -162,7 +162,7 @@ 
 		echo '<dd class="field">', $dummy->getFullName();
 		if ($this->record->canEdit() && !$name_fact->isPendingDeletion()) {
 			echo "<div class=\"deletelink\"><a class=\"deleteicon\" href=\"#\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '" . $this->record->getXref() . "', '" . $name_fact->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>';
-			echo '<div class="editlink"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() .  '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
+			echo '<div class="editlink"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
 		}
 		echo '</dd>';
 		$ct = preg_match_all('/\n2 (\w+) (.*)/', $name_fact->getGedcom(), $nmatch, PREG_SET_ORDER);

individual.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 if (Auth::isAdmin()) {
 	$user = User::findByGenealogyRecord($controller->record);
 	if ($user) {
-		$user_link =  ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
+		$user_link = ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
 	};
 }
 

index_edit.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
 			}
 		}
 	}
-	if ($user_id < 0 || $gedcom_id < 0 ) {
+	if ($user_id < 0 || $gedcom_id < 0) {
 		header('Location: ' . WT_BASE_URL . 'admin.php');
 	} elseif ($user_id > 0) {
 		header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl());

app/Functions/FunctionsPrint.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
 			    <div class="modal-content">
 			      <div class="modal-header">
 			        <h3 class="modal-title" id="wt-modal-title">' . $title . '</h3>
-			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') .'">
+			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') . '">
 			          <span aria-hidden="true">&times;</span>
 			        </button>
 			      </div>

app/Module/UserMessagesModule.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 					$message->subject = I18N::translate('RE: ') . $message->subject;
 				}
 				if ($user) {
-					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() .'" title="' . I18N::translate('Reply') .'">' . I18N::translate('Reply') . '</a> ';
+					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
 				}
 				$content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
 			}

app/Theme/AbstractTheme.php

Indentation +3 added lines, -3 removed lines

@@ -90,9 +90,9 @@
 		'info'    => 'fa fa-info-circle',
 		'warning' => 'fa fa-exclamation-circle',
 
-	  // Icons for file types
-	  'mime-application-pdf' => '',
-	  'mime-text-html'       => '',
+		// Icons for file types
+		'mime-application-pdf' => '',
+		'mime-text-html'       => '',
 
 		// Other icons
 		'mail'    => 'fa fa-envelope-o',

Spacing +2 added lines, -2 removed lines

@@ -819,7 +819,7 @@ 
 				'<div class="icons">' .
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
 				'</div>' .
 				'</div>' .
 				'</div>';
@@ -871,7 +871,7 @@ 
 				'<div class="icons">' .
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
 				'</div>' .
 				'</div>' .
 				'</div>';

message.php

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
 $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin());
 $controller->pageHeader();
 
-$to_names = implode(I18N::$list_separator, array_map(function(User $user) { return $user->getRealName(); }, recipients($to)));
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) { return $user->getRealName(); }, recipients($to)));
 
 ?>
 <h2><?= I18N::translate('Send a message') ?></h2>
@@ -185,13 +185,13 @@ 
  */
 function recipients($to) {
 	if ($to === 'all') {
-		$recipients =	User::all();
+		$recipients = User::all();
 	} elseif ($to === 'last_6mo') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
 		});
 	} elseif ($to === 'never_logged') {
-		$recipients = array_filter(User::all(), function(User $user) {
+		$recipients = array_filter(User::all(), function (User $user) {
 			return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime');
 		});
 	} else {

Braces +3 added lines, -1 removed lines

@@ -128,7 +128,8 @@ 
 				<div class="form-control"><?= Filter::escapeHtml(Auth::user()->getRealName()) ?></div>
 			</div>
 		</div>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<div class="form-group row">
 			<label class="col-sm-3 col-form-label" for="from-name">
 				<?= I18N::translate('Your name') ?>
@@ -186,6 +187,7 @@ 
 function recipients($to) {
 	if ($to === 'all') {
 		$recipients =	User::all();
+}
 	} elseif ($to === 'last_6mo') {
 		$recipients = array_filter(User::all(), function(User $user) {
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;

app/Date/JewishDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	/**
 	 * Which months follows this one? Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		if ($this->m == 6 && !$this->isLeapYear()) {

app/Controller/RelationshipController.php

Doc Comments +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function allAncestors($xref1, $xref2, $tree_id) {
 		$ancestors = [$xref1, $xref2];
@@ -197,7 +197,7 @@ 
 	 * @param string $xref2
 	 * @param int    $tree_id
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function excludeFamilies($xref1, $xref2, $tree_id) {
 		return Database::prepare(