diff --git a/composer.json b/composer.json
index 831152d8460..7c2fca0449f 100644
--- a/composer.json
+++ b/composer.json
@@ -23,14 +23,14 @@
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.1.34",
+        "mglaman/phpstan-drupal": "^1.1.36",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "@beta",
         "open-telemetry/sdk": "@beta",
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.1",
+        "phpstan/phpstan": "^1.10.24",
         "phpstan/phpstan-phpunit": "^1.3.11",
         "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^6.3",
diff --git a/composer.lock b/composer.lock
index a090dddddaf..1d37f027657 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": "8b8e913d0a101af5369ea1982d76c5f5",
+    "content-hash": "e98db90afbd0b05e99c667319f2f2eba",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -5417,16 +5417,16 @@
         },
         {
             "name": "mglaman/phpstan-drupal",
-            "version": "1.1.34",
+            "version": "1.1.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mglaman/phpstan-drupal.git",
-                "reference": "1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c"
+                "reference": "345f7babd0cfd1ef73bb856673a1cee5a0dbd6e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c",
-                "reference": "1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c",
+                "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/345f7babd0cfd1ef73bb856673a1cee5a0dbd6e5",
+                "reference": "345f7babd0cfd1ef73bb856673a1cee5a0dbd6e5",
                 "shasum": ""
             },
             "require": {
@@ -5501,7 +5501,7 @@
             "description": "Drupal extension and rules for PHPStan",
             "support": {
                 "issues": "https://github.com/mglaman/phpstan-drupal/issues",
-                "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.34"
+                "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.36"
             },
             "funding": [
                 {
@@ -5517,7 +5517,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-24T21:12:15+00:00"
+            "time": "2023-06-28T20:24:39+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -6776,16 +6776,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.16",
+            "version": "1.10.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "352bdbb960bb523e3d71b834862589f910921c23"
+                "reference": "360ecc90569e9a60c2954ee209ec04fa0d958e14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/352bdbb960bb523e3d71b834862589f910921c23",
-                "reference": "352bdbb960bb523e3d71b834862589f910921c23",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/360ecc90569e9a60c2954ee209ec04fa0d958e14",
+                "reference": "360ecc90569e9a60c2954ee209ec04fa0d958e14",
                 "shasum": ""
             },
             "require": {
@@ -6834,7 +6834,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-05T08:21:46+00:00"
+            "time": "2023-07-05T12:32:13+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index d77ce11c2cc..f23b210a418 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -15,14 +15,14 @@
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.1.34",
+        "mglaman/phpstan-drupal": "^1.1.36",
         "mikey179/vfsstream": "^1.6.11",
         "open-telemetry/exporter-otlp": "@beta",
         "open-telemetry/sdk": "@beta",
         "php-http/guzzle7-adapter": "^1.0",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.10.1",
+        "phpstan/phpstan": "^1.10.24",
         "phpstan/phpstan-phpunit": "^1.3.11",
         "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^6.3",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 30e003bc3fe..4b3c3ec5e00 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -25,7 +25,7 @@
         "google/protobuf": "v3.23.3",
         "instaclick/php-webdriver": "1.4.16",
         "justinrainbow/json-schema": "5.2.12",
-        "mglaman/phpstan-drupal": "1.1.34",
+        "mglaman/phpstan-drupal": "1.1.36",
         "mikey179/vfsstream": "v1.6.11",
         "myclabs/deep-copy": "1.11.1",
         "nikic/php-parser": "v4.15.5",
@@ -48,7 +48,7 @@
         "phpspec/prophecy-phpunit": "v2.0.2",
         "phpstan/extension-installer": "1.3.1",
         "phpstan/phpdoc-parser": "1.20.4",
-        "phpstan/phpstan": "1.10.16",
+        "phpstan/phpstan": "1.10.24",
         "phpstan/phpstan-phpunit": "1.3.13",
         "phpunit/php-code-coverage": "9.2.26",
         "phpunit/php-file-iterator": "3.0.6",
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 3feadffd44a..a3b1a567790 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -470,6 +470,16 @@ parameters:
 			count: 1
 			path: lib/Drupal/Core/Field/FieldItemList.php
 
+		-
+			message: "#^Call to method getDefinitions\\(\\) on an unknown class Drupal\\\\Core\\\\Plugin\\\\CategorizingPluginManagerTrait\\.$#"
+			count: 1
+			path: lib/Drupal/Core/Field/FieldTypePluginManager.php
+
+		-
+			message: "#^Call to method getSortedDefinitions\\(\\) on an unknown class Drupal\\\\Core\\\\Plugin\\\\CategorizingPluginManagerTrait\\.$#"
+			count: 1
+			path: lib/Drupal/Core/Field/FieldTypePluginManager.php
+
 		-
 			message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
 			count: 1