From 291ae7f1aceaba97d75c7197fe97b6156c453f52 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 29 Mar 2025 22:14:51 +0100
Subject: [PATCH] Fix types of $connection2

---
 adminer/drivers/mysql.inc.php     |  9 ++++++---
 adminer/include/editing.inc.php   |  4 ++--
 adminer/include/functions.inc.php | 14 ++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 4540abbf..ece0ee45 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -538,9 +538,10 @@ if (!defined('Adminer\DRIVER')) {
 	}
 
 	/** Get table indexes
+	* @param Db|string $connection2
 	* @return Index[]
 	*/
-	function indexes(string $table, ?Db $connection2 = null): array {
+	function indexes(string $table, $connection2 = null): array {
 		$return = array();
 		foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
 			$name = $row["Key_name"];
@@ -1068,8 +1069,10 @@ if (!defined('Adminer\DRIVER')) {
 		return "";
 	}
 
-	/** Set current schema */
-	function set_schema(string $schema, Db $connection2 = null): bool {
+	/** Set current schema
+	* @param Db|string $connection2
+	*/
+	function set_schema(string $schema, $connection2 = null): bool {
 		return true;
 	}
 }
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index eb70db95..68c4116e 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -5,12 +5,12 @@ namespace Adminer;
 
 /** Print select result
 * @param Result $result
-* @param Db $connection2 connection to examine indexes
+* @param Db|string $connection2
 * @param string[] $orgtables
 * @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, $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 7b8e38c3..1f4fcb16 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -6,7 +6,7 @@ namespace Adminer;
 /** Get database connection
 * @return Db|string string means error
 */
-function connection() {
+function connection($special = null) {
 	// can be used in customization, Db::$instance is minified
 	return Db::$instance;
 }
@@ -96,10 +96,10 @@ function bracket_escape(string $idf, bool $back = false): string {
 /** Check if connection has at least the given version
 * @param string|float $version required version
 * @param string|float $maria_db required MariaDB version
-* @param Db $connection2 defaults to connection()
+* @param Db|string $connection2 defaults to connection()
 */
-function min_version($version, $maria_db = "", Db $connection2 = null): bool {
-	if (!$connection2) {
+function min_version($version, $maria_db = "", $connection2 = null): bool {
+	if (!is_object($connection2)) {
 		$connection2 = connection();
 	}
 	$server_info = $connection2->server_info;
@@ -181,9 +181,10 @@ function get_vals(string $query, $column = 0): array {
 }
 
 /** Get keys from first column and values from second
+* @param Db|string $connection2
 * @return string[]
 */
-function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = true): array {
+function get_key_vals(string $query, $connection2 = null, bool $set_keys = true): array {
 	if (!is_object($connection2)) {
 		$connection2 = connection();
 	}
@@ -202,9 +203,10 @@ function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = tr
 }
 
 /** Get all rows of result
+* @param Db|string $connection2
 * @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, $connection2 = null, string $error = "<p class='error'>"): array {
 	$conn = (is_object($connection2) ? $connection2 : connection());
 	$return = array();
 	$result = $conn->query($query);