Implicitly nullable types are deprecated in PHP 8.3, make explicit

1 files changed, 9 insertions, 9 deletions

diff --git a/inc/database.inc.php b/inc/database.inc.php
index 278fd8f0..949e6825 100644
--- a/inc/database.inc.php
+++ b/inc/database.inc.php
@@ -71,7 +71,7 @@ class Database
 	 *
 	 * @return array|boolean Associative array representing row, or false if no row matches the query
 	 */
-	public static function queryFirst(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryFirst(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -86,7 +86,7 @@ class Database
 	 *
 	 * @return array|bool List of associative arrays representing rows, or false on error
 	 */
-	public static function queryAll(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryAll(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -99,7 +99,7 @@ class Database
 	 *
 	 * @return array|bool List of values representing first column of query
 	 */
-	public static function queryColumnArray(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryColumnArray(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -112,7 +112,7 @@ class Database
 	 *
 	 * @return array|bool Associative array, first column is key, second column is value
 	 */
-	public static function queryKeyValueList(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryKeyValueList(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -132,7 +132,7 @@ class Database
 	 *
 	 * @return array|bool Associative array, first column is key, remaining columns are array values
 	 */
-	public static function queryGroupList(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryGroupList(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -147,7 +147,7 @@ class Database
 	 *
 	 * @return array|bool Associative array, first column is key, remaining columns are array values
 	 */
-	public static function queryIndexedList(string $query, array $args = [], bool $ignoreError = null)
+	public static function queryIndexedList(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -164,7 +164,7 @@ class Database
 	 * @param ?bool $ignoreError Ignore query errors and just return false
 	 * @return int|boolean Number of rows affected, or false on error
 	 */
-	public static function exec(string $query, array $args = [], bool $ignoreError = null)
+	public static function exec(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		$res = self::simpleQuery($query, $args, $ignoreError);
 		if ($res === false)
@@ -198,7 +198,7 @@ class Database
 	 *
 	 * @return \PDOStatement|false The query result object
 	 */
-	public static function simpleQuery(string $query, array $args = [], bool $ignoreError = null)
+	public static function simpleQuery(string $query, array $args = [], ?bool $ignoreError = null)
 	{
 		self::init();
 		if (CONFIG_DEBUG && !isset(self::$explainList[$query]) && preg_match('/^\s*SELECT/i', $query)) {
@@ -417,7 +417,7 @@ class Database
 	 * @param ?array $additionalValues assoc array containing columnName => value mapping
 	 * @return int AUTO_INCREMENT value matching the given unique values entry
 	 */
-	public static function insertIgnore(string $table, string $aiKey, array $uniqueValues, array $additionalValues = null): int
+	public static function insertIgnore(string $table, string $aiKey, array $uniqueValues, ?array $additionalValues = null): int
 	{
 		// Sanity checks
 		if (array_key_exists($aiKey, $uniqueValues)) {