Change type hint

kamil-tekiela · MauricioFauth · commit 9ccec4b4c1b4 · 2024-11-13T14:40:16.000-03:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -3060,11 +3060,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Server/PrivilegesController.php
 
-		-
-			message: "#^Parameter \\#4 \\$dbname of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:updatePrivileges\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: src/Controllers/Server/PrivilegesController.php
-
 		-
 			message: "#^Parameter \\#4 \\$hostname of method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getHtmlForUserProperties\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -12316,6 +12311,11 @@ parameters:
 			count: 1
 			path: src/Server/Privileges.php
 
+		-
+			message: "#^Method PhpMyAdmin\\\\Server\\\\Privileges\\:\\:getDbname\\(\\) should return array\\<string\\>\\|string\\|null but returns array\\<mixed\\>\\|string\\|null\\.$#"
+			count: 1
+			path: src/Server/Privileges.php
+
 		-
 			message: "#^Offset '@@old_passwords' does not exist on array\\<string\\|null\\>\\|null\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2446,7 +2446,6 @@
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
-      <code><![CDATA[$dbName ?? '']]></code>
       <code><![CDATA[$request->getQueryParam('initial')]]></code>
       <code><![CDATA[$urlDbname ?? '']]></code>
       <code><![CDATA[$urlDbname ?? '']]></code>
@@ -2456,7 +2455,6 @@
     </MixedArgumentTypeCoercion>
     <MixedAssignment>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
-      <code><![CDATA[$dbName]]></code>
     </MixedAssignment>
     <RedundantConditionGivenDocblockType>
       <code><![CDATA[! empty($GLOBALS['message']) && $GLOBALS['message'] instanceof Message]]></code>
@@ -9826,8 +9824,10 @@
       <code><![CDATA[$origValue]]></code>
     </MixedOperand>
     <MixedReturnTypeCoercion>
+      <code><![CDATA[$dbname]]></code>
       <code><![CDATA[$extraData]]></code>
       <code><![CDATA[(string|bool)[]]]></code>
+      <code><![CDATA[string|string[]|null]]></code>
     </MixedReturnTypeCoercion>
     <PossiblyFalseOperand>
       <code><![CDATA[mb_strpos($row1['Type'], '(')]]></code>
diff --git a/src/Controllers/Server/PrivilegesController.php b/src/Controllers/Server/PrivilegesController.php
@@ -203,7 +203,7 @@ public function __invoke(ServerRequest $request): Response
                         $GLOBALS['username'] ?? '',
                         $GLOBALS['hostname'] ?? '',
                         $tablename ?? $routinename ?? '',
-                        $dbName ?? '',
+                        $dbName,
                         $itemType,
                     );
                 }
diff --git a/src/Server/Privileges.php b/src/Server/Privileges.php
@@ -3303,7 +3303,7 @@ public function getTablename(ServerRequest $request): string|null
         return null;
     }
 
-    /** @return string|mixed[]|null */
+    /** @return string|string[]|null */
     public function getDbname(ServerRequest $request): string|array|null
     {
         $dbname = null;

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function __invoke(ServerRequest $request): Response`
`203`	`203`	`$GLOBALS['username'] ?? '',`
`204`	`204`	`$GLOBALS['hostname'] ?? '',`
`205`	`205`	`$tablename ?? $routinename ?? '',`
`206`		`- $dbName ?? '',`
	`206`	`+ $dbName,`
`207`	`207`	`$itemType,`
`208`	`208`	`);`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3303,7 +3303,7 @@ public function getTablename(ServerRequest $request): string\|null`
`3303`	`3303`	`return null;`
`3304`	`3304`	`}`
`3305`	`3305`
`3306`		`- /** @return string\|mixed[]\|null */`
	`3306`	`+ /** @return string\|string[]\|null */`
`3307`	`3307`	`public function getDbname(ServerRequest $request): string\|array\|null`
`3308`	`3308`	`{`
`3309`	`3309`	`$dbname = null;`