[HttpClient] Remove implementing Http\Message\RequestFactory from `…

…HttplugClient`
symfony · nicolas-grekas · Jul 4, 2023 · Jul 3, 2023 · Jul 3, 2023 · d38f04cf32797d3f5c33a46693c563b5b179bf2c
commit d38f04cf32797d3f5c33a46693c563b5b179bf2c
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -68,6 +68,11 @@ HttpFoundation
  * Remove `Request::getContentType()`, use `Request::getContentTypeFormat()` instead
  * Throw an `InvalidArgumentException` when calling `Request::create()` with a malformed URI
 
+HttpClient
+----------
+
+ * Remove implementing `Http\Message\RequestFactory` from `HttplugClient`
+
 HttpKernel
 ----------
 

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.0
+---
+
+ * Remove implementing `Http\Message\RequestFactory` from `HttplugClient`
+
 6.4
 ---
 

diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -32,7 +32,6 @@
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
 use Symfony\Component\HttpClient\Internal\HttplugWaitLoop;
-use Symfony\Component\HttpClient\Internal\LegacyHttplugInterface;
 use Symfony\Component\HttpClient\Response\HttplugPromise;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -57,7 +56,7 @@
  *
  * @author Nicolas Grekas <[email protected]>
  */
-final class HttplugClient implements ClientInterface, HttpAsyncClient, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, ResetInterface, LegacyHttplugInterface
+final class HttplugClient implements ClientInterface, HttpAsyncClient, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, ResetInterface
 {
     private HttpClientInterface $client;
     private ResponseFactoryInterface $responseFactory;
@@ -150,14 +149,10 @@ public function wait(float $maxDuration = null, float $idleTimeout = null): int
     }
 
     /**
-     * @param string              $method
      * @param UriInterface|string $uri
      */
-    public function createRequest($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1'): RequestInterface
+    public function createRequest(string $method, $uri = ''): RequestInterface
     {
-        if (2 < \func_num_args()) {
-            trigger_deprecation('symfony/http-client', '6.2', 'Passing more than 2 arguments to "%s()" is deprecated.', __METHOD__);
-        }
         if ($this->responseFactory instanceof RequestFactoryInterface) {
             $request = $this->responseFactory->createRequest($method, $uri);
         } elseif (class_exists(Psr17FactoryDiscovery::class)) {
@@ -168,44 +163,12 @@ public function createRequest($method, $uri, array $headers = [], $body = null,
             throw new \LogicException(sprintf('You cannot use "%s()" as no PSR-17 factories have been found. Try running "composer require php-http/discovery psr/http-factory-implementation:*".', __METHOD__));
         }
 
-        $request = $request
-            ->withProtocolVersion($protocolVersion)
-            ->withBody($this->createStream($body ?? ''))
-        ;
-
-        foreach ($headers as $name => $value) {
-            $request = $request->withAddedHeader($name, $value);
-        }
-
         return $request;
     }
 
-    /**
-     * @param string $content
-     */
-    public function createStream($content = ''): StreamInterface
+    public function createStream(string $content = ''): StreamInterface
     {
-        if (!\is_string($content)) {
-            trigger_deprecation('symfony/http-client', '6.2', 'Passing a "%s" to "%s()" is deprecated, use "createStreamFrom*()" instead.', get_debug_type($content), __METHOD__);
-        }
-
-        if ($content instanceof StreamInterface) {
-            return $content;
-        }
-
-        if (\is_string($content ?? '')) {
-            $stream = $this->streamFactory->createStream($content ?? '');
-        } elseif (\is_resource($content)) {
-            $stream = $this->streamFactory->createStreamFromResource($content);
-        } else {
-            throw new \InvalidArgumentException(sprintf('"%s()" expects string, resource or StreamInterface, "%s" given.', __METHOD__, get_debug_type($content)));
-        }
-
-        if ($stream->isSeekable()) {
-            $stream->seek(0);
-        }
-
-        return $stream;
+        return $this->streamFactory->createStream($content);
     }
 
     public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
@@ -218,25 +181,14 @@ public function createStreamFromResource($resource): StreamInterface
         return $this->streamFactory->createStreamFromResource($resource);
     }
 
-    /**
-     * @param string $uri
-     */
-    public function createUri($uri = ''): UriInterface
+    public function createUri(string $uri = ''): UriInterface
     {
-        if (!\is_string($uri)) {
-            trigger_deprecation('symfony/http-client', '6.2', 'Passing a "%s" to "%s()" is deprecated, pass a string instead.', get_debug_type($uri), __METHOD__);
-        }
-
-        if ($uri instanceof UriInterface) {
-            return $uri;
-        }
-
         if ($this->responseFactory instanceof UriFactoryInterface) {
             return $this->responseFactory->createUri($uri);
         }
 
         if (class_exists(Psr17FactoryDiscovery::class)) {
-            return Psr17FactoryDiscovery::findUrlFactory()->createUri($uri);
+            return Psr17FactoryDiscovery::findUriFactory()->createUri($uri);
         }
 
         if (class_exists(Uri::class)) {

diff --git a/src/Symfony/Component/HttpClient/Internal/LegacyHttplugInterface.php b/src/Symfony/Component/HttpClient/Internal/LegacyHttplugInterface.php
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -24,7 +24,6 @@
     "require": {
         "php": ">=8.2",
         "psr/log": "^1|^2|^3",
-        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/http-client-contracts": "^3",
         "symfony/service-contracts": "^2.5|^3"
     },