From c92b7e75a5b09d27717952eb31b5514851c17c8a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 14 Oct 2019 13:23:40 +0200 Subject: [PATCH] Add SymfonyHttplug to HttpAsyncClient implementations --- src/Strategy/CommonClassesStrategy.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Strategy/CommonClassesStrategy.php b/src/Strategy/CommonClassesStrategy.php index f258787..479faee 100644 --- a/src/Strategy/CommonClassesStrategy.php +++ b/src/Strategy/CommonClassesStrategy.php @@ -2,6 +2,7 @@ namespace Http\Discovery\Strategy; +use GuzzleHttp\Promise\Promise; use GuzzleHttp\Psr7\Request as GuzzleRequest; use Http\Client\HttpAsyncClient; use Http\Client\HttpClient; @@ -65,15 +66,13 @@ final class CommonClassesStrategy implements DiscoveryStrategy ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], ], HttpAsyncClient::class => [ + ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, Promise::class]], ['class' => Guzzle6::class, 'condition' => Guzzle6::class], ['class' => Curl::class, 'condition' => Curl::class], ['class' => React::class, 'condition' => React::class], ], HttpClient::class => [ - [ - 'class' => [self::class, 'symfonyHttplugInstantiate'], - 'condition' => SymfonyHttplug::class, - ], + ['class' => SymfonyHttplug::class, 'condition' => SymfonyHttplug::class], ['class' => Guzzle6::class, 'condition' => Guzzle6::class], ['class' => Guzzle5::class, 'condition' => Guzzle5::class], ['class' => Curl::class, 'condition' => Curl::class], @@ -130,11 +129,6 @@ public static function buzzInstantiate() return new \Buzz\Client\FileGetContents(MessageFactoryDiscovery::find()); } - public static function symfonyHttplugInstantiate() - { - return new SymfonyHttplug(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory()); - } - public static function symfonyPsr18Instantiate() { return new SymfonyPsr18(null, Psr17FactoryDiscovery::findResponseFactory(), Psr17FactoryDiscovery::findStreamFactory());