Skip to content

Commit 2b37e4f

Browse files
Merge branch '5.2' into 5.3
* 5.2: Backport type fixes Fix CS Avoid triggering the autoloader in Deprecation::isLegacy() fix markdown markup Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents 2cfaa80 + 0544209 commit 2b37e4f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

CurlHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ private static function createRedirectResolver(array $options, string $host): \C
490490
};
491491
}
492492

493-
private function findConstantName($opt): ?string
493+
private function findConstantName(int $opt): ?string
494494
{
495495
$constants = array_filter(get_defined_constants(), static function ($v, $k) use ($opt) {
496496
return $v === $opt && 'C' === $k[0] && (0 === strpos($k, 'CURLOPT_') || 0 === strpos($k, 'CURLINFO_'));

Response/CurlResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ private static function select(ClientState $multi, float $timeout): int
362362
/**
363363
* Parses header lines as curl yields them to us.
364364
*/
365-
private static function parseHeaderLine($ch, string $data, array &$info, array &$headers, ?array $options, CurlClientState $multi, int $id, ?string &$location, ?callable $resolveRedirect, ?LoggerInterface $logger, &$content = null): int
365+
private static function parseHeaderLine($ch, string $data, array &$info, array &$headers, ?array $options, CurlClientState $multi, int $id, ?string &$location, ?callable $resolveRedirect, ?LoggerInterface $logger): int
366366
{
367367
$waitFor = @curl_getinfo($ch, \CURLINFO_PRIVATE) ?: '_0';
368368

Response/TraceableResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public static function stream(HttpClientInterface $client, iterable $responses,
202202
}
203203
}
204204

205-
private function checkStatusCode($code)
205+
private function checkStatusCode(int $code)
206206
{
207207
if (500 <= $code) {
208208
throw new ServerException($this);

ScopingHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(HttpClientInterface $client, array $defaultOptionsBy
4343
}
4444
}
4545

46-
public static function forBaseUri(HttpClientInterface $client, string $baseUri, array $defaultOptions = [], $regexp = null): self
46+
public static function forBaseUri(HttpClientInterface $client, string $baseUri, array $defaultOptions = [], string $regexp = null): self
4747
{
4848
if (null === $regexp) {
4949
$regexp = preg_quote(implode('', self::resolveUrl(self::parseUrl('.'), self::parseUrl($baseUri))));

0 commit comments

Comments
 (0)