diff options
author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-09-20 05:26:15 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-09-20 05:26:15 +0300 |
commit | 2076d5248044feff4b206dfb517370eb4a8bf9c1 (patch) | |
tree | 258349d911f2ca623449aa7f6a87df7b08da9e6e /libraries/classes | |
parent | 6792b17e72f28ec61a0a9b32055c751d34336e5e (diff) | |
parent | d0b71b7fa669b1a02404a539c86b46ca0a6cd802 (diff) |
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'libraries/classes')
-rw-r--r-- | libraries/classes/Controllers/Table/GisVisualizationController.php | 2 | ||||
-rw-r--r-- | libraries/classes/Dbal/MysqliResult.php | 2 | ||||
-rw-r--r-- | libraries/classes/Dbal/ResultInterface.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index f07055ea0a..2cdfb6c691 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -171,7 +171,7 @@ final class GisVisualizationController extends AbstractController 'session_max_rows' => $rows, 'pos' => $pos, 'visualizationSettings[spatialColumn]' => $visualizationSettings['spatialColumn'], - 'visualizationSettings[labelColumn]' => $visualizationSettings['labelColumn'], + 'visualizationSettings[labelColumn]' => $visualizationSettings['labelColumn'] ?? null, ] )); diff --git a/libraries/classes/Dbal/MysqliResult.php b/libraries/classes/Dbal/MysqliResult.php index 987a84083b..a40c711049 100644 --- a/libraries/classes/Dbal/MysqliResult.php +++ b/libraries/classes/Dbal/MysqliResult.php @@ -44,7 +44,7 @@ final class MysqliResult implements ResultInterface * Returns a generator that traverses through the whole result set * and returns each row as an associative array * - * @return Generator<int, array<string, string|null>, mixed, void> + * @psalm-return Generator<int, array<string, string|null>, mixed, void> */ public function getIterator(): Generator { diff --git a/libraries/classes/Dbal/ResultInterface.php b/libraries/classes/Dbal/ResultInterface.php index 90ea9259c0..72092082c1 100644 --- a/libraries/classes/Dbal/ResultInterface.php +++ b/libraries/classes/Dbal/ResultInterface.php @@ -22,7 +22,7 @@ interface ResultInterface extends IteratorAggregate * Returns a generator that traverses through the whole result set * and returns each row as an associative array * - * @return Generator<int, array<string, string|null>, mixed, void> + * @psalm-return Generator<int, array<string, string|null>, mixed, void> */ public function getIterator(): Generator; |