Visitar URL original
Merge #19886 - Remove nullability from labelColumn · phpmyadmin/phpmyadmin@ccdcb9c · GitHub
Skip to content

Commit ccdcb9c

Browse files
committed
Merge #19886 - Remove nullability from labelColumn
Pull-request: #19886 Fixes: #19885 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents e515ecd + 9c589bb commit ccdcb9c

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎src/Controllers/Table/GisVisualizationController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private function getVisualizationSettings(
198198
return new GisVisualizationSettings(600, 450, $spatialCandidates[0]);
199199
}
200200

201-
$labelColumn = null;
201+
$labelColumn = '';
202202
if (
203203
isset($settingsIn['labelColumn']) &&
204204
in_array($settingsIn['labelColumn'], $labelCandidates, true)

‎src/Gis/GisVisualization.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class GisVisualization
6666

6767
private string $spatialColumn;
6868

69-
private string|null $labelColumn;
69+
private string $labelColumn;
7070

7171
public function getWidth(): int
7272
{
@@ -95,7 +95,7 @@ public function getSpatialColumn(): string
9595

9696
public function getLabelColumn(): string|null
9797
{
98-
return $this->labelColumn;
98+
return $this->labelColumn === '' ? null : $this->labelColumn;
9999
}
100100

101101
/**
@@ -202,7 +202,7 @@ private function modifySqlQuery(string $sqlQuery): string
202202
}
203203

204204
// If label column is chosen add it to the query
205-
if ($this->labelColumn !== null) {
205+
if ($this->labelColumn !== '') {
206206
$modifiedQuery .= Util::backquote($this->labelColumn)
207207
. ', ';
208208
}

‎src/Gis/GisVisualizationSettings.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function __construct(
1414
public int $width,
1515
public int $height,
1616
public string $spatialColumn,
17-
public string|null $labelColumn = null,
17+
public string $labelColumn = '',
1818
) {
1919
}
2020
}

0 commit comments

Comments
 (0)