diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6e47da5eba..33786b6468 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2270,11 +2270,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/GetFieldController.php
 
-		-
-			message: "#^Class PhpMyAdmin\\\\Controllers\\\\Table\\\\GisVisualizationController has an uninitialized property \\$visualization\\. Give it default value or assign it in the constructor\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Table/GisVisualizationController.php
-
 		-
 			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, mixed given\\.$#"
 			count: 1
@@ -4605,53 +4600,18 @@ parameters:
 			count: 1
 			path: libraries/classes/Gis/GisPolygon.php
 
-		-
-			message: "#^Call to function is_numeric\\(\\) with int will always evaluate to true\\.$#"
-			count: 2
-			path: libraries/classes/Gis/GisVisualization.php
-
 		-
 			message: "#^Cannot call method Output\\(\\) on mixed\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisVisualization.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot cast mixed to int\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisVisualization.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:fetchRawData\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:get\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:getByData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:getByData\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:getSettings\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:prepareDataSet\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Cannot cast mixed to string\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisVisualization.php
 
@@ -4660,51 +4620,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Gis/GisVisualization.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:scaleDataSet\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:scaleDataSet\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: libraries/classes/Gis/GisVisualization.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:setUserSpecifiedSettings\\(\\) has parameter \\$userSpecifiedSettings with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Parameter \\#1 \\$sql_query of class PhpMyAdmin\\\\Gis\\\\GisVisualization constructor expects string, null given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Parameter \\#3 \\$row of class PhpMyAdmin\\\\Gis\\\\GisVisualization constructor expects int, null given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Parameter \\#4 \\$pos of class PhpMyAdmin\\\\Gis\\\\GisVisualization constructor expects int, null given\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Property PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Property PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:\\$settings type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
-		-
-			message: "#^Property PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:\\$userSpecifiedSettings type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: libraries/classes/Gis/GisVisualization.php
-
 		-
 			message: "#^Cannot access offset 1 on array\\|false\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d5a032645a..ff21ed125c 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3718,44 +3718,16 @@
     </PossiblyUnusedParam>
   </file>
   <file src="libraries/classes/Controllers/Table/GisVisualizationController.php">
-    <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['errorUrl']]]></code>
-    </InvalidArrayOffset>
     <MixedArrayAccess>
       <code><![CDATA[$_SESSION['tmpval']['max_rows']]]></code>
       <code><![CDATA[$_SESSION['tmpval']['pos']]]></code>
     </MixedArrayAccess>
-    <MixedAssignment>
-      <code><![CDATA[$GLOBALS['errorUrl']]]></code>
-      <code>$val</code>
-      <code>$visualizationSettings[$setting]</code>
-    </MixedAssignment>
     <PossiblyInvalidArgument>
       <code><![CDATA[$_GET['fileFormat']]]></code>
-      <code><![CDATA[$_GET['sql_query']]]></code>
-      <code><![CDATA[$_GET['sql_signature']]]></code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code><![CDATA[$visualizationSettings['spatialColumn']]]></code>
     </PossiblyInvalidArgument>
     <PossiblyInvalidCast>
       <code><![CDATA[$_GET['fileFormat']]]></code>
-      <code><![CDATA[$_GET['sql_query']]]></code>
-      <code><![CDATA[$_GET['sql_signature']]]></code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code>$sqlQuery</code>
-      <code><![CDATA[$visualizationSettings['spatialColumn']]]></code>
     </PossiblyInvalidCast>
-    <PossiblyUndefinedArrayOffset>
-      <code>$spatialCandidates[0]</code>
-    </PossiblyUndefinedArrayOffset>
-    <PropertyNotSetInConstructor>
-      <code>$visualization</code>
-    </PropertyNotSetInConstructor>
     <RedundantCast>
       <code><![CDATA[(int) $GLOBALS['cfg']['MaxRows']]]></code>
     </RedundantCast>
@@ -7627,80 +7599,12 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Gis/GisVisualization.php">
-    <MixedArgument>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$this->settings['height']]]></code>
-      <code><![CDATA[$this->settings['width']]]></code>
-      <code><![CDATA[$this->userSpecifiedSettings['labelColumn']]]></code>
-      <code><![CDATA[$this->userSpecifiedSettings['spatialColumn']]]></code>
-      <code><![CDATA[$this->userSpecifiedSettings['spatialColumn']]]></code>
-      <code><![CDATA[$this->userSpecifiedSettings['spatialColumn']]]></code>
-    </MixedArgument>
-    <MixedArrayAccess>
-      <code><![CDATA[$row[$this->settings['labelColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row['srid']]]></code>
-      <code><![CDATA[$row['srid']]]></code>
-    </MixedArrayAccess>
-    <MixedArrayOffset>
-      <code><![CDATA[$row[$this->settings['labelColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-      <code><![CDATA[$row[$this->settings['spatialColumn']]]]></code>
-    </MixedArrayOffset>
     <MixedAssignment>
       <code>$pdf</code>
-      <code>$plot_height</code>
-      <code>$plot_width</code>
-      <code>$ratio</code>
-      <code>$row</code>
-      <code>$row</code>
-      <code>$row</code>
-      <code>$scale</code>
-      <code>$x</code>
-      <code>$x_ratio</code>
-      <code>$y</code>
-      <code>$y_ratio</code>
     </MixedAssignment>
     <MixedMethodCall>
       <code>Output</code>
     </MixedMethodCall>
-    <MixedOperand>
-      <code>$border / $scale</code>
-      <code>$border / $scale</code>
-      <code><![CDATA[$min_max->maxX + $min_max->minX - $this->settings['width'] / $scale]]></code>
-      <code><![CDATA[$min_max->maxY + $min_max->minY - $this->settings['height'] / $scale]]></code>
-      <code>$plot_height</code>
-      <code>$plot_width</code>
-      <code>$ratio</code>
-      <code>$scale</code>
-      <code>$scale</code>
-      <code><![CDATA[$this->settings['height']]]></code>
-      <code><![CDATA[$this->settings['height']]]></code>
-      <code><![CDATA[$this->settings['height'] / $scale]]></code>
-      <code><![CDATA[$this->settings['width']]]></code>
-      <code><![CDATA[$this->settings['width']]]></code>
-      <code><![CDATA[$this->settings['width'] / $scale]]></code>
-    </MixedOperand>
-    <NullArgument>
-      <code>null</code>
-      <code>null</code>
-      <code>null</code>
-    </NullArgument>
     <PossiblyInvalidArgument>
       <code>$results</code>
     </PossiblyInvalidArgument>
@@ -7712,10 +7616,6 @@
       <code>mb_strtolower($user_extension) !== $required_extension</code>
       <code>mb_strtolower($user_extension) !== $required_extension</code>
     </RedundantCondition>
-    <RedundantConditionGivenDocblockType>
-      <code>is_numeric($pos)</code>
-      <code>is_numeric($rows)</code>
-    </RedundantConditionGivenDocblockType>
   </file>
   <file src="libraries/classes/Git.php">
     <MixedArgument>