Fix static analysis warnings

2 files changed, 12 insertions, 14 deletions

diff --git a/adodb-active-record.inc.php b/adodb-active-record.inc.php
index fd109716..0ab8056b 100644
--- a/adodb-active-record.inc.php
+++ b/adodb-active-record.inc.php
@@ -335,7 +335,7 @@ class ADODB_Active_Record
 	 * @param int $offset
 	 * @param int $limit
 	 *
-	 * @return array
+	 * @return mixed
 	 */
 	function LoadRelations($name, $whereOrderBy = '', $offset = -1, $limit = -1)
 	{
@@ -758,8 +758,8 @@ class ADODB_Active_Record
 				return 'null';
 			}
 
-			if (strlen($val)>0 &&
-				(strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")
+			if (strlen($val) > 0 &&
+				(strncmp($val, "'", 1) != 0 || substr($val, strlen($val) - 1, 1) != "'")
 			) {
 				return $db->qstr($val);
 			}
@@ -1123,12 +1123,11 @@ class ADODB_Active_Record
 			return -1;
 		}
 
-		$tableName = $this->nameQuoter($db,$this->_table);
-
 		$sql = sprintf(/** @lang text */ 'UPDATE %s SET %s WHERE %s',
-					   $tableName,
-					   implode(',',$pairs),
-					   $where);
+			$this->nameQuoter($db, $this->_table),
+			implode(',', $pairs),
+			$where
+		);
 
 		$ok = $db->Execute($sql, $valarr);
 		if ($ok) {
diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php
index 901e3b10..a3262dcd 100644
--- a/adodb-active-recordx.inc.php
+++ b/adodb-active-recordx.inc.php
@@ -648,11 +648,11 @@ class ADODB_Active_Record
 	// So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook
 	function Reload()
 	{
-		$db =& $this->DB();
+		$db = $this->DB();
 		if (!$db) {
 			return false;
 		}
-		$table =& $this->TableInfo();
+		$table = $this->TableInfo();
 		$where = $this->GenWhere($db, $table);
 		return ($this->Load($where));
 	}
@@ -768,11 +768,9 @@ class ADODB_Active_Record
 					(strncmp($val, "'", 1) != 0 || substr($val, strlen($val) - 1, 1) != "'")
 				) {
 					return $db->qstr($val);
-					break;
 				}
 			default:
 				return $val;
-				break;
 		}
 	}
 
@@ -804,7 +802,8 @@ class ADODB_Active_Record
 
 		$save = $db->SetFetchMode(ADODB_FETCH_NUM);
 		$qry = "select * from " . $this->_table;
-		$table =& $this->TableInfo();
+		$table = $this->TableInfo();
+
 
 		if (($k = reset($table->keys))) {
 			$hasManyId = $k;
@@ -1178,7 +1177,7 @@ class ADODB_Active_Record
 		return array_keys($table->flds);
 	}
 
-};
+}
 
 function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr,
 			$extra, $relations)