From 081aa00f96b338009c3ba7273a33e0d61248d25e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 9 Feb 2023 14:31:15 +0100
Subject: [PATCH] Revert "[HttpClient] Add support for
 "friendsofphp/well-known-implementations""

This reverts commit b814ce8f2dd54571a5458682959f3dce730e50a4.
---
 src/Symfony/Component/HttpClient/CHANGELOG.md     |  1 -
 .../Component/HttpClient/HttplugClient.php        | 13 ++-----------
 src/Symfony/Component/HttpClient/Psr18Client.php  | 15 ++-------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index ad1faa6d69156..d6d50d2d5f9d7 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -7,7 +7,6 @@ CHANGELOG
  * Make `HttplugClient` implement `Psr\Http\Message\RequestFactoryInterface`, `StreamFactoryInterface` and `UriFactoryInterface`
  * Deprecate implementing `Http\Message\RequestFactory`, `StreamFactory` and `UriFactory` on `HttplugClient`
  * Add `withOptions()` to `HttplugClient` and `Psr18Client`
- * Add support for "friendsofphp/well-known-implementations"
 
 6.1
 ---
diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
index 60cccb75f31a1..4d539219174be 100644
--- a/src/Symfony/Component/HttpClient/HttplugClient.php
+++ b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\HttpClient;
 
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr17Factory;
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Request;
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Uri;
 use GuzzleHttp\Promise\Promise as GuzzlePromise;
 use GuzzleHttp\Promise\RejectedPromise;
 use GuzzleHttp\Promise\Utils;
@@ -84,12 +81,12 @@ public function __construct(HttpClientInterface $client = null, ResponseFactoryI
         $this->promisePool = class_exists(Utils::class) ? new \SplObjectStorage() : null;
 
         if (null === $responseFactory || null === $streamFactory) {
-            if (!class_exists(Psr17Factory::class) && !class_exists(WellKnownPsr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
+            if (!class_exists(Psr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
                 throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\HttplugClient" as no PSR-17 factories have been provided. Try running "composer require nyholm/psr7".');
             }
 
             try {
-                $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : (class_exists(WellKnownPsr17Factory::class, false) ? new WellKnownPsr17Factory() : null);
+                $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : null;
                 $responseFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findResponseFactory();
                 $streamFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findStreamFactory();
             } catch (NotFoundException $e) {
@@ -170,8 +167,6 @@ public function createRequest($method, $uri, array $headers = [], $body = null,
             $request = $this->responseFactory->createRequest($method, $uri);
         } elseif (class_exists(Request::class)) {
             $request = new Request($method, $uri);
-        } elseif (class_exists(WellKnownPsr7Request::class)) {
-            $request = new WellKnownPsr7Request($method, $uri);
         } elseif (class_exists(Psr17FactoryDiscovery::class)) {
             $request = Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $uri);
         } else {
@@ -249,10 +244,6 @@ public function createUri($uri = ''): UriInterface
             return new Uri($uri);
         }
 
-        if (class_exists(WellKnownPsr7Uri::class)) {
-            return new WellKnownPsr7Uri($uri);
-        }
-
         if (class_exists(Psr17FactoryDiscovery::class)) {
             return Psr17FactoryDiscovery::findUrlFactory()->createUri($uri);
         }
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
index 01a4ae2f9554c..699acf4498a1f 100644
--- a/src/Symfony/Component/HttpClient/Psr18Client.php
+++ b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\HttpClient;
 
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr17Factory;
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Request;
-use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Uri;
 use Http\Discovery\Exception\NotFoundException;
 use Http\Discovery\Psr17FactoryDiscovery;
 use Nyholm\Psr7\Factory\Psr17Factory;
@@ -65,12 +62,12 @@ public function __construct(HttpClientInterface $client = null, ResponseFactoryI
         $streamFactory ??= $responseFactory instanceof StreamFactoryInterface ? $responseFactory : null;
 
         if (null === $responseFactory || null === $streamFactory) {
-            if (!class_exists(Psr17Factory::class) && !class_exists(WellKnownPsr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
+            if (!class_exists(Psr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {
                 throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\Psr18Client" as no PSR-17 factories have been provided. Try running "composer require nyholm/psr7".');
             }
 
             try {
-                $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : (class_exists(WellKnownPsr17Factory::class, false) ? new WellKnownPsr17Factory() : null);
+                $psr17Factory = class_exists(Psr17Factory::class, false) ? new Psr17Factory() : null;
                 $responseFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findResponseFactory();
                 $streamFactory ??= $psr17Factory ?? Psr17FactoryDiscovery::findStreamFactory();
             } catch (NotFoundException $e) {
@@ -149,10 +146,6 @@ public function createRequest(string $method, $uri): RequestInterface
             return new Request($method, $uri);
         }
 
-        if (class_exists(WellKnownPsr7Request::class)) {
-            return new WellKnownPsr7Request($method, $uri);
-        }
-
         if (class_exists(Psr17FactoryDiscovery::class)) {
             return Psr17FactoryDiscovery::findRequestFactory()->createRequest($method, $uri);
         }
@@ -191,10 +184,6 @@ public function createUri(string $uri = ''): UriInterface
             return new Uri($uri);
         }
 
-        if (class_exists(WellKnownPsr7Uri::class)) {
-            return new WellKnownPsr7Uri($uri);
-        }
-
         if (class_exists(Psr17FactoryDiscovery::class)) {
             return Psr17FactoryDiscovery::findUrlFactory()->createUri($uri);
         }