[PsrHttpMessageBridge] Remove ArgumentValueResolverInterface from PsrServerRequestResolver

derrabus · derrabus · commit 257346439dde · 2023-07-30T12:37:03.000+02:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -60,6 +60,11 @@ MonologBridge
 
  * Add native return type to `Logger::clear()` and to `DebugProcessor::clear()`
 
+PsrHttpMessageBridge
+--------------------
+
+ * Remove `ArgumentValueResolverInterface` from `PsrServerRequestResolver`
+
 Routing
 -------
 
diff --git a/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php b/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/PsrServerRequestResolver.php
@@ -16,8 +16,7 @@
 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 as BaseValueResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
@@ -26,28 +25,17 @@
  * @author Iltar van der Berg <kjarli@gmail.com>
  * @author Alexander M. Turek <me@derrabus.de>
  */
-final class PsrServerRequestResolver implements ArgumentValueResolverInterface, ValueResolverInterface
+final class PsrServerRequestResolver implements ValueResolverInterface
 {
     private const SUPPORTED_TYPES = [
         ServerRequestInterface::class => true,
         RequestInterface::class => true,
         MessageInterface::class => true,
     ];
 
-    private $httpMessageFactory;
-
-    public function __construct(HttpMessageFactoryInterface $httpMessageFactory)
-    {
-        $this->httpMessageFactory = $httpMessageFactory;
-    }
-
-    public function supports(Request $request, ArgumentMetadata $argument): bool
-    {
-        if ($this instanceof BaseValueResolverInterface) {
-            trigger_deprecation('symfony/psr-http-message-bridge', '2.3', 'Method "%s" is deprecated, call "resolve()" without calling "supports()" first.', __METHOD__);
-        }
-
-        return self::SUPPORTED_TYPES[$argument->getType()] ?? false;
+    public function __construct(
+        private readonly HttpMessageFactoryInterface $httpMessageFactory,
+    ) {
     }
 
     public function resolve(Request $request, ArgumentMetadata $argument): \Traversable
diff --git a/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/ValueResolverInterface.php b/src/Symfony/Bridge/PsrHttpMessage/ArgumentValueResolver/ValueResolverInterface.php
diff --git a/src/Symfony/Bridge/PsrHttpMessage/CHANGELOG.md b/src/Symfony/Bridge/PsrHttpMessage/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Import the bridge into the Symfony monorepo and synchronize releases
+ * Remove `ArgumentValueResolverInterface` from `PsrServerRequestResolver`
 
 2.3.1
 -----
diff --git a/src/Symfony/Bridge/PsrHttpMessage/Tests/ArgumentValueResolver/PsrServerRequestResolverTest.php b/src/Symfony/Bridge/PsrHttpMessage/Tests/ArgumentValueResolver/PsrServerRequestResolverTest.php
@@ -15,21 +15,16 @@
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
-use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
-use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
  * @author Alexander M. Turek <me@derrabus.de>
  */
 final class PsrServerRequestResolverTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public function testServerRequest()
     {
         $symfonyRequest = $this->createMock(Request::class);
@@ -60,21 +55,6 @@ public function testMessage()
         self::assertSame([$psrRequest], $resolver->getArguments($symfonyRequest, static function (MessageInterface $request): void {}));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testDeprecatedSupports()
-    {
-        if (!interface_exists(ValueResolverInterface::class)) {
-            $this->markTestSkipped('Requires symfony/http-kernel 6.2.');
-        }
-
-        $resolver = new PsrServerRequestResolver($this->createStub(HttpMessageFactoryInterface::class));
-
-        $this->expectDeprecation('Since symfony/psr-http-message-bridge 2.3: Method "Symfony\Bridge\PsrHttpMessage\ArgumentValueResolver\PsrServerRequestResolver::supports" is deprecated, call "resolve()" without calling "supports()" first.');
-        $resolver->supports($this->createStub(Request::class), $this->createStub(ArgumentMetadata::class));
-    }
-
     private function bootstrapResolver(Request $symfonyRequest, ServerRequestInterface $psrRequest): ArgumentResolver
     {
         $messageFactory = $this->createMock(HttpMessageFactoryInterface::class);
diff --git a/src/Symfony/Bridge/PsrHttpMessage/composer.json b/src/Symfony/Bridge/PsrHttpMessage/composer.json
@@ -18,18 +18,20 @@
     "require": {
         "php": ">=8.1",
         "psr/http-message": "^1.0|^2.0",
-        "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/http-foundation": "^5.4|^6.0"
     },
     "require-dev": {
-        "symfony/browser-kit": "^5.4|^6.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/framework-bundle": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/browser-kit": "^5.4|^6.0|^7.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^6.2|^7.0",
         "nyholm/psr7": "^1.1",
         "psr/log": "^1.1|^2|^3"
     },
+    "conflict": {
+        "symfony/http-kernel": "<6.2"
+    },
     "suggest": {
         "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
     },
