diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php
index 65cc34f5d3..4110a0db60 100644
--- a/libraries/classes/Controllers/LintController.php
+++ b/libraries/classes/Controllers/LintController.php
@@ -32,7 +32,7 @@ class LintController extends AbstractController
          * The client, which will receive the JSON response will decode the message and
          * and any HTML fragments that are displayed to the user will be encoded anyway.
          *
-         * @var string
+         * @var string $sqlQuery
          */
         $sqlQuery = $request->getParsedBodyParam('sql_query', '');
 
diff --git a/libraries/classes/Linter.php b/libraries/classes/Linter.php
index b0742b27f2..ec38f1ac56 100644
--- a/libraries/classes/Linter.php
+++ b/libraries/classes/Linter.php
@@ -131,8 +131,6 @@ class Linter
 
         /**
          * The response containing of all errors.
-         *
-         * @var array
          */
         $response = [];
 
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index ab1d7724ee..6eaf353c32 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -1462,7 +1462,7 @@ class ExportSql extends ExportPlugin
                 /**
                  * `CREATE TABLE` statement.
                  *
-                 * @var CreateStatement
+                 * @var CreateStatement $statement
                  */
                 $statement = $parser->statements[0];
 
@@ -1537,7 +1537,7 @@ class ExportSql extends ExportPlugin
             /**
              * `CREATE TABLE` statement.
              *
-             * @var CreateStatement
+             * @var CreateStatement $statement
              */
             $statement = $parser->statements[0];
 
@@ -1555,37 +1555,26 @@ class ExportSql extends ExportPlugin
 
                 /**
                  * Fragments containing definition of each constraint.
-                 *
-                 * @var array
                  */
                 $constraints = [];
 
                 /**
                  * Fragments containing definition of each index.
-                 *
-                 * @var array
                  */
                 $indexes = [];
 
                 /**
                  * Fragments containing definition of each FULLTEXT index.
-                 *
-                 * @var array
                  */
                 $indexesFulltext = [];
 
                 /**
-                 * Fragments containing definition of each foreign key that will
-                 * be dropped.
-                 *
-                 * @var array
+                 * Fragments containing definition of each foreign key that will be dropped.
                  */
                 $dropped = [];
 
                 /**
                  * Fragment containing definition of the `AUTO_INCREMENT`.
-                 *
-                 * @var array
                  */
                 $autoIncrement = [];
 
@@ -1639,15 +1628,11 @@ class ExportSql extends ExportPlugin
 
                 /**
                  * The header of the `ALTER` statement (`ALTER TABLE tbl`).
-                 *
-                 * @var string
                  */
                 $alterHeader = 'ALTER TABLE ' . Util::backquoteCompat($tableAlias, $compat, $GLOBALS['sql_backquotes']);
 
                 /**
                  * The footer of the `ALTER` statement (usually ';')
-                 *
-                 * @var string
                  */
                 $alterFooter = ';' . "\n";
 
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 0f086776a5..a300a04882 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -42,9 +42,6 @@
     <rule ref="SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion.RequiredConstructorPropertyPromotion">
         <severity>4</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat">
-        <severity>4</severity>
-    </rule>
     <rule ref="SlevomatCodingStandard.Commenting.RequireOneLineDocComment.MultiLineDocComment">
         <severity>4</severity>
     </rule>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 782175c243..93bc883da1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5525,11 +5525,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Linter.php
 
-		-
-			message: "#^PHPDoc tag @var has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Linter.php
-
 		-
 			message: "#^Parameter \\#2 \\$pos of static method PhpMyAdmin\\\\Linter\\:\\:findLineNumberAndColumn\\(\\) expects int, int\\|string\\|null given\\.$#"
 			count: 1
@@ -6405,11 +6400,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^PHPDoc tag @var has no value type specified in iterable type array\\.$#"
-			count: 5
-			path: libraries/classes/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Parameter \\#1 \\$list of class PhpMyAdmin\\\\SqlParser\\\\Parser constructor expects PhpMyAdmin\\\\SqlParser\\\\TokensList\\|PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string\\|null, \\(array\\<int, string\\>\\|string\\|null\\) given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2b44785ef1..23eb48058a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -11263,12 +11263,7 @@
       <code><![CDATA[$trigger['create']]]></code>
     </MixedArgument>
     <MixedArgumentTypeCoercion>
-      <code>$autoIncrement</code>
       <code>$compats</code>
-      <code>$constraints</code>
-      <code>$dropped</code>
-      <code>$indexes</code>
-      <code>$indexesFulltext</code>
     </MixedArgumentTypeCoercion>
     <MixedArrayAccess>
       <code><![CDATA[$GLOBALS['cfg']['Export']['remove_definer_from_definitions']]]></code>