diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 08ded2dd93e48f04527630b389fb318e61208578..d2c8274b3cd1608236b0dadb8acd3de82f525dc3 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1272,7 +1272,7 @@ parameters:
 
 		-
 			message: "#^Offset string does not exist on null\\.$#"
-			count: 2
+			count: 1
 			path: ../../typo3/sysext/core/Classes/Package/PackageManager.php
 
 		-
@@ -2640,11 +2640,6 @@ parameters:
 			count: 3
 			path: ../../typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfiguration.php
 
-		-
-			message: "#^Call to function is_array\\(\\) with 1 will always evaluate to false\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
-
 		-
 			message: "#^Offset non\\-empty\\-string on array\\{\\} on left side of \\?\\? does not exist\\.$#"
 			count: 1
@@ -2655,11 +2650,6 @@ parameters:
 			count: 2
 			path: ../../typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
 
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Classes/Mvc/Controller/MvcPropertyMappingConfigurationService.php
-
 		-
 			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\RequestInterface\\:\\:isDispatched\\(\\)\\.$#"
 			count: 1
@@ -3216,7 +3206,7 @@ parameters:
 			path: ../../typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of class TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Controller\\\\Argument constructor expects string, ArrayObject\\<\\(int\\|string\\), mixed\\> given\\.$#"
+			message: "#^Parameter \\#1 \\$name of class TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Controller\\\\Argument constructor expects string, ArrayObject\\<\\*NEVER\\*, \\*NEVER\\*\\> given\\.$#"
 			count: 1
 			path: ../../typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
 
@@ -3500,6 +3490,11 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithInvalidTypeHint.php
 
+		-
+			message: "#^ArrayObject\\<\\*NEVER\\*, \\*NEVER\\*\\> does not accept string\\.$#"
+			count: 1
+			path: ../../typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
+
 		-
 			message: "#^Parameter \\#1 \\$pageIdsToClear of method TYPO3\\\\CMS\\\\Extbase\\\\Service\\\\CacheService\\:\\:clearPageCache\\(\\) expects array\\<int\\>\\|int\\|null, string given\\.$#"
 			count: 1
@@ -3677,7 +3672,7 @@ parameters:
 
 		-
 			message: "#^Offset string does not exist on null\\.$#"
-			count: 2
+			count: 1
 			path: ../../typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php
 
 		-
@@ -5155,11 +5150,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/InterfaceMethodChangedMatcher.php
 
-		-
-			message: "#^Result of && is always true\\.$#"
-			count: 2
-			path: ../../typo3/sysext/install/Classes/ExtensionScanner/Php/Matcher/InterfaceMethodChangedMatcher.php
-
 		-
 			message: "#^Method TYPO3\\\\CMS\\\\Install\\\\ExtensionScanner\\\\Php\\\\Matcher\\\\MethodAnnotationMatcher\\:\\:enterNode\\(\\) should return int\\|PhpParser\\\\Node\\|null but return statement is missing\\.$#"
 			count: 1
diff --git a/composer.json b/composer.json
index b72eb67bb4d85519040fd2efc1d4e08ac5162c42..7d92f421070455a5d96c6c602989aa180b4c0c03 100644
--- a/composer.json
+++ b/composer.json
@@ -117,7 +117,7 @@
 		"php-webdriver/webdriver": "^1.12.0",
 		"phpspec/prophecy": "^1.15.0",
 		"phpspec/prophecy-phpunit": "^2.0.1",
-		"phpstan/phpstan": "^1.6.9",
+		"phpstan/phpstan": "^1.7.0",
 		"phpstan/phpstan-phpunit": "^1.1.1",
 		"phpunit/phpunit": "^9.5.20",
 		"typo3/cms-styleguide": "~11.5.4",
diff --git a/composer.lock b/composer.lock
index 2654023a8c74b87413b7b50d4fb4e807e06d5f97..462ceb572122203ee5b4c7e6b559403999095019 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "747783b5b7c82b1221369dfbba99b088",
+    "content-hash": "244495ef186a850527b9f034fabce26f",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -7091,16 +7091,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.6.9",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8c98899c7c54251a098befd23b50a983594a20f9"
+                "reference": "509b3d6da631de31494dc21adedb30d73970e5aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8c98899c7c54251a098befd23b50a983594a20f9",
-                "reference": "8c98899c7c54251a098befd23b50a983594a20f9",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/509b3d6da631de31494dc21adedb30d73970e5aa",
+                "reference": "509b3d6da631de31494dc21adedb30d73970e5aa",
                 "shasum": ""
             },
             "require": {
@@ -7126,7 +7126,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.6.9"
+                "source": "https://github.com/phpstan/phpstan/tree/1.7.0"
             },
             "funding": [
                 {
@@ -7146,7 +7146,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-21T11:34:44+00:00"
+            "time": "2022-05-23T15:11:29+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",