From 1091f8a0d571d4df002e32353e98d554a6150e89 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 1 Sep 2026 01:11:01 +0100
Subject: [PATCH] Fix return type of ListDatabase::retrieve()

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 phpstan-baseline.neon | 6 ------
 psalm-baseline.xml    | 3 ---
 src/ListDatabase.php  | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7c355b299e..ccefd95bef 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -7512,12 +7512,6 @@ parameters:
 			count: 1
 			path: src/ListDatabase.php
 
-		-
-			message: '#^Parameter \#2 \$callback of function usort expects callable\(mixed, mixed\)\: int, Closure\(string, string\)\: int\<\-1, 1\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/ListDatabase.php
-
 		-
 			message: '''
 				#^Access to deprecated static property \$route of class PhpMyAdmin\\Routing\\Routing\:
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 116dfd814a..23ce0d4b22 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -4857,9 +4857,6 @@
     </PossiblyNullOperand>
   </file>
   <file src="src/ListDatabase.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[usort($databaseList, strnatcasecmp(...))]]></code>
-    </MixedArgumentTypeCoercion>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($this->config->selectedServer['hide_db'])]]></code>
     </RiskyTruthyFalsyComparison>
diff --git a/src/ListDatabase.php b/src/ListDatabase.php
index 0cc225c226..48eccd65e6 100644
--- a/src/ListDatabase.php
+++ b/src/ListDatabase.php
@@ -75,7 +75,7 @@ class ListDatabase extends ArrayObject
      *
      * @param string|null $likeDbName usually a db_name containing wildcards
      *
-     * @return mixed[]
+     * @return string[]
      */
     protected function retrieve(UserPrivileges $userPrivileges, string|null $likeDbName = null): array
     {