8 files changed, 19 insertions, 18 deletions
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php
index cccf4dd4da..c03d631c21 100644
--- a/includes/functions/functions_db.php
+++ b/includes/functions/functions_db.php
@@ -850,7 +850,7 @@ function get_common_surnames($min) {
  * @param integer $min    only fetch surnames occuring this many times
  * @param integer $max    only fetch this number of surnames (0=all)
  *
- * @return string[][]
+ * @return string[]
  */
 function get_top_surnames($ged_id, $min, $max) {
 	// Use n_surn, rather than n_surname, as it is used to generate URLs for
@@ -1226,8 +1226,9 @@ function get_block_setting($block_id, $setting_name, $default_value=null) {
 			"SELECT SQL_CACHE setting_value FROM `##block_setting` WHERE block_id=? AND setting_name=?"
 		);
 	}
-	$setting_value=$statement->execute(array($block_id, $setting_name))->fetchOne();
-	return $setting_value===null ? $default_value : $setting_value;
+	$setting_value = $statement->execute(array($block_id, $setting_name))->fetchOne();
+
+	return $setting_value === null ? $default_value : $setting_value;
 }
 
 /**
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index 72a8bce51e..c9321ebfc9 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -165,8 +165,8 @@ function radio_buttons($name, $values, $selected) {
 
 // Print an edit control for a Yes/No field
 /**
- * @param      $name
- * @param bool $selected
+ * @param string  $name
+ * @param boolean $selected
  *
  * @return string
  */
@@ -227,8 +227,8 @@ function two_state_checkbox($name, $is_checked=0, $extra='') {
 /**
  * Print a set of edit controls to select languages
  *
- * @param $field_prefix
- * @param $languages
+ * @param string $field_prefix
+ * @param string $languages
  *
  * @return string
  */
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index eb9565b140..1d0ed73324 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -765,9 +765,9 @@ function import_record($gedrec, $ged_id, $update) {
 /**
  * extract all places from the given record and insert them into the places table
  *
- * @param        $gid
- * @param        $ged_id
- * @param string $gedrec
+ * @param string  $gid
+ * @param integer $ged_id
+ * @param string  $gedrec
  */
 function update_places($gid, $ged_id, $gedrec) {
 	global $placecache;
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 23d8da282e..c4dfacb829 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -399,7 +399,7 @@ function contact_links($ged_id=WT_GED_ID) {
  * @param string  $nrec     the note record to print
  * @param boolean $textOnly Don't print the "Note: " introduction
  *
- * @return boolean
+ * @return string
  */
 function print_note_record($text, $nlevel, $nrec, $textOnly=false) {
 	global $WT_TREE;
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 9806a9105e..e4bd2a0e36 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -464,7 +464,7 @@ function print_fact(WT_Fact $fact, WT_GedcomRecord $record) {
  *
  * find and print repository information attached to a source
  *
- * @param $xref the Gedcom Xref ID of the repository to print
+ * @param string $xref the Gedcom Xref ID of the repository to print
  */
 function print_repository_record($xref) {
 	$repository=WT_Repository::getInstance($xref);
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index 7ec87de12f..ad175ce4f5 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -50,9 +50,9 @@ function stripLRMRLM($inputText) {
  * This function encapsulates all texts in the input with <span dir='xxx'> and </span>
  * according to the directionality specified.
  *
- * @param string Raw input
- * @param string Directionality (LTR, BOTH, RTL) default BOTH
- * @param string Additional text to insert into output <span dir="xxx"> (such as 'class="yyy"')
+ * @param string $inputText Raw input
+ * @param string $direction Directionality (LTR, BOTH, RTL) default BOTH
+ * @param string $class     Additional text to insert into output <span dir="xxx"> (such as 'class="yyy"')
  *
  * @return string The string with all texts encapsulated as required
  */
@@ -616,7 +616,7 @@ function beginCurrentSpan(&$result) {
  */
 function finishCurrentSpan(&$result, $theEnd = false) {
 	global $previousState, $currentState, $posSpanStart, $TEXT_DIRECTION, $waitingText;
-	global $startLTR, $endLTR, $startRTL, $endRTL, $lenStart, $lenEnd;
+	global $startLTR, $endLTR, $startRTL, $endRTL;
 	global $numbers, $punctuation;
 
 	$textSpan = substr($result, $posSpanStart);
diff --git a/library/WT/Auth.php b/library/WT/Auth.php
index e2960504af..c4981d27b2 100644
--- a/library/WT/Auth.php
+++ b/library/WT/Auth.php
@@ -152,7 +152,7 @@ class Auth {
 	/**
 	 * The authenticated user, from the current session.
 	 *
-	 * @return User|null
+	 * @return User
 	 */
 	public static function user() {
 		$user = User::find(Auth::id());
diff --git a/library/WT/Site.php b/library/WT/Site.php
index f2316afdba..1b9205fec0 100644
--- a/library/WT/Site.php
+++ b/library/WT/Site.php
@@ -32,7 +32,7 @@ class WT_Site {
 	 *
 	 * @param string $setting_name
 	 *
-	 * @return string
+	 * @return string|null
 	 */
 	public static function getPreference($setting_name) {
 		// There are lots of settings, and we need to fetch lots of them on every page