diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 3aa7686d9a..68fb7393fd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5982,7 +5982,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
+			count: 1
 			path: src/Controllers/Table/DropColumnController.php
 
 		-
@@ -8222,7 +8222,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
+			count: 2
 			path: src/Controllers/VersionCheckController.php
 
 		-
diff --git a/src/Controllers/Table/DropColumnController.php b/src/Controllers/Table/DropColumnController.php
index edbe1b7769..7f09319b36 100644
--- a/src/Controllers/Table/DropColumnController.php
+++ b/src/Controllers/Table/DropColumnController.php
@@ -62,7 +62,7 @@ final class DropColumnController extends AbstractController
             $message = Message::success(__('No change'));
         }
 
-        if (empty($message)) {
+        if (! isset($message)) {
             $message = Message::success(
                 _ngettext(
                     '%1$d column has been dropped successfully.',
diff --git a/src/Controllers/VersionCheckController.php b/src/Controllers/VersionCheckController.php
index 3030514dc9..46a125e1f1 100644
--- a/src/Controllers/VersionCheckController.php
+++ b/src/Controllers/VersionCheckController.php
@@ -41,7 +41,7 @@ class VersionCheckController extends AbstractController
 
         $versionDetails = $this->versionInformation->getLatestVersion();
 
-        if (empty($versionDetails)) {
+        if ($versionDetails === null) {
             echo json_encode([]);
 
             return;
diff --git a/src/Gis/GisGeometry.php b/src/Gis/GisGeometry.php
index 5cbc634ce4..7e7e144e61 100644
--- a/src/Gis/GisGeometry.php
+++ b/src/Gis/GisGeometry.php
@@ -316,7 +316,7 @@ abstract class GisGeometry
     {
         $parts = explode('),(', $wktCoords);
 
-        return array_map(fn (string $coord) => $this->extractPoints1d($coord, $scaleData), $parts);
+        return array_map(fn (string $coord): array => $this->extractPoints1d($coord, $scaleData), $parts);
     }
 
     /**
@@ -329,7 +329,7 @@ abstract class GisGeometry
     {
         $parts = explode(')),((', $wktCoords);
 
-        return array_map(fn (string $coord) => $this->extractPoints2d($coord, $scaleData), $parts);
+        return array_map(fn (string $coord): array => $this->extractPoints2d($coord, $scaleData), $parts);
     }
 
     /**