fisharebest / webtrees

app/Module/FamilyNavigatorModule.php

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 	/**
 	 * Format an individual.
 	 *
-	 * @param      $person
+	 * @param      Individual|null $person
 	 * @param bool $showUnknown
 	 *
 	 * @return string

Braces +6 added lines, -2 removed lines

@@ -140,7 +140,8 @@ 
 					<div class="font9">
 						<?= $spouse->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $spouse->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -150,6 +151,7 @@ 
 
 		foreach ($family->getChildren() as $child) {
 			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
+}
 			$menu->addSubmenu(new Menu($this->getFamily($child)));
 			?>
 			<tr>
@@ -166,7 +168,8 @@ 
 					<div class="font9">
 						<?= $child->getLifeSpan() ?>
 					</div>
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<?= $child->getFullName() ?>
 					<?php endif ?>
 				</td>
@@ -186,6 +189,7 @@ 
 	private function getHTML($person, $showUnknown = false) {
 		if ($person instanceof Individual) {
 			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
+}
 		} elseif ($showUnknown) {
 			return sprintf(self::MSG, I18N::translate('unknown'));
 		} else {

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>

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
  */
 namespace Fisharebest\Webtrees\Functions;
 
-use Fisharebest\Webtrees\Bootstrap4;
 use Fisharebest\Webtrees\Config;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Fact;

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