From 04ed73be261d5e4ec952f26ed85e451270b032a8 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 1 Apr 2025 19:14:44 +0200
Subject: [PATCH] Explicitly mark nullable params (thanks to @dg)

---
 adminer/drivers/mysql.inc.php     | 4 ++--
 adminer/include/editing.inc.php   | 2 +-
 adminer/include/functions.inc.php | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index b619d791..21caed71 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -535,7 +535,7 @@ if (!defined('Adminer\DRIVER')) {
 	/** Get table indexes
 	* @return Index[]
 	*/
-	function indexes(string $table, Db $connection2 = null): array {
+	function indexes(string $table, ?Db $connection2 = null): array {
 		$return = array();
 		foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
 			$name = $row["Key_name"];
@@ -1065,7 +1065,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Set current schema
 	*/
-	function set_schema(string $schema, Db $connection2 = null): bool {
+	function set_schema(string $schema, ?Db $connection2 = null): bool {
 		return true;
 	}
 }
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 36c5af15..d5f8763a 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -9,7 +9,7 @@ namespace Adminer;
 * @param int|numeric-string $limit
 * @return string[] $orgtables
 */
-function print_select_result($result, Db $connection2 = null, array $orgtables = array(), $limit = 0): array {
+function print_select_result($result, ?Db $connection2 = null, array $orgtables = array(), $limit = 0): array {
 	$links = array(); // colno => orgtable - create links from these columns
 	$indexes = array(); // orgtable => array(column => colno) - primary keys
 	$columns = array(); // orgtable => array(column => ) - not selected columns in primary key
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 1e72ae5a..a2882a6e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -7,7 +7,7 @@ namespace Adminer;
 * @param ?Db $connection2 custom connection to use instead of the default
 * @return Db
 */
-function connection(Db $connection2 = null) {
+function connection(?Db $connection2 = null) {
 	// can be used in customization, Db::$instance is minified
 	return ($connection2 ?: Db::$instance);
 }
@@ -108,7 +108,7 @@ function bracket_escape(string $idf, bool $back = false): string {
 * @param string|float $version required version
 * @param string|float $maria_db required MariaDB version
 */
-function min_version($version, $maria_db = "", Db $connection2 = null): bool {
+function min_version($version, $maria_db = "", ?Db $connection2 = null): bool {
 	$connection2 = connection($connection2);
 	$server_info = $connection2->server_info;
 	if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
@@ -191,7 +191,7 @@ function get_vals(string $query, $column = 0): array {
 /** Get keys from first column and values from second
 * @return string[]
 */
-function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = true): array {
+function get_key_vals(string $query, ?Db $connection2 = null, bool $set_keys = true): array {
 	$connection2 = connection($connection2);
 	$return = array();
 	$result = $connection2->query($query);
@@ -210,7 +210,7 @@ function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = tr
 /** Get all rows of result
 * @return list<string[]> of associative arrays
 */
-function get_rows(string $query, Db $connection2 = null, string $error = "<p class='error'>"): array {
+function get_rows(string $query, ?Db $connection2 = null, string $error = "<p class='error'>"): array {
 	$conn = connection($connection2);
 	$return = array();
 	$result = $conn->query($query);