Skip to content

Commit c806cb4

Browse files
Merge branch '5.4' into 6.0
* 5.4: [HttpClient] Remove deprecated usage of `GuzzleHttp\Promise\queue` [PropertyAccess] Fix handling of uninitialized property of anonymous class [FrameworkBundle] Allow default cache pools to be overwritten by user [DependencyInjection] fix test ResolveBindingsPass remove loading of class iterable [FrameworkBundle] Avoid calling rtrim(null, '/') in AssetsInstallCommand Optimization of resolveEnvPlaceholders Fix incorrect format [DependencyInjection] Fix nested env var with resolve processor Allow OutputFormatter::escape() to be used for escaping URLs used in <href> allow a zero time-limit Use correct tag for ExpoTransportFactory service [DependencyInjection] Ignore argument type check in CheckTypeDeclarationsPass if it's a Definition with a factory [Validators] Add translations for Slovak #43735
2 parents 6b41d3c + 5797d31 commit c806cb4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

HttplugClient.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use GuzzleHttp\Promise\Promise as GuzzlePromise;
1515
use GuzzleHttp\Promise\RejectedPromise;
16+
use GuzzleHttp\Promise\Utils;
1617
use Http\Client\Exception\NetworkException;
1718
use Http\Client\Exception\RequestException;
1819
use Http\Client\HttpAsyncClient;
@@ -73,7 +74,7 @@ public function __construct(HttpClientInterface $client = null, ResponseFactoryI
7374
{
7475
$this->client = $client ?? HttpClient::create();
7576
$streamFactory ??= $responseFactory instanceof StreamFactoryInterface ? $responseFactory : null;
76-
$this->promisePool = \function_exists('GuzzleHttp\Promise\queue') ? new \SplObjectStorage() : null;
77+
$this->promisePool = class_exists(Utils::class) ? new \SplObjectStorage() : null;
7778

7879
if (null === $responseFactory || null === $streamFactory) {
7980
if (!class_exists(Psr17Factory::class) && !class_exists(Psr17FactoryDiscovery::class)) {

Internal/HttplugWaitLoop.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function wait(?ResponseInterface $pendingResponse, float $maxDuration = n
5252
return 0;
5353
}
5454

55-
$guzzleQueue = \GuzzleHttp\Promise\queue();
55+
$guzzleQueue = \GuzzleHttp\Promise\Utils::queue();
5656

5757
if (0.0 === $remainingDuration = $maxDuration) {
5858
$idleTimeout = 0.0;

0 commit comments

Comments
 (0)