diff --git a/composer.lock b/composer.lock
index 26ace3953d..7871402170 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5420,11 +5420,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.41",
+            "version": "2.1.47",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a2eae8f20856b3afe74bf1f9726ce8c11438e300",
-                "reference": "a2eae8f20856b3afe74bf1f9726ce8c11438e300",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/79015445d8bd79e62b29140f12e5bfced1dcca65",
+                "reference": "79015445d8bd79e62b29140f12e5bfced1dcca65",
                 "shasum": ""
             },
             "require": {
@@ -5469,7 +5469,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-03-16T18:24:10+00:00"
+            "time": "2026-04-13T15:49:08+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bdef642f1c..26d75262eb 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1020,6 +1020,12 @@ parameters:
 			count: 1
 			path: src/Config/Validator.php
 
+		-
+			message: '#^Offset ''Servers/1…'' on non\-empty\-array\<mixed\> in empty\(\) always exists and is not falsy\.$#'
+			identifier: empty.offset
+			count: 1
+			path: src/Config/Validator.php
+
 		-
 			message: '#^Only booleans are allowed in a negated boolean, mysqli\|false given\.$#'
 			identifier: booleanNot.exprNotBoolean
@@ -4788,6 +4794,12 @@ parameters:
 			count: 1
 			path: src/Dbal/DatabaseInterface.php
 
+		-
+			message: '#^Cannot assign new offset to array\<string\|null\>\|string\|null\.$#'
+			identifier: offsetAssign.dimType
+			count: 1
+			path: src/Dbal/DatabaseInterface.php
+
 		-
 			message: '#^Cannot cast mixed to string\.$#'
 			identifier: cast.string
@@ -4806,6 +4818,12 @@ parameters:
 			count: 1
 			path: src/Dbal/DatabaseInterface.php
 
+		-
+			message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:fetchResultMultidimensional\(\) should return array\<mixed\> but returns array\<string\|null\>\|string\|null\.$#'
+			identifier: return.type
+			count: 1
+			path: src/Dbal/DatabaseInterface.php
+
 		-
 			message: '#^Method PhpMyAdmin\\Dbal\\DatabaseInterface\:\:getColumnNames\(\) should return list\<string\> but returns list\<string\|null\>\.$#'
 			identifier: return.type
@@ -4836,12 +4854,6 @@ parameters:
 			count: 1
 			path: src/Dbal/DatabaseInterface.php
 
-		-
-			message: '#^Offset string\|null on array\{\} in isset\(\) does not exist\.$#'
-			identifier: isset.offset
-			count: 1
-			path: src/Dbal/DatabaseInterface.php
-
 		-
 			message: '#^Only booleans are allowed in &&, int\|false given on the left side\.$#'
 			identifier: booleanAnd.leftNotBoolean
@@ -6438,7 +6450,13 @@ parameters:
 		-
 			message: '#^Cannot access offset int\<0, max\> on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
-			count: 8
+			count: 6
+			path: src/Gis/GisMultiPolygon.php
+
+		-
+			message: '#^Cannot access offset int\<0, max\> on non\-empty\-array\<''data_length''\|int\<0, max\>, array\{x\: float, y\: float\}\|int\<0, max\>\>\|int\<1, max\>\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
 			path: src/Gis/GisMultiPolygon.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index f5bc832eb1..0e036cf046 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -8042,12 +8042,12 @@
       <code><![CDATA[$statement->altered]]></code>
       <code><![CDATA[$statement->altered]]></code>
     </PossiblyNullIterator>
+    <PossiblyUndefinedVariable>
+      <code><![CDATA[$maintainRelations]]></code>
+    </PossiblyUndefinedVariable>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[! $relationParams[$work]]]></code>
     </RiskyTruthyFalsyComparison>
-    <UnusedVariable>
-      <code><![CDATA[$maintainRelations]]></code>
-    </UnusedVariable>
   </file>
   <file src="src/Theme/Theme.php">
     <MixedArgument>
diff --git a/src/Table/TableMover.php b/src/Table/TableMover.php
index d06b726e28..c17dffd167 100644
--- a/src/Table/TableMover.php
+++ b/src/Table/TableMover.php
@@ -98,7 +98,7 @@ class TableMover
             return true;
         }
 
-        if ($what === MoveScope::DataOnly || isset($maintainRelations)) {
+        if ($what === MoveScope::DataOnly || $maintainRelations) {
             return true;
         }