Skip to content

Commit 12dabf0

Browse files
author
catch
committed
Issue #3383339 by Spokje: Replace implementing deprecated interface Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface with ValueResolverInterface
1 parent 97f1d6b commit 12dabf0

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

core/lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
use Psr\Http\Message\ServerRequestInterface;
66
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
77
use Symfony\Component\HttpFoundation\Request;
8-
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
98
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
109
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
1110

1211
/**
1312
* Yields a PSR7 request object based on the request object passed along.
1413
*/
15-
final class Psr7RequestValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface {
14+
final class Psr7RequestValueResolver implements ValueResolverInterface {
1615

1716
/**
1817
* The PSR-7 converter.

core/lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
use Drupal\Core\Routing\RouteMatch;
66
use Drupal\Core\Routing\RouteMatchInterface;
77
use Symfony\Component\HttpFoundation\Request;
8-
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
98
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
109
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
1110

1211
/**
1312
* Yields a RouteMatch object based on the request object passed along.
1413
*/
15-
final class RouteMatchValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface {
14+
final class RouteMatchValueResolver implements ValueResolverInterface {
1615

1716
/**
1817
* {@inheritdoc}

core/phpstan-baseline.neon

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,22 +306,6 @@ parameters:
306306
count: 1
307307
path: lib/Drupal/Core/Config/TypedConfigManager.php
308308

309-
-
310-
message: """
311-
#^Class Drupal\\\\Core\\\\Controller\\\\ArgumentResolver\\\\Psr7RequestValueResolver implements deprecated interface Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentValueResolverInterface\\:
312-
since Symfony 6\\.2, implement ValueResolverInterface instead$#
313-
"""
314-
count: 1
315-
path: lib/Drupal/Core/Controller/ArgumentResolver/Psr7RequestValueResolver.php
316-
317-
-
318-
message: """
319-
#^Class Drupal\\\\Core\\\\Controller\\\\ArgumentResolver\\\\RouteMatchValueResolver implements deprecated interface Symfony\\\\Component\\\\HttpKernel\\\\Controller\\\\ArgumentValueResolverInterface\\:
320-
since Symfony 6\\.2, implement ValueResolverInterface instead$#
321-
"""
322-
count: 1
323-
path: lib/Drupal/Core/Controller/ArgumentResolver/RouteMatchValueResolver.php
324-
325309
-
326310
message: """
327311
#^Fetching deprecated class constant RETURN_AFFECTED of class Drupal\\\\Core\\\\Database\\\\Database\\:

0 commit comments

Comments
 (0)