fisharebest / webtrees

admin_module_menus.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin_module_sidebar.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

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

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

admin_module_charts.php

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

admin.php

Braces +35 added lines, -14 removed lines

@@ -611,8 +611,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+					<?php else {
+	: ?>
+						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -774,9 +777,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -784,9 +790,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -794,9 +803,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -804,9 +816,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -814,9 +829,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -824,9 +842,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>

relationship.php

Braces +5 added lines, -2 removed lines

@@ -101,7 +101,8 @@ 
 					<?php if ($max_recursion == 0): ?>
 						<?php echo I18N::translate('Find the closest relationships') ?>
 						<input type="hidden" name="recursion" value="0">
-					<?php else: ?>
+					<?php else {
+	: ?>
 						<label>
 							<input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>>
 							<?php echo I18N::translate('Find the closest relationships') ?>
@@ -113,7 +114,9 @@ 
 								<?php echo I18N::translate('Find all possible relationships') ?>
 							<?php else: ?>
 								<?php echo I18N::translate('Find other relationships') ?>
-							<?php endif; ?>
+							<?php endif;
+}
+?>
 						</label>
 					<?php endif; ?>
 				</td>

admin_modules.php

Braces +40 added lines, -16 removed lines

@@ -176,9 +176,12 @@ 
 							<a href="<?php echo $module->getConfigLink() ?>">
 								<?php echo $module->getTitle() ?> <i class="fa fa-cogs"></i>
 							</a>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							<?php echo $module->getTitle() ?>
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 						<?php if (!in_array($module->getName(), Module::getCoreModuleNames())): ?>
 							<br>
 						<?php endif; ?>
@@ -202,23 +205,32 @@ 
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleMenuInterface): ?>
 							<i class="fa fa-list-ul" title="<?php echo I18N::translate('Menu') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleTabInterface): ?>
 							<i class="fa fa-folder" title="<?php echo I18N::translate('Tab') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleSidebarInterface): ?>
 							<i class="fa fa-th-large" title="<?php echo I18N::translate('Sidebar') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleBlockInterface): ?>
@@ -228,30 +240,42 @@ 
 							<?php if ($module->isUserBlock()): ?>
 								<i class="fa fa-tree" title="<?php echo I18N::translate('Home page') ?>"></i>
 							<?php endif; ?>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleChartInterface): ?>
 							<i class="fa fa-share-alt" title="<?php echo I18N::translate('Chart') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden-xs">
 						<?php if ($module instanceof ModuleReportInterface): ?>
 							<i class="fa fa-file" title="<?php echo I18N::translate('Report') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 					<td class="text-center text-muted hidden">
 						<?php if ($module instanceof ModuleThemeInterface): ?>
 							<i class="fa fa-check" title="<?php echo I18N::translate('Theme') ?>"></i>
-						<?php else: ?>
+						<?php else {
+	: ?>
 							-
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 					</td>
 				</tr>
 			<?php endforeach; ?>

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