Merge remote-tracking branch 'upstream/develop' into photo-guid

src/Database/Database.php

@@ -549,12 +549,14 @@ class Database
 					break;
 				}
 
-				foreach ($args as $param => $value) {
+				foreach (array_keys($args) as $param) {
+					$data_type = PDO::PARAM_STR;
 					if (is_int($args[$param])) {
 						$data_type = PDO::PARAM_INT;
-					} else {
-						$data_type = PDO::PARAM_STR;
+					} elseif ($args[$param] !== null) {
+						$args[$param] = (string)$args[$param];
 					}
+
 					$stmt->bindParam($param, $args[$param], $data_type);
 				}
 
@@ -605,13 +607,16 @@ class Database
 
 				$param_types = '';
 				$values      = [];
-				foreach ($args as $param => $value) {
+				foreach (array_keys($args) as $param) {
 					if (is_int($args[$param])) {
 						$param_types .= 'i';
 					} elseif (is_float($args[$param])) {
 						$param_types .= 'd';
 					} elseif (is_string($args[$param])) {
 						$param_types .= 's';
+					} elseif (is_object($args[$param]) && method_exists($args[$param], '__toString')) {
+						$param_types .= 's';
+						$args[$param] = (string)$args[$param];
 					} else {
 						$param_types .= 'b';
 					}
@@ -969,7 +974,7 @@ class Database
 	}
 
 	/**
-	 * Insert a row into a table
+	 * Insert a row into a table. Field value objects will be cast as string.
 	 *
 	 * @param string|array $table          Table name or array [schema => table]
 	 * @param array        $param          parameter array
@@ -1244,9 +1249,9 @@ class Database
 	}
 
 	/**
-	 * Updates rows
+	 * Updates rows in the database. Field value objects will be cast as string.
 	 *
-	 * Updates rows in the database. When $old_fields is set to an array,
+	 * When $old_fields is set to an array,
 	 * the system will only do an update if the fields in that array changed.
 	 *
 	 * Attention:
@@ -1561,9 +1566,9 @@ class Database
 			}
 		}
 
-		return $fields;	
+		return $fields;
 	}
-	
+
 	/**
 	 * Returns the error number of the last query
 	 *

src/Model/User.php

@@ -850,6 +850,10 @@ class User
 	 */
 	public static function getAvatarUrl(array $user, string $size = ''):string
 	{
+		if (empty($user['nickname'])) {
+			DI::logger()->warning('Missing user nickname key', ['trace' => System::callstack(20)]);
+		}
+
 		$url = DI::baseUrl() . '/photo/';
 
 		switch ($size) {

src/Module/Photo.php

@@ -108,7 +108,7 @@ class Photo extends BaseModule
 			}
 
 			// Please refactor this for the love of everything that's good
-			if (!empty($parameters['id'])) {
+			if (isset($parameters['id'])) {
 				$id = $parameters['id'];
 			}
 

src/Navigation/Notifications/Depository/Notify.php

@@ -104,11 +104,11 @@ class Notify extends BaseDepository
 		$fields = [
 			'type'          => $Notify->type,
 			'name'          => $Notify->name,
-			'url'           => (string)$Notify->url,
-			'photo'         => (string)$Notify->photo,
+			'url'           => $Notify->url,
+			'photo'         => $Notify->photo,
 			'msg'           => $Notify->msg,
 			'uid'           => $Notify->uid,
-			'link'          => (string)$Notify->link,
+			'link'          => $Notify->link,
 			'iid'           => $Notify->itemId,
 			'parent'        => $Notify->parent,
 			'seen'          => $Notify->seen,

src/Protocol/Feed.php

@@ -69,6 +69,8 @@ class Feed
 			Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]);
 		}
 
+		$xml = trim($xml);
+
 		if (empty($xml)) {
 			Logger::info('XML is empty.');
 			return [];
@@ -83,7 +85,7 @@ class Feed
 		}
 
 		$doc = new DOMDocument();
-		@$doc->loadXML(trim($xml));
+		@$doc->loadXML($xml);
 		$xpath = new DOMXPath($doc);
 		$xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
 		$xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/");