Skip to content

Commit 0ae26e0

Browse files
Merge branch '4.4' into 5.0
* 4.4: (27 commits) [Serializer] minor cleanup fix merge Run PHP 8 as 7.4.99 Remove calls to deprecated ReflectionParameter::getClass(). [VarDumper] fix PHP 8 support Add php 8 to travis. [Cache] Accessing undefined constants raises an Error in php8 [Cache] allow DBAL v3 Skip Doctrine DBAL on php 8 until we have a compatible version. [DomCrawler] Catch expected ValueError. Made method signatures compatible with their corresponding traits. [ErrorHandler] Apply php8 fixes from Debug component. [DomCrawler] Catch expected ValueError. [Validator] Catch expected ValueError. [VarDumper] ReflectionFunction::isDisabled() is deprecated. [BrowserKit] Raw body with custom Content-Type header [PropertyAccess] Parse php 8 TypeErrors correctly. [Intl] Fix call to ReflectionProperty::getValue() for static properties. [HttpKernel] Prevent calling method_exists() with non-string values. Fix wrong roles comparison ...
2 parents e74cdd6 + 5eb7dd0 commit 0ae26e0

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

Response/CurlResponse.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\HttpClient\Chunk\FirstChunk;
1616
use Symfony\Component\HttpClient\Chunk\InformationalChunk;
1717
use Symfony\Component\HttpClient\Exception\TransportException;
18+
use Symfony\Component\HttpClient\Internal\ClientState;
1819
use Symfony\Component\HttpClient\Internal\CurlClientState;
1920
use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
2021
use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -242,8 +243,10 @@ private static function schedule(self $response, array &$runningResponses): void
242243

243244
/**
244245
* {@inheritdoc}
246+
*
247+
* @param CurlClientState $multi
245248
*/
246-
private static function perform(CurlClientState $multi, array &$responses = null): void
249+
private static function perform(ClientState $multi, array &$responses = null): void
247250
{
248251
if (self::$performing) {
249252
if ($responses) {
@@ -289,8 +292,10 @@ private static function perform(CurlClientState $multi, array &$responses = null
289292

290293
/**
291294
* {@inheritdoc}
295+
*
296+
* @param CurlClientState $multi
292297
*/
293-
private static function select(CurlClientState $multi, float $timeout): int
298+
private static function select(ClientState $multi, float $timeout): int
294299
{
295300
if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
296301
// workaround https://bugs.php.net/76480

Response/NativeResponse.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\HttpClient\Chunk\FirstChunk;
1616
use Symfony\Component\HttpClient\Exception\TransportException;
17+
use Symfony\Component\HttpClient\Internal\ClientState;
1718
use Symfony\Component\HttpClient\Internal\NativeClientState;
1819
use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
1920
use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -214,8 +215,10 @@ private static function schedule(self $response, array &$runningResponses): void
214215

215216
/**
216217
* {@inheritdoc}
218+
*
219+
* @param NativeClientState $multi
217220
*/
218-
private static function perform(NativeClientState $multi, array &$responses = null): void
221+
private static function perform(ClientState $multi, array &$responses = null): void
219222
{
220223
// List of native handles for stream_select()
221224
if (null !== $responses) {
@@ -326,8 +329,10 @@ private static function perform(NativeClientState $multi, array &$responses = nu
326329

327330
/**
328331
* {@inheritdoc}
332+
*
333+
* @param NativeClientState $multi
329334
*/
330-
private static function select(NativeClientState $multi, float $timeout): int
335+
private static function select(ClientState $multi, float $timeout): int
331336
{
332337
$_ = [];
333338

0 commit comments

Comments
 (0)