fisharebest / webtrees

app/Module/StatisticsChartModule.php

Doc Comments +1 added lines, -1 removed lines

@@ -500,7 +500,7 @@
 	/**
 	 * A menu, to be added to the main application menu.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getMenu() {
 		$menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=show_list', 'menu-story');

app/Module/TimelineChartModule.php

Doc Comments +1 added lines, -1 removed lines

@@ -500,7 +500,7 @@
 	/**
 	 * A menu, to be added to the main application menu.
 	 *
-	 * @return Menu|null
+	 * @return Menu
 	 */
 	public function getMenu() {
 		$menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=show_list', 'menu-story');

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/GoogleMapsModule.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);

Braces +19 added lines, -6 removed lines

@@ -3017,7 +3017,8 @@ 
 		ob_start(); // TODO: rewrite print_gm_markers, and the functions called therein, to either return text or add JS directly.
 
 		if ($numfound == 0 && $level > 0) {
-			if (isset($levelo[($level - 1)])) {  // ** BH not sure yet what this if statement is for ... TODO **
+			if (isset($levelo[($level - 1)])) {
+// ** BH not sure yet what this if statement is for ... TODO **
 				// show the current place on the map
 
 				$place = Database::prepare("SELECT pl_id AS place_id, pl_place AS place, pl_lati AS lati, pl_long AS `long`, pl_zoom AS zoom, pl_icon AS icon FROM `##placelocation` WHERE pl_id=?")
@@ -3851,7 +3852,8 @@ 
 			}
 
 			function showLocation_level(address) {
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
+				address += '<?php if ($level > 0) {
+	echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
 				geocoder.geocode({'address': address}, addAddressToMap);
 			}
 
@@ -3896,8 +3898,13 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees') ?>" value="<?php echo abs($place_lati) ?>" size="20" onchange="updateMap();">
 					<select name="LATI_CONTROL" id="LATI_CONTROL" onchange="updateMap();">
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north') ?></option>
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south') ?></option>
+						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected";
+}
+echo ">", I18N::translate('north') ?></option>
+						<option value="PL_S" <?php if ($place_lati < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('south') ?></option>
 					</select>
 				</td>
 			</tr>
@@ -3906,8 +3913,14 @@ 
 				<td class="optionbox" colspan="2">
 					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees') ?>" value="<?php echo abs($place_long) ?>" size="20" onchange="updateMap();">
 					<select name="LONG_CONTROL" id="LONG_CONTROL" onchange="updateMap();">
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east') ?></option>
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west') ?></option>
+						<option value="PL_E" <?php if ($place_long >= 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('east') ?></option>
+						<option value="PL_W" <?php if ($place_long < 0) {
+	echo "selected";
+}
+echo ">", I18N::translate('west') ?></option>
 					</select>
 				</td>
 			</tr>

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