Skip to content

Commit efcd218

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Console] Restore psr/log >= 3.0 conflict [Security] Make the abstract Voter class implement CacheableVoterInterface Add generic types to traversable implementations [Security] Fix TypeError message [Security] Fix deprecation layer [FrameworkBundle] Add completion for workflow:dump Fix cancel button Fix misleading error on missing provider with authenticator manager Don't limit retries of toolbar loading
2 parents 3d6e9a5 + b72eab3 commit efcd218

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

HttplugClient.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestF
6060
private HttpClientInterface $client;
6161
private ResponseFactoryInterface $responseFactory;
6262
private StreamFactoryInterface $streamFactory;
63+
64+
/**
65+
* @var \SplObjectStorage<ResponseInterface, array{RequestInterface, Promise}>|null
66+
*/
6367
private ?\SplObjectStorage $promisePool;
68+
6469
private HttplugWaitLoop $waitLoop;
6570

6671
public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null)

Internal/HttplugWaitLoop.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Symfony\Component\HttpClient\Internal;
1313

1414
use Http\Client\Exception\NetworkException;
15+
use Http\Promise\Promise;
16+
use Psr\Http\Message\RequestInterface as Psr7RequestInterface;
1517
use Psr\Http\Message\ResponseFactoryInterface;
1618
use Psr\Http\Message\ResponseInterface as Psr7ResponseInterface;
1719
use Psr\Http\Message\StreamFactoryInterface;
@@ -33,6 +35,9 @@ final class HttplugWaitLoop
3335
private ResponseFactoryInterface $responseFactory;
3436
private StreamFactoryInterface $streamFactory;
3537

38+
/**
39+
* @param \SplObjectStorage<ResponseInterface, array{Psr7RequestInterface, Promise}>|null $promisePool
40+
*/
3641
public function __construct(HttpClientInterface $client, ?\SplObjectStorage $promisePool, ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
3742
{
3843
$this->client = $client;

Response/AsyncResponse.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ public static function stream(iterable $responses, float $timeout = null, string
311311
}
312312
}
313313

314+
/**
315+
* @param \SplObjectStorage<ResponseInterface, AsyncResponse>|null $asyncMap
316+
*/
314317
private static function passthru(HttpClientInterface $client, self $r, ChunkInterface $chunk, \SplObjectStorage $asyncMap = null): \Generator
315318
{
316319
$r->stream = null;
@@ -332,6 +335,9 @@ private static function passthru(HttpClientInterface $client, self $r, ChunkInte
332335
yield from self::passthruStream($response, $r, null, $asyncMap);
333336
}
334337

338+
/**
339+
* @param \SplObjectStorage<ResponseInterface, AsyncResponse>|null $asyncMap
340+
*/
335341
private static function passthruStream(ResponseInterface $response, self $r, ?ChunkInterface $chunk, ?\SplObjectStorage $asyncMap): \Generator
336342
{
337343
while (true) {

Response/TransportResponseTrait.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ private function doDestruct()
148148
/**
149149
* Implements an event loop based on a buffer activity queue.
150150
*
151+
* @param iterable<array-key, self> $responses
152+
*
151153
* @internal
152154
*/
153155
public static function stream(iterable $responses, float $timeout = null): \Generator

0 commit comments

Comments
 (0)