diff --git a/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php b/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php
index 11b7285fdbd117090440348f91b65cf8c44b16fa..9eec35a3b38ae8b2e319902e4fd2143bbb22527c 100644
--- a/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php
+++ b/core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php
@@ -5,14 +5,13 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
  * Yields a PSR7 request object based on the request object passed along.
  */
-final class Psr7RequestValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface {
+final class Psr7RequestValueResolver implements ValueResolverInterface {
 
   /**
    * The PSR-7 converter.
diff --git a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
index 51c460e095e6dcfe33dea2c10fc334b11f5362fc..5e5ffb91b074e190bf54c97d36fb6c43c01f750f 100644
--- a/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
+++ b/core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
@@ -5,14 +5,13 @@
 use Drupal\Core\Routing\RouteMatch;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
  * Yields a RouteMatch object based on the request object passed along.
  */
-final class RouteMatchValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface {
+final class RouteMatchValueResolver implements ValueResolverInterface {
 
   /**
    * {@inheritdoc}
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 5465219c4ae3396ff766898197251de380921849..79b7404a57b6fd945c87b6879e10011bf6709505 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -306,22 +306,6 @@ parameters:
 			count: 1
 			path: lib/Drupal/Core/Config/TypedConfigManager.php
 
-		-
-			message: """
-				#^Class Drupal\\\\Core\\\\Controller\\\\ArgumentResolver\\\\Psr7RequestValueResolver implements deprecated interface Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentValueResolverInterface\\:
-				since Symfony 6\\.2, implement ValueResolverInterface instead$#
-			"""
-			count: 1
-			path: lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php
-
-		-
-			message: """
-				#^Class Drupal\\\\Core\\\\Controller\\\\ArgumentResolver\\\\RouteMatchValueResolver implements deprecated interface Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentValueResolverInterface\\:
-				since Symfony 6\\.2, implement ValueResolverInterface instead$#
-			"""
-			count: 1
-			path: lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
-
 		-
 			message: """
 				#^Fetching deprecated class constant RETURN_AFFECTED of class Drupal\\\\Core\\\\Database\\\\Database\\: