diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 364905f7..461c373c 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1,2 +1,37 @@
 parameters:
 	ignoreErrors:
+		-
+			message: '#^Offset 0 on non\-empty\-list\<string\> on left side of \?\? always exists and is not nullable\.$#'
+			identifier: nullCoalesce.offset
+			count: 1
+			path: ../../Classes/Composer/ComposerPackageManager.php
+
+		-
+			message: '#^Trait TYPO3\\TestingFramework\\Core\\AccessibleProxyTrait is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: ../../Classes/Core/AccessibleProxyTrait.php
+
+		-
+			message: '#^Call to function is_array\(\) with non\-empty\-array will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
+
+		-
+			message: '#^Call to function is_array\(\) with non\-empty\-array will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
+
+		-
+			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
+			identifier: staticMethod.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/FunctionalTestCase.php
+
+		-
+			message: '#^Strict comparison using \!\=\= between int\|string\|true and false will always evaluate to true\.$#'
+			identifier: notIdentical.alwaysTrue
+			count: 1
+			path: ../../Classes/Core/Functional/FunctionalTestCase.php
diff --git a/composer.json b/composer.json
index 717af4b0..22a245a6 100644
--- a/composer.json
+++ b/composer.json
@@ -60,8 +60,8 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.65.0",
-    "phpstan/phpstan": "^1.11.5",
-    "phpstan/phpstan-phpunit": "^1.4.0",
+    "phpstan/phpstan": "^2.0.2",
+    "phpstan/phpstan-phpunit": "^2.0.1",
     "typo3/cms-workspaces": "13.*.*@dev || 14.*.*@dev"
   },
   "replace": {