[HttpClient] make HttpClient::create() return an AmpHttpClient when possible and curl is missing

nicolas-grekas · nicolas-grekas · commit 48a664fa7f37 · 2020-03-02T15:39:00.000+01:00
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * added `NoPrivateNetworkHttpClient` decorator
  * added `AmpHttpClient`, a portable HTTP/2 implementation based on Amp
  * added `LoggerAwareInterface` to `ScopingHttpClient` and `TraceableHttpClient`
+ * made `HttpClient::create()` return an `AmpHttpClient` when `amphp/http-client` is found but curl is not
 
 4.4.0
 -----
diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/HttpClient.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient;
 
+use Amp\Http\Client\Connection\ConnectionLimitingPool;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -35,6 +36,8 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
             }
 
             @trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', E_USER_WARNING);
+        } elseif (class_exists(ConnectionLimitingPool::class)) {
+            return new AmpHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
         }
 
         return new NativeHttpClient($defaultOptions, $maxHostConnections);

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpClient;`
`13`	`13`
	`14`	`+use Amp\Http\Client\Connection\ConnectionLimitingPool;`
`14`	`15`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`15`	`16`
`16`	`17`	`/**`
`@@ -35,6 +36,8 @@ public static function create(array $defaultOptions = [], int $maxHostConnection`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`@trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', E_USER_WARNING);`
	`39`	`+ } elseif (class_exists(ConnectionLimitingPool::class)) {`
	`40`	`+ return new AmpHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`return new NativeHttpClient($defaultOptions, $maxHostConnections);`