fisharebest / webtrees

app/Theme/AbstractTheme.php

Doc Comments +12 added lines, -12 removed lines

@@ -1115,7 +1115,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1130,7 +1130,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1145,7 +1145,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1160,7 +1160,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1192,7 +1192,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1207,7 +1207,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1222,7 +1222,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1237,7 +1237,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1252,7 +1252,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1267,7 +1267,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1280,7 +1280,7 @@ 
 	/**
 	 * Generate a menu item for the statistics charts.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */
@@ -1295,7 +1295,7 @@ 
 	 *
 	 * @param Individual $individual
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 *
 	 * @deprecated
 	 */

app/Module/AncestorsChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/CompactTreeChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/DescendancyChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/FamilyBookChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/HourglassChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/InteractiveTreeModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

app/Module/PedigreeChartModule.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Return a menu item for this chart.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getChartMenu(Individual $individual) {
 		$tree     = $individual->getTree();
@@ -82,7 +82,7 @@ 
 	/**
 	 * Return a menu item for this chart - for use in individual boxes.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getBoxChartMenu(Individual $individual) {
 		return $this->getChartMenu($individual);

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