@@ -4125,11 +4125,6 @@ parameters:
 			count: 3
 			path: src/Controllers/Table/GisVisualizationController.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\GisVisualizationController\\:\\:getVisualizationSettings\\(\\) should return array\\{spatialColumn\\: non\\-empty\\-string, labelColumn\\?\\: non\\-empty\\-string\\} but returns array\\{labelColumn\\?\\: non\\-empty\\-string, spatialColumn\\: mixed\\}\\.$#"
-			count: 1
-			path: src/Controllers/Table/GisVisualizationController.php
-
 		-
 			message: "#^Parameter \\#2 \\$format of method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:toFile\\(\\) expects string, mixed given\\.$#"
 			count: 1
@@ -6296,12 +6291,7 @@ parameters:
 			path: src/Dbal/MysqliResult.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Dbal\\\\MysqliResult\\:\\:getFieldNames\\(\\) should return array\\<int, non\\-empty\\-string\\> but returns array\\<int, string\\>\\.$#"
-			count: 1
-			path: src/Dbal/MysqliResult.php
-
-		-
-			message: "#^Parameter \\#1 \\$field of class PhpMyAdmin\\\\FieldMetadata constructor expects object\\{name\\: non\\-empty\\-string, orgname\\: string, table\\: string, orgtable\\: string, max_length\\: int, length\\: int, charsetnr\\: int, flags\\: int, type\\: int, decimals\\: int, db\\: string, def\\: string, catalog\\: string\\}, object\\{name\\: string, orgname\\: string, table\\: string, orgtable\\: string, def\\: string, db\\: string, catalog\\: 'def', max_length\\: 0, length\\: int, charsetnr\\: string, flags\\: int, type\\: int, decimals\\: int\\}&stdClass given\\.$#"
+			message: "#^Parameter \\#1 \\$field of class PhpMyAdmin\\\\FieldMetadata constructor expects object\\{name\\: string, orgname\\: string, table\\: string, orgtable\\: string, max_length\\: int, length\\: int, charsetnr\\: int, flags\\: int, type\\: int, decimals\\: int, db\\: string, def\\: string, catalog\\: string\\}, object\\{name\\: string, orgname\\: string, table\\: string, orgtable\\: string, def\\: string, db\\: string, catalog\\: string, max_length\\: int, length\\: int, charsetnr\\: string, flags\\: int, type\\: int, decimals\\: int\\}&stdClass given\\.$#"
 			count: 1
 			path: src/Dbal/MysqliResult.php
 
@@ -6701,7 +6691,7 @@ parameters:
 			path: src/Display/Results.php
 
 		-
-			message: "#^Property PhpMyAdmin\\\\FieldMetadata\\:\\:\\$name \\(non\\-empty\\-string\\) does not accept mixed\\.$#"
+			message: "#^Property PhpMyAdmin\\\\FieldMetadata\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
 			count: 1
 			path: src/Display/Results.php
 
@@ -9221,12 +9211,12 @@ parameters:
 			path: src/Plugins.php
 
 		-
-			message: "#^Call to an undefined method PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem\\:\\:getProperties\\(\\)\\.$#"
+			message: "#^Call to function method_exists\\(\\) with PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem and 'getText' will always evaluate to true\\.$#"
 			count: 1
 			path: src/Plugins.php
 
 		-
-			message: "#^Call to function method_exists\\(\\) with PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem and 'getText' will always evaluate to true\\.$#"
+			message: "#^Cannot call method getProperties\\(\\) on mixed\\.$#"
 			count: 1
 			path: src/Plugins.php
 
@@ -9270,6 +9260,11 @@ parameters:
 			count: 1
 			path: src/Plugins.php
 
+		-
+			message: "#^Parameter \\#3 \\$propertyGroup of static method PhpMyAdmin\\\\Plugins\\:\\:getOneOption\\(\\) expects PhpMyAdmin\\\\Properties\\\\Options\\\\OptionsPropertyItem, mixed given\\.$#"
+			count: 1
+			path: src/Plugins.php
+
 		-
 			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, bool\\|int\\<0, max\\>\\|string given\\.$#"
 			count: 1
@@ -9545,14 +9540,9 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportCsv.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportCsv.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/ExportCsv.php
 
 		-
@@ -9595,14 +9585,9 @@ parameters:
 			count: 3
 			path: src/Plugins/Export/ExportHtmlword.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportHtmlword.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 5
+			count: 6
 			path: src/Plugins/Export/ExportHtmlword.php
 
 		-
@@ -9655,14 +9640,9 @@ parameters:
 			count: 2
 			path: src/Plugins/Export/ExportLatex.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportLatex.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 3
+			count: 4
 			path: src/Plugins/Export/ExportLatex.php
 
 		-
@@ -9735,14 +9715,9 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportOds.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportOds.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/ExportOds.php
 
 		-
@@ -9795,14 +9770,9 @@ parameters:
 			count: 3
 			path: src/Plugins/Export/ExportOdt.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportOdt.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 5
+			count: 6
 			path: src/Plugins/Export/ExportOdt.php
 
 		-
@@ -9875,14 +9845,9 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportPhparray.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportPhparray.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/ExportPhparray.php
 
 		-
@@ -9985,14 +9950,9 @@ parameters:
 			count: 2
 			path: src/Plugins/Export/ExportSql.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportSql.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 9
+			count: 10
 			path: src/Plugins/Export/ExportSql.php
 
 		-
@@ -10180,14 +10140,9 @@ parameters:
 			count: 3
 			path: src/Plugins/Export/ExportTexytext.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportTexytext.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 5
+			count: 6
 			path: src/Plugins/Export/ExportTexytext.php
 
 		-
@@ -10230,14 +10185,9 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportXml.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportXml.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/ExportXml.php
 
 		-
@@ -10275,14 +10225,9 @@ parameters:
 			count: 1
 			path: src/Plugins/Export/ExportYaml.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/ExportYaml.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/ExportYaml.php
 
 		-
@@ -10330,14 +10275,9 @@ parameters:
 			count: 2
 			path: src/Plugins/Export/Helpers/Pdf.php
 
-		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
-			count: 1
-			path: src/Plugins/Export/Helpers/Pdf.php
-
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Export/Helpers/Pdf.php
 
 		-
@@ -14250,6 +14190,26 @@ parameters:
 			count: 1
 			path: tests/end-to-end/TestBase.php
 
+		-
+			message: "#^Parameter \\#1 \\$handle of function curl_errno expects CurlHandle, \\(CurlHandle\\|false\\) given\\.$#"
+			count: 2
+			path: tests/end-to-end/TestBase.php
+
+		-
+			message: "#^Parameter \\#1 \\$handle of function curl_error expects CurlHandle, \\(CurlHandle\\|false\\) given\\.$#"
+			count: 3
+			path: tests/end-to-end/TestBase.php
+
+		-
+			message: "#^Parameter \\#1 \\$handle of function curl_exec expects CurlHandle, \\(CurlHandle\\|false\\) given\\.$#"
+			count: 2
+			path: tests/end-to-end/TestBase.php
+
+		-
+			message: "#^Parameter \\#1 \\$handle of function curl_setopt expects CurlHandle, \\(CurlHandle\\|false\\) given\\.$#"
+			count: 9
+			path: tests/end-to-end/TestBase.php
+
 		-
 			message: "#^Parameter \\#1 \\$handle of method Facebook\\\\WebDriver\\\\Remote\\\\RemoteTargetLocator\\:\\:window\\(\\) expects string, mixed given\\.$#"
 			count: 3
 
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="app/services_loader.php">
     <MixedArgument>
       <code><![CDATA[$argumentName]]></code>
 
@@ -9,6 +9,7 @@
 
 use PhpMyAdmin\Gis\GisFactory;
 use PhpMyAdmin\Gis\GisVisualization;
+use PhpMyAdmin\Gis\GisVisualizationSettings;
 use PhpMyAdmin\Http\Response;
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\ResponseRenderer;
@@ -82,7 +83,7 @@ public function __invoke(ServerRequest $request): Response
         $result = "'" . $wkt . "'," . $srid;
 
         // Generate SVG based visualization
-        $visualizationSettings = ['width' => 450, 'height' => 300, 'spatialColumn' => 'wkt'];
+        $visualizationSettings = new GisVisualizationSettings(450, 300, 'wkt');
         $data = [['wkt' => $wktWithZero, 'srid' => $srid]];
 
         $visualization = GisVisualization::getByData($data, $visualizationSettings);
 
@@ -12,6 +12,7 @@
 use PhpMyAdmin\DbTableExists;
 use PhpMyAdmin\FieldMetadata;
 use PhpMyAdmin\Gis\GisVisualization;
+use PhpMyAdmin\Gis\GisVisualizationSettings;
 use PhpMyAdmin\Html\Generator;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PhpMyAdmin\Http\Response;
@@ -24,6 +25,7 @@
 use PhpMyAdmin\Util;
 
 use function __;
+use function array_search;
 use function in_array;
 use function is_array;
 use function is_string;
@@ -106,9 +108,11 @@ public function __invoke(ServerRequest $request): Response
         }
 
         // Get settings if any posted
-        $visualizationSettings = $this->getVisualizationSettings($spatialCandidates, $labelCandidates);
-        $visualizationSettings['width'] = 600;
-        $visualizationSettings['height'] = 450;
+        $visualizationSettings = $this->getVisualizationSettings(
+            $spatialCandidates,
+            $labelCandidates,
+            $request->getParam('visualizationSettings'),
+        );
 
         $rows = $this->getRows();
         $pos = $this->getPos();
@@ -198,38 +202,34 @@ private function getSqlQuery(): string|null
     /**
      * @param string[] $spatialCandidates
      * @param string[] $labelCandidates
-     * @psalm-param non-empty-list<non-empty-string> $spatialCandidates
-     * @psalm-param list<non-empty-string> $labelCandidates
-     *
-     * @return mixed[];
-     * @psalm-return array{spatialColumn:non-empty-string,labelColumn?:non-empty-string}
+     * @psalm-param non-empty-list<string> $spatialCandidates
+     * @psalm-param list<string> $labelCandidates
      */
-    private function getVisualizationSettings(array $spatialCandidates, array $labelCandidates): array
-    {
-        $settingsIn = [];
-        // Download as PNG/SVG/PDF use _GET and the normal form uses _POST
-        if (is_array($_POST['visualizationSettings'] ?? null)) {
-            /** @var mixed[] $settingsIn */
-            $settingsIn = $_POST['visualizationSettings'];
-        } elseif (is_array($_GET['visualizationSettings'] ?? null)) {
-            /** @var mixed[] $settingsIn */
-            $settingsIn = $_GET['visualizationSettings'];
+    private function getVisualizationSettings(
+        array $spatialCandidates,
+        array $labelCandidates,
+        mixed $settingsIn,
+    ): GisVisualizationSettings {
+        if (! is_array($settingsIn)) {
+            return new GisVisualizationSettings(600, 450, $spatialCandidates[0]);
         }
 
-        $settings = [];
+        $labelColumn = null;
         if (
             isset($settingsIn['labelColumn']) &&
             in_array($settingsIn['labelColumn'], $labelCandidates, true)
         ) {
-            $settings['labelColumn'] = $settingsIn['labelColumn'];
+            $labelColumn = $settingsIn['labelColumn'];
         }
 
         // If spatial column is not set, use first geometric column as spatial column
-        $spatialColumnValid = isset($settingsIn['spatialColumn']) &&
-            in_array($settingsIn['spatialColumn'], $spatialCandidates, true);
-        $settings['spatialColumn'] = $spatialColumnValid ? $settingsIn['spatialColumn'] : $spatialCandidates[0];
+        $spatialColumn = $spatialCandidates[array_search(
+            $settingsIn['spatialColumn'] ?? null,
+            $spatialCandidates,
+            true,
+        )];
 
-        return $settings;
+        return new GisVisualizationSettings(600, 450, $spatialColumn, $labelColumn);
     }
 
     private function getPos(): int
 
@@ -207,7 +207,7 @@ public function seek(int $offset): bool
     }
 
     /**
-     * returns meta info for fields in $result
+     * Returns meta info for fields in $result
      *
      * @return array<int, FieldMetadata> meta info for fields in $result
      * @psalm-return list<FieldMetadata>
@@ -229,8 +229,7 @@ public function getFieldsMeta(): array
     /**
      * Returns the names of the fields in the result
      *
-     * @return array<int, string> Fields names
-     * @psalm-return list<non-empty-string>
+     * @return list<string> Fields names
      */
     public function getFieldNames(): array
     {
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public function seek(int $offset): bool`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/**`
`210`		`- * returns meta info for fields in $result`
	`210`	`+ * Returns meta info for fields in $result`
`211`	`211`	`*`
`212`	`212`	`* @return array<int, FieldMetadata> meta info for fields in $result`
`213`	`213`	`* @psalm-return list<FieldMetadata>`
`@@ -229,8 +229,7 @@ public function getFieldsMeta(): array`
`229`	`229`	`/**`
`230`	`230`	`* Returns the names of the fields in the result`
`231`	`231`	`*`
`232`		`- * @return array<int, string> Fields names`
`233`		`- * @psalm-return list<non-empty-string>`
	`232`	`+ * @return list<string> Fields names`
`234`	`233`	`*/`
`235`	`234`	`public function getFieldNames(): array`
`236`	`235`	`{`