Skip to content

Commit 308f6f3

Browse files
Merge branch '5.4' into 6.0
* 5.4: CS fixes Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 3c6fc53 + cfd85e4 commit 308f6f3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CurlHttpClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ private function findConstantName(int $opt): ?string
447447
private function validateExtraCurlOptions(array $options): void
448448
{
449449
$curloptsToConfig = [
450-
//options used in CurlHttpClient
450+
// options used in CurlHttpClient
451451
\CURLOPT_HTTPAUTH => 'auth_ntlm',
452452
\CURLOPT_USERPWD => 'auth_ntlm',
453453
\CURLOPT_RESOLVE => 'resolve',
@@ -475,7 +475,7 @@ private function validateExtraCurlOptions(array $options): void
475475
\CURLOPT_CERTINFO => 'capture_peer_cert_chain',
476476
\CURLOPT_USERAGENT => 'normalized_headers',
477477
\CURLOPT_REFERER => 'headers',
478-
//options used in CurlResponse
478+
// options used in CurlResponse
479479
\CURLOPT_NOPROGRESS => 'on_progress',
480480
\CURLOPT_PROGRESSFUNCTION => 'on_progress',
481481
];

Exception/HttpExceptionTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(ResponseInterface $response)
6161
$separator = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
6262
$message = ($body['hydra:title'] ?? '').$separator.($body['hydra:description'] ?? '');
6363
} elseif ((isset($body['title']) || isset($body['detail']))
64-
&& (is_scalar($body['title'] ?? '') && is_scalar($body['detail'] ?? ''))) {
64+
&& (\is_scalar($body['title'] ?? '') && \is_scalar($body['detail'] ?? ''))) {
6565
// see RFC 7807 and https://jsonapi.org/format/#error-objects
6666
$separator = isset($body['title'], $body['detail']) ? "\n\n" : '';
6767
$message = ($body['title'] ?? '').$separator.($body['detail'] ?? '');

HttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
5050
}
5151

5252
if (\extension_loaded('curl')) {
53-
if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
53+
if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || \ini_get('curl.cainfo') || \ini_get('openssl.cafile') || \ini_get('openssl.capath')) {
5454
return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
5555
}
5656

HttpClientTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
171171

172172
// Finalize normalization of options
173173
$options['http_version'] = (string) ($options['http_version'] ?? '') ?: null;
174-
if (0 > $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'))) {
174+
if (0 > $options['timeout'] = (float) ($options['timeout'] ?? \ini_get('default_socket_timeout'))) {
175175
$options['timeout'] = 172800.0; // 2 days
176176
}
177177

0 commit comments

Comments
 (0)