diff --git a/composer.json b/composer.json
index db02205d9fe..cf7b249ae57 100644
--- a/composer.json
+++ b/composer.json
@@ -42,13 +42,13 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0.2 || ^10.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.8.2",
+        "phpstan/phpstan": "~1.4.10 || 1.8.5",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.26.0"
+        "vimeo/psalm": "4.27.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 2.0"
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index b686cc94dcd..f5997905199 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -506,7 +506,7 @@ parameters:
 			path: lib/Doctrine/ORM/Query/Parser.php
 
 		-
-			message: "#^Offset 'columns' on array\\{name\\: string, entities\\: array, columns\\: array\\} in isset\\(\\) always exists and is not nullable\\.$#"
+			message: "#^Offset 'columns' on array\\{name\\: string, entities\\: array\\{\\}, columns\\: array\\}\\|array\\{name\\: string, entities\\: non\\-empty\\-array, columns\\: array\\} in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
 
@@ -660,26 +660,11 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Tools/EntityGenerator.php
 
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getChangeTrackingPolicyString\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
-
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getFetchModeString\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
-
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getIdGeneratorTypeString\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
 
-		-
-			message: "#^Method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:_getInheritanceTypeString\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
-
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 2
diff --git a/phpstan-dbal2.neon b/phpstan-dbal2.neon
index 51b44346945..852987a3bd4 100644
--- a/phpstan-dbal2.neon
+++ b/phpstan-dbal2.neon
@@ -64,5 +64,5 @@ parameters:
 
         # https://github.com/phpstan/phpstan/issues/7292
         -
-            message: '#^Offset class\-string on array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
+            message: '#^Offset class\-string on non\-empty\-array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
index 4447d0db94e..f2e12c625d7 100644
--- a/phpstan-persistence2.neon
+++ b/phpstan-persistence2.neon
@@ -42,5 +42,5 @@ parameters:
 
         # https://github.com/phpstan/phpstan/issues/7292
         -
-            message: '#^Offset class\-string on array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
+            message: '#^Offset class\-string on non\-empty\-array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
diff --git a/phpstan.neon b/phpstan.neon
index c2025fdde4b..73ae586b4cd 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -53,5 +53,5 @@ parameters:
 
         # https://github.com/phpstan/phpstan/issues/7292
         -
-            message: '#^Offset class\-string on array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
+            message: '#^Offset class\-string on non\-empty\-array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
             path: lib/Doctrine/ORM/UnitOfWork.php
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 82ae8e9b472..3a99edf0203 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.26.0@6998fabb2bf528b65777bf9941920888d23c03ac">
+<files psalm-version="4.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedClass occurrences="1">
       <code>IterableResult</code>