fisharebest / webtrees

app/Schema/MigrationInterface.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
 interface MigrationInterface {
 	/**
 	 * Upgrade to to the next version
+	 * @return void
 	 */
 	public function upgrade();
 }

app/Stats.php

Doc Comments +1 added lines, -1 removed lines

@@ -5362,7 +5362,7 @@
 	/**
 	 * Find common surnames.
 	 *
-	 * @return string
+	 * @return integer|null
 	 */
 	public function getCommonSurname() {
 		$surnames = array_keys(FunctionsDb::getTopSurnames($this->tree->getTreeId(), 1, 1));

app/Theme/ThemeInterface.php

Doc Comments +3 added lines

@@ -102,6 +102,7 @@ 
 	/**
 	 * Allow themes to do things after initialization (since they cannot use
 	 * the constructor).
+	 * @return void
 	 */
 	public function hookAfterInit();
 
@@ -193,6 +194,7 @@ 
 	 * happens in a theme file, and we need to be able to change it.
 	 *
 	 * @param Tree|null $tree The current tree (if there is one).
+	 * @return void
 	 */
 	public function init(Tree $tree = null);
 
@@ -214,6 +216,7 @@ 
 
 	/**
 	 * Send any HTTP headers.
+	 * @return void
 	 */
 	public function sendHeaders();
 

calendar.php

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

@@ -67,14 +67,14 @@
 	if (strlen($match[1]) > strlen($match[2])) {
 		$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
 	}
-	$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
+	$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
 	$view     = 'year';
 } else {
 	// advanced-year "decade/century wildcard"
 	if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
 		$y1       = $match[1] . str_replace('?', '0', $match[2]);
 		$y2       = $match[1] . str_replace('?', '9', $match[2]);
-		$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
+		$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
 		$view     = 'year';
 	} else {
 		if ($year < 0) {

app/Functions/FunctionsDb.php

Doc Comments +2 added lines, -2 removed lines

@@ -647,7 +647,7 @@ 
 	 * @param int $min The number of times a surname must occur before it is added to the array
 	 * @param Tree $tree
 	 *
-	 * @return int[]
+	 * @return string[]
 	 */
 	public static function getCommonSurnames($min, Tree $tree) {
 		return self::getTopSurnames($tree->getTreeId(), $min, 0);
@@ -660,7 +660,7 @@ 
 	 * @param int $min only fetch surnames occuring this many times
 	 * @param int $max only fetch this number of surnames (0=all)
 	 *
-	 * @return int[]
+	 * @return string[]
 	 */
 	public static function getTopSurnames($ged_id, $min, $max) {
 		// Use n_surn, rather than n_surname, as it is used to generate URLs for

Unused Use Statements -1 removed lines

@@ -26,7 +26,6 @@
 use Fisharebest\Webtrees\Date\JulianDate;
 use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Family;
-use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Note;

app/Family.php

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	/**
 	 * Get the male (or first female) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */
@@ -118,7 +118,7 @@ 
 	/**
 	 * Get the female (or second male) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */

Spacing +2 added lines, -2 removed lines

@@ -330,7 +330,7 @@ 
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
 			$husb_names = [];
 			if ($this->husb) {
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) {
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) {
 					return $x['type'] !== '_MARNM';
 				} );
 			}
@@ -348,7 +348,7 @@ 
 
 			$wife_names = [];
 			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) {
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) {
 					return $x['type'] !== '_MARNM';
 				} );
 			}

app/Functions/FunctionsPrintLists.php

Spacing +1 added lines, -1 removed lines

@@ -1717,7 +1717,7 @@
 					if ($endjd === $startjd) {
 						$html .= I18N::translate('No events exist for tomorrow.');
 					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				} else {
 					if ($endjd === $startjd) {

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Filter;
-use Fisharebest\Webtrees\FontAwesome;
 use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\GedcomTag;
 use Fisharebest\Webtrees\Html;

admin_users.php

Braces +3 added lines, -1 removed lines

@@ -770,13 +770,15 @@
 		<p>
 		<?php if ($ucnt): ?>
 			<input type="submit" value="<?= I18N::translate('delete') ?>">
-			<?php else: ?>
+			<?php else {
+	: ?>
 			<?= I18N::translate('Nothing found to cleanup') ?>
 			<?php endif ?>
 		</p>
 	</form>
 	<?php
 	break;
+}
 
 case 'cleanup2':
 	foreach (User::all() as $user) {

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

Indentation +2 added lines, -2 removed lines

@@ -150,8 +150,8 @@
 				}
 
 				foreach ($family->getChildren() as $child) {
-          $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
-          $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
+					$icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
+					$menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
 					?>
 					<tr class="text-center wt-child wt-gender-<?= $child->getSex() ?>">

Braces +6 added lines, -2 removed lines

@@ -141,7 +141,8 @@ 
 							<div class="small">
 								<?= $spouse->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $spouse->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -151,6 +152,7 @@ 
 
 				foreach ($family->getChildren() as $child) {
           $icon = $controller->record === $child ? '<i class="icon-selected"></i>' : '';
+}
           $menu = new Menu($icon . Functions::getCloseRelationshipName($controller->record, $child));
 					$menu->addSubmenu(new Menu($this->getFamily($child)));
 					?>
@@ -168,7 +170,8 @@ 
 							<div class="small">
 								<?= $child->getLifeSpan() ?>
 							</div>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?= $child->getFullName() ?>
 							<?php endif ?>
 						</td>
@@ -192,6 +195,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 {