fisharebest / webtrees

app/Module/StoriesModule.php

Braces +5 added lines, -2 removed lines

@@ -389,8 +389,11 @@
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+	: ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>

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) {

medialist.php

Braces +5 added lines, -2 removed lines

@@ -110,10 +110,13 @@
 						</option>
 					</select>
 				</td>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<td class="descriptionbox wrap"></td>
 					<td class="optionbox wrap"></td>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">

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

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

@@ -343,7 +343,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) { return $x['type'] !== '_MARNM'; } );
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@ 
 
 			$wife_names = [];
 			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($wife_names)) {

app/Individual.php

Doc Comments +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
 	 *    (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N"
 	 *    (c) Level 2 or higher object with the Highlight option set to "Y"
 	 *
-	 * @return null|Media
+	 * @return GedcomRecord|null
 	 */
 	public function findHighlightedMedia() {
 		$objectA = null;

app/Statement.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	 *
 	 * @param int $fetch_style
 	 *
-	 * @return \stdClass|array|null
+	 * @return \stdClass
 	 */
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
 		if (!$this->executed) {

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) {

search_advanced.php

Braces +3 added lines, -1 removed lines

@@ -154,7 +154,8 @@ 
 				<input type="text" id="value<?= $i ?>" name="values[<?= $i ?>]" value="<?= Filter::escapeHtml($controller->getValue($i)) ?>"<?= substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : '' ?>>
 			<?php if (preg_match('/^NAME:/', $currentFieldSearch) > 0) { ?>
 				<select name="fields[<?= $i ?>]">
-					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
+					<option value="<?= $currentField ?>:EXACT" <?php if (preg_match('/:EXACT$/', $currentFieldSearch) > 0) {
+	echo 'selected' ?>><?= I18N::translate('Exact') ?></option>
 					<option value="<?= $currentField ?>:BEGINS" <?php if (preg_match('/:BEGINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Begins with') ?></option>
 					<option value="<?= $currentField ?>:CONTAINS" <?php if (preg_match('/:CONTAINS$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Contains') ?></option>
 					<option value="<?= $currentField ?>:SDX" <?php if (preg_match('/:SDX$/', $currentFieldSearch) > 0) echo 'selected' ?>><?= I18N::translate('Sounds like') ?></option>
@@ -176,6 +177,7 @@ 
 		//-- relative fields
 		if ($i == 0 && $fct > 4) {
 			$j = $fct;
+}
 			// Get the current options for Father’s and Mother’s name searches
 			$fatherGivnOption = 'SDX';
 			$fatherSurnOption = 'SDX';