[HttpClient] Handle Amp HTTP client v5 incompatibility gracefully

fancyweb · fancyweb · commit 7192c3308dec · 2022-11-09T12:27:39.000+01:00
diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -17,6 +17,7 @@
 use Amp\Http\Client\PooledHttpClient;
 use Amp\Http\Client\Request;
 use Amp\Http\Tunnel\Http1TunnelConnector;
+use Amp\Promise;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\Exception\TransportException;
@@ -29,7 +30,11 @@
 use Symfony\Contracts\Service\ResetInterface;
 
 if (!interface_exists(DelegateHttpClient::class)) {
-    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\AmpHttpClient" as the "amphp/http-client" package is not installed. Try running "composer require amphp/http-client".');
+    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\AmpHttpClient" as the "amphp/http-client" package is not installed. Try running "composer require amphp/http-client:^4.2.1".');
+}
+
+if (!interface_exists(Promise::class)) {
+    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\AmpHttpClient" as the installed "amphp/http-client" is not compatible with this version of "symfony/http-client". Try downgrading "amphp/http-client" to "^4.2.1".');
 }
 
 /**
diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/HttpClient.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpClient;
 
 use Amp\Http\Client\Connection\ConnectionLimitingPool;
+use Amp\Promise;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -30,7 +31,7 @@ final class HttpClient
      */
     public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface
     {
-        if ($amp = class_exists(ConnectionLimitingPool::class)) {
+        if ($amp = class_exists(ConnectionLimitingPool::class) && interface_exists(Promise::class)) {
             if (!\extension_loaded('curl')) {
                 return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
             }
@@ -61,7 +62,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
             return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
         }
 
-        @trigger_error((\extension_loaded('curl') ? 'Upgrade' : 'Install').' the curl extension or run "composer require amphp/http-client" to perform async HTTP operations, including full HTTP/2 support', \E_USER_NOTICE);
+        @trigger_error((\extension_loaded('curl') ? 'Upgrade' : 'Install').' the curl extension or run "composer require amphp/http-client:^4.2.1" to perform async HTTP operations, including full HTTP/2 support', \E_USER_NOTICE);
 
         return new NativeHttpClient($defaultOptions, $maxHostConnections);
     }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\HttpClient;`
`13`	`13`
`14`	`14`	`use Amp\Http\Client\Connection\ConnectionLimitingPool;`
	`15`	`+use Amp\Promise;`
`15`	`16`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`16`	`17`
`17`	`18`	`/**`
`@@ -30,7 +31,7 @@ final class HttpClient`
`30`	`31`	`*/`
`31`	`32`	`public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface`
`32`	`33`	`{`
`33`		`- if ($amp = class_exists(ConnectionLimitingPool::class)) {`
	`34`	`+ if ($amp = class_exists(ConnectionLimitingPool::class) && interface_exists(Promise::class)) {`
`34`	`35`	`if (!\extension_loaded('curl')) {`
`35`	`36`	`return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);`
`36`	`37`	`}`
`@@ -61,7 +62,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection`
`61`	`62`	`return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);`
`62`	`63`	`}`
`63`	`64`
`64`		`- @trigger_error((\extension_loaded('curl') ? 'Upgrade' : 'Install').' the curl extension or run "composer require amphp/http-client" to perform async HTTP operations, including full HTTP/2 support', \E_USER_NOTICE);`
	`65`	`+ @trigger_error((\extension_loaded('curl') ? 'Upgrade' : 'Install').' the curl extension or run "composer require amphp/http-client:^4.2.1" to perform async HTTP operations, including full HTTP/2 support', \E_USER_NOTICE);`
`65`	`66`
`66`	`67`	`return new NativeHttpClient($defaultOptions, $maxHostConnections);`
`67`	`68`	`}`