diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 019443a0a6618e4abfa291632875636f71ab6222..071744be94281e8884fdc76d132bbef8f3da207c 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1810,11 +1810,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/ContentController.php
 
-		-
-			message: "#^Parameter \\#1 \\$iterator of method TYPO3\\\\TestIrreForeignfield\\\\Controller\\\\AbstractController\\:\\:getStructure\\(\\) expects iterable\\<TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\AbstractEntity\\>&Iterator, array\\|TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/ContentController.php
-
 		-
 			message: "#^Property TYPO3\\\\CMS\\\\Core\\\\Tests\\\\Functional\\\\Fixtures\\\\Frontend\\\\PhpError\\:\\:\\$configuration is never read, only written\\.$#"
 			count: 1
@@ -1955,11 +1950,6 @@ parameters:
 			count: 2
 			path: ../../typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
 
-		-
-			message: "#^Instantiating DateTimeImmutable with @ produces an error\\: Unexpected character$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$coreCache of class TYPO3\\\\CMS\\\\Core\\\\ExpressionLanguage\\\\ProviderConfigurationLoader constructor expects TYPO3\\\\CMS\\\\Core\\\\Cache\\\\Frontend\\\\PhpFrontend, TYPO3\\\\CMS\\\\Core\\\\Cache\\\\Frontend\\\\FrontendInterface given\\.$#"
 			count: 1
@@ -2055,11 +2045,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Unit/Http/StreamTest.php
 
-		-
-			message: "#^Property TYPO3\\\\TestingFramework\\\\Core\\\\Unit\\\\UnitTestCase\\:\\:\\$testFilesToDelete \\(array\\<non\\-empty\\-string\\>\\) does not accept non\\-empty\\-array\\<string\\|false\\>\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/Unit/Http/StreamTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$port of method TYPO3\\\\CMS\\\\Core\\\\Http\\\\Uri\\:\\:withPort\\(\\) expects int\\|null, true given\\.$#"
 			count: 1
@@ -2180,11 +2165,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
 
-		-
-			message: "#^Property TYPO3\\\\TestingFramework\\\\Core\\\\Unit\\\\UnitTestCase\\:\\:\\$testFilesToDelete \\(array\\<non\\-empty\\-string\\>\\) does not accept non\\-empty\\-array\\<string\\>\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
-
 		-
 			message: "#^PHPDoc tag @param references unknown parameter\\: \\$expectedMergedProperties$#"
 			count: 1
@@ -2275,11 +2255,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
 
-		-
-			message: "#^Property TYPO3\\\\TestingFramework\\\\Core\\\\Unit\\\\UnitTestCase\\:\\:\\$testFilesToDelete \\(array\\<non\\-empty\\-string\\>\\) does not accept non\\-empty\\-array\\<string\\>\\.$#"
-			count: 1
-			path: ../../typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
-
 		-
 			message: "#^Static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:callUserFunction\\(\\) invoked with 4 parameters, 2\\-3 required\\.$#"
 			count: 1
@@ -2450,21 +2425,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
 
-		-
-			message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Object\\\\Container\\\\Container\\:\\:getEmptyObject\\(\\) should return object&T but returns object\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Classes/Object/Container/Container.php
-
-		-
-			message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Object\\\\Container\\\\Container\\:\\:getInstanceInternal\\(\\) should return object&T but returns Psr\\\\Container\\\\ContainerInterface\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Classes/Object/Container/Container.php
-
-		-
-			message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Object\\\\Container\\\\Container\\:\\:getInstanceInternal\\(\\) should return object&T but returns object\\.$#"
-			count: 2
-			path: ../../typo3/sysext/extbase/Classes/Object/Container/Container.php
-
 		-
 			message: "#^Property TYPO3\\\\CMS\\\\Extbase\\\\Object\\\\Container\\\\Container\\<T\\>\\:\\:\\$reflectionService \\(TYPO3\\\\CMS\\\\Extbase\\\\Reflection\\\\ReflectionService\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
@@ -2720,11 +2680,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
 
-		-
-			message: "#^Parameter \\#1 \\$iterator of method ExtbaseTeam\\\\BlogExample\\\\Controller\\\\BlogController\\:\\:getStructure\\(\\) expects iterable\\<TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\AbstractEntity\\>&Iterator, array\\|TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/BlogController.php
-
 		-
 			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\View\\\\ViewInterface\\:\\:setConfiguration\\(\\)\\.$#"
 			count: 1
@@ -2740,11 +2695,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/ContentController.php
 
-		-
-			message: "#^Parameter \\#1 \\$iterator of method ExtbaseTeam\\\\BlogExample\\\\Controller\\\\ContentController\\:\\:getStructure\\(\\) expects iterable\\<TYPO3\\\\CMS\\\\Extbase\\\\DomainObject\\\\AbstractEntity\\>&Iterator, array\\|TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryResultInterface given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/ContentController.php
-
 		-
 			message: "#^Property ExtbaseTeam\\\\BlogExample\\\\Domain\\\\Model\\\\Administrator\\:\\:\\$image \\(TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\ObjectStorage\\<TYPO3\\\\CMS\\\\Extbase\\\\Domain\\\\Model\\\\FileReference\\>\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
@@ -3280,11 +3230,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
 
-		-
-			message: "#^Method TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Extension\\:\\:convertDependenciesToObjects\\(\\) should return iterable\\<TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Dependency\\>&SplObjectStorage but returns SplObjectStorage\\<object, mixed\\>\\.$#"
-			count: 2
-			path: ../../typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
-
 		-
 			message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Persistence\\\\QueryInterface\\:\\:logicalAnd\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 11
@@ -3345,11 +3290,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extensionmanager/Classes/Remote/RemoteRegistry.php
 
-		-
-			message: "#^Instantiating DateTimeImmutable with @ produces an error\\: Unexpected character$#"
-			count: 1
-			path: ../../typo3/sysext/extensionmanager/Classes/Remote/TerExtensionRemote.php
-
 		-
 			message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extensionmanager\\\\Remote\\\\ExtensionDownloaderRemoteInterface\\:\\:needsUpdate\\(\\)\\.$#"
 			count: 1
@@ -3395,21 +3335,11 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ExtensionRepositoryTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$dependencies of method TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Extension\\:\\:setDependencies\\(\\) expects iterable\\<TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Dependency\\>&SplObjectStorage, SplObjectStorage\\<object, mixed\\> given\\.$#"
-			count: 6
-			path: ../../typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ExtensionRepositoryTest.php
-
 		-
 			message: "#^Property TYPO3\\\\CMS\\\\Extensionmanager\\\\Tests\\\\Unit\\\\Fixtures\\\\LatestCompatibleExtensionObjectStorageFixture\\:\\:\\$position is never read, only written\\.$#"
 			count: 1
 			path: ../../typo3/sysext/extensionmanager/Tests/Unit/Fixtures/LatestCompatibleExtensionObjectStorageFixture.php
 
-		-
-			message: "#^Parameter \\#1 \\$dependencies of method TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Extension\\:\\:setDependencies\\(\\) expects iterable\\<TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Model\\\\Dependency\\>&SplObjectStorage, SplObjectStorage\\<object, mixed\\> given\\.$#"
-			count: 12
-			path: ../../typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
-
 		-
 			message: "#^Undefined variable\\: \\$EM_CONF$#"
 			count: 2
@@ -3580,11 +3510,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
 
-		-
-			message: "#^Instantiating DateTime with @ produces an error\\: Unexpected character$#"
-			count: 1
-			path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
-
 		-
 			message: "#^Call to an undefined method TYPO3Fluid\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContextInterface\\:\\:getRequest\\(\\)\\.$#"
 			count: 1
@@ -4925,11 +4850,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php
 
-		-
-			message: "#^Property TYPO3\\\\TestingFramework\\\\Core\\\\Functional\\\\FunctionalTestCase\\:\\:\\$backendUserFixture \\(non\\-empty\\-string\\) does not accept string\\.$#"
-			count: 1
-			path: ../../typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$softRefEntry of method TYPO3\\\\CMS\\\\Linkvalidator\\\\Linktype\\\\ExternalLinktype\\:\\:checkLink\\(\\) expects array, null given\\.$#"
 			count: 2
diff --git a/composer.json b/composer.json
index fe730278dafc2cfd88fbf94bdd62e39a4994f784..079910360e1c998158d1817cbe12dcc5690d287b 100644
--- a/composer.json
+++ b/composer.json
@@ -119,8 +119,8 @@
 		"php-webdriver/webdriver": "^1.12.0",
 		"phpspec/prophecy": "^1.15.0",
 		"phpspec/prophecy-phpunit": "^2.0.1",
-		"phpstan/phpstan": "^1.9.4",
-		"phpstan/phpstan-phpunit": "^1.3.2",
+		"phpstan/phpstan": "^1.9.5",
+		"phpstan/phpstan-phpunit": "^1.3.3",
 		"phpunit/phpunit": "^9.5.21",
 		"typo3/cms-styleguide": "~11.5.4",
 		"typo3/testing-framework": "^6.16.6",
diff --git a/composer.lock b/composer.lock
index 6478f94682c76bafb276482acac0fbc37788fa56..dccaab4fdf233f34629beb70a6e7b6e577cebab7 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": "985c44a9a333b3f203808aabb4d92672",
+    "content-hash": "3f12754b531c1c66b7ac71dc9ac87016",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -7151,16 +7151,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.4",
+            "version": "1.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2"
+                "reference": "4d18c5d98965029c2aa1ccbd91dc22e7ba8c5034"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03bccee595e2146b7c9d174486b84f4dc61b0f2",
-                "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4d18c5d98965029c2aa1ccbd91dc22e7ba8c5034",
+                "reference": "4d18c5d98965029c2aa1ccbd91dc22e7ba8c5034",
                 "shasum": ""
             },
             "require": {
@@ -7190,7 +7190,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.4"
+                "source": "https://github.com/phpstan/phpstan/tree/1.9.5"
             },
             "funding": [
                 {
@@ -7206,20 +7206,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-17T13:33:52+00:00"
+            "time": "2023-01-02T21:35:42+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "cd9c6938f8bbfcb6da3ed5a3c7ea60873825d088"
+                "reference": "54a24bd23e9e80ee918cdc24f909d376c2e273f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/cd9c6938f8bbfcb6da3ed5a3c7ea60873825d088",
-                "reference": "cd9c6938f8bbfcb6da3ed5a3c7ea60873825d088",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/54a24bd23e9e80ee918cdc24f909d376c2e273f7",
+                "reference": "54a24bd23e9e80ee918cdc24f909d376c2e273f7",
                 "shasum": ""
             },
             "require": {
@@ -7256,9 +7256,9 @@
             "description": "PHPUnit extensions and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.2"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.3"
             },
-            "time": "2022-12-13T15:08:22+00:00"
+            "time": "2022-12-21T15:25:00+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",