Merge branch '6.0' into 6.1

* 6.0:
  CS fixes
  Bump Symfony version to 6.0.11
  Update VERSION for 6.0.10
  Update CHANGELOG for 6.0.10
  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

Author: nicolas-grekas

CurlHttpClient.php

@@ -449,7 +449,7 @@ private function findConstantName(int $opt): ?string
     private function validateExtraCurlOptions(array $options): void
     {
         $curloptsToConfig = [
-            //options used in CurlHttpClient
+            // options used in CurlHttpClient
             \CURLOPT_HTTPAUTH => 'auth_ntlm',
             \CURLOPT_USERPWD => 'auth_ntlm',
             \CURLOPT_RESOLVE => 'resolve',
@@ -477,7 +477,7 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_CERTINFO => 'capture_peer_cert_chain',
             \CURLOPT_USERAGENT => 'normalized_headers',
             \CURLOPT_REFERER => 'headers',
-            //options used in CurlResponse
+            // options used in CurlResponse
             \CURLOPT_NOPROGRESS => 'on_progress',
             \CURLOPT_PROGRESSFUNCTION => 'on_progress',
         ];

Exception/HttpExceptionTrait.php

@@ -61,7 +61,7 @@ public function __construct(ResponseInterface $response)
                 $separator = isset($body['hydra:title'], $body['hydra:description']) ? "\n\n" : '';
                 $message = ($body['hydra:title'] ?? '').$separator.($body['hydra:description'] ?? '');
             } elseif ((isset($body['title']) || isset($body['detail']))
-                && (is_scalar($body['title'] ?? '') && is_scalar($body['detail'] ?? ''))) {
+                && (\is_scalar($body['title'] ?? '') && \is_scalar($body['detail'] ?? ''))) {
                 // see RFC 7807 and https://jsonapi.org/format/#error-objects
                 $separator = isset($body['title'], $body['detail']) ? "\n\n" : '';
                 $message = ($body['title'] ?? '').$separator.($body['detail'] ?? '');

HttpClient.php

@@ -50,7 +50,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
         }
 
         if (\extension_loaded('curl')) {
-            if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
+            if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || \ini_get('curl.cainfo') || \ini_get('openssl.cafile') || \ini_get('openssl.capath')) {
                 return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
             }
 

HttpClientTrait.php

@@ -175,7 +175,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         // Finalize normalization of options
         $options['http_version'] = (string) ($options['http_version'] ?? '') ?: null;
-        if (0 > $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'))) {
+        if (0 > $options['timeout'] = (float) ($options['timeout'] ?? \ini_get('default_socket_timeout'))) {
             $options['timeout'] = 172800.0; // 2 days
         }
 

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -324,7 +324,7 @@ public function __toString(): string
                             'foo' => [
                                 'bar' => 'baz',
                                 'qux' => [1.10, 1.0],
-                                'fred' => ['<foo>',"'bar'",'"baz"','&blong&'],
+                                'fred' => ['<foo>', "'bar'", '"baz"', '&blong&'],
                             ],
                         ],
                     ],

Tests/HttpClientTestCase.php

@@ -23,7 +23,6 @@
 use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;
 use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
-
 /*
 Tests for HTTP2 Push need a recent version of both PHP and curl. This docker command should run them:
 docker run -it --rm -v $(pwd):/app -v /path/to/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient --filter Push