Fix an issue reported by PHPStan

MauricioFauth · MauricioFauth · commit 7aec65222ae4 · 2022-02-28T12:21:11.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
@@ -32,6 +32,7 @@
 use function ini_set;
 use function is_array;
 use function is_scalar;
+use function is_string;
 use function mb_internal_encoding;
 use function mb_strlen;
 use function mb_strpos;
@@ -148,7 +149,10 @@ public static function run(): void
          */
         $sql_query = '';
         if ($request->isPost()) {
-            $sql_query = $request->getParsedBodyParam('sql_query', '');
+            $sql_query = $request->getParsedBodyParam('sql_query');
+            if (! is_string($sql_query)) {
+                $sql_query = '';
+            }
         }
 
         $containerBuilder->setParameter('sql_query', $sql_query);
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -145,11 +145,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Common.php
 
-		-
-			message: "#^Parameter \\#2 \\$value of method Symfony\\\\Component\\\\DependencyInjection\\\\Container\\:\\:setParameter\\(\\) expects array\\|bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
-			count: 1
-			path: libraries/classes/Common.php
-
 		-
 			message: "#^Static property PhpMyAdmin\\\\SqlParser\\\\Lexer\\:\\:\\$DEFAULT_DELIMITER \\(string\\) does not accept mixed\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.21.0@d8bec4c7aaee111a532daec32fb09de5687053d1">
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="index.php">
     <InvalidGlobal occurrences="1">
       <code>global $containerBuilder;</code>
@@ -250,15 +250,14 @@
     </NonInvariantDocblockPropertyType>
   </file>
   <file src="libraries/classes/Common.php">
-    <MixedArgument occurrences="9">
+    <MixedArgument occurrences="8">
       <code>$_REQUEST['back']</code>
       <code>$_REQUEST['goto']</code>
       <code>$_SESSION[' PMA_token ']</code>
       <code>$back</code>
       <code>$cfg['Server']['user']</code>
       <code>$goto</code>
       <code>$sqlDelimiter</code>
-      <code>$sql_query</code>
       <code>$urlParams</code>
     </MixedArgument>
     <MixedArrayAccess occurrences="3">
