From c40390c202016db26621c65713aa3e890b5c4809 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 3 Oct 2021 15:22:40 -0400
Subject: [PATCH 1/2] Revert "Explicitly cast Url objects to string"

This reverts commit ee5aa2d4327699ae80c281c6aebbeaf6f06be269.
---
 src/Navigation/Notifications/Depository/Notify.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Navigation/Notifications/Depository/Notify.php b/src/Navigation/Notifications/Depository/Notify.php
index 73eff7694d..4c7a1ef33d 100644
--- a/src/Navigation/Notifications/Depository/Notify.php
+++ b/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,

From 24734b05fef936f77b6e9f1b2d36cad49575e1b9 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 3 Oct 2021 15:23:35 -0400
Subject: [PATCH 2/2] Cast object parameters to string in Database\Database

- This makes string casting in Depository->save unnecessary
---
 src/Database/Database.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Database/Database.php b/src/Database/Database.php
index fe137b39be..a654cccc5b 100644
--- a/src/Database/Database.php
+++ b/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
 	 *