gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Help out phpstan by removing ternary

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-09-17 10:27:04 +01:00
parent 5ae6f2c2d2
commit cb0edc1b07
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -4125,11 +4125,6 @@ parameters:
count: 3
path: src/Controllers/Table/GisVisualizationController.php
-
message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\GisVisualizationController\\:\\:getVisualizationSettings\\(\\) should return array\\{spatialColumn\\: string, labelColumn\\?\\: string\\} but returns array\\{labelColumn\\?\\: 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

11
src/Controllers/Table/GisVisualizationController.php
View File

@ -225,9 +225,14 @@ final class GisVisualizationController implements InvocableController
}
// 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];
if (
isset($settingsIn['spatialColumn']) &&
in_array($settingsIn['spatialColumn'], $spatialCandidates, true)
) {
$settings['spatialColumn'] = $settingsIn['spatialColumn'];
} else {
$settings['spatialColumn'] = $spatialCandidates[0];
}
return $settings;
}