From ccd7c2990e5ff7257441ad861f43f78bea90707d Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 26 Apr 2023 17:45:59 +0200 Subject: [PATCH] Deprecate HttpClientDiscovery, use Psr18ClientDiscovery instead --- CHANGELOG.md | 4 ++++ src/HttpClientDiscovery.php | 2 ++ src/Strategy/CommonClassesStrategy.php | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 608b878..e419617 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 1.18.0 - 2023-XX-XX + +- [#235](https://github.com/php-http/discovery/pull/235) - Deprecate HttpClientDiscovery, use Psr18ClientDiscovery instead + ## 1.17.0 - 2023-04-26 - [#230](https://github.com/php-http/discovery/pull/230) - Add Psr18Client to make it straightforward to use PSR-18 diff --git a/src/HttpClientDiscovery.php b/src/HttpClientDiscovery.php index 2072b94..bd3da03 100644 --- a/src/HttpClientDiscovery.php +++ b/src/HttpClientDiscovery.php @@ -9,6 +9,8 @@ * Finds an HTTP Client. * * @author Márk Sági-Kazár + * + * @deprecated This will be removed in 2.0. Consider using Psr18FactoryDiscovery. */ final class HttpClientDiscovery extends ClassDiscovery { diff --git a/src/Strategy/CommonClassesStrategy.php b/src/Strategy/CommonClassesStrategy.php index 1d98c10..af63f88 100644 --- a/src/Strategy/CommonClassesStrategy.php +++ b/src/Strategy/CommonClassesStrategy.php @@ -24,7 +24,6 @@ use Http\Message\MessageFactory\DiactorosMessageFactory; use Http\Message\MessageFactory\GuzzleMessageFactory; use Http\Message\MessageFactory\SlimMessageFactory; -use Http\Message\RequestFactory; use Http\Message\StreamFactory; use Http\Message\StreamFactory\DiactorosStreamFactory; use Http\Message\StreamFactory\GuzzleStreamFactory; @@ -73,14 +72,14 @@ final class CommonClassesStrategy implements DiscoveryStrategy ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], ], HttpAsyncClient::class => [ - ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, RequestFactory::class, [self::class, 'isPsr17FactoryInstalled']]], + ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class, [self::class, 'isPsr17FactoryInstalled']]], ['class' => Guzzle7::class, 'condition' => Guzzle7::class], ['class' => Guzzle6::class, 'condition' => Guzzle6::class], ['class' => Curl::class, 'condition' => Curl::class], ['class' => React::class, 'condition' => React::class], ], HttpClient::class => [ - ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, RequestFactory::class, [self::class, 'isPsr17FactoryInstalled']]], + ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled']]], ['class' => Guzzle7::class, 'condition' => Guzzle7::class], ['class' => Guzzle6::class, 'condition' => Guzzle6::class], ['class' => Guzzle5::class, 'condition' => Guzzle5::class],