Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

DataCollector/HttpClientDataCollector.php

@@ -252,7 +252,7 @@ private function escapePayload(string $payload): string
     {
         static $useProcess;
 
-        if ($useProcess ??= function_exists('proc_open') && class_exists(Process::class)) {
+        if ($useProcess ??= \function_exists('proc_open') && class_exists(Process::class)) {
             return substr((new Process(['', $payload]))->getCommandLine(), 3);
         }
 

HttpClientTrait.php

@@ -652,7 +652,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
         $tail = '';
 
         if (false === $parts = parse_url(\strlen($url) !== strcspn($url, '?#') ? $url : $url.$tail = '#')) {
-            throw new InvalidArgumentException(sprintf('Malformed URL "%s".', $url));
+            throw new InvalidArgumentException(\sprintf('Malformed URL "%s".', $url));
         }
 
         if ($query) {

NoPrivateNetworkHttpClient.php

@@ -30,12 +30,12 @@
  */
 final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwareInterface, ResetInterface
 {
-    use HttpClientTrait;
     use AsyncDecoratorTrait;
+    use HttpClientTrait;
 
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
     private HttpClientInterface $client;
-    private array|null $subnets;
+    private ?array $subnets;
     private int $ipFlags;
     private \ArrayObject $dnsCache;
 
@@ -209,7 +209,7 @@ private static function dnsResolve(\ArrayObject $dnsCache, string $host, int $ip
 
         if ($ip = dns_get_record($host, \DNS_AAAA)) {
             $ip = $ip[0]['ipv6'];
-        } elseif (extension_loaded('sockets')) {
+        } elseif (\extension_loaded('sockets')) {
             if (!$info = socket_addrinfo_lookup($host, 0, ['ai_socktype' => \SOCK_STREAM, 'ai_family' => \AF_INET6])) {
                 return $host;
             }

Tests/HttpClientTestCase.php

@@ -691,7 +691,7 @@ public function testPostToGetRedirect(int $status)
         try {
             $client = $this->getHttpClient(__FUNCTION__);
 
-            $response = $client->request('POST', 'http://localhost:8057/custom?status=' . $status . '&headers[]=Location%3A%20%2F');
+            $response = $client->request('POST', 'http://localhost:8057/custom?status='.$status.'&headers[]=Location%3A%20%2F');
             $body = $response->toArray();
         } finally {
             $p->stop();

Tests/NoPrivateNetworkHttpClientTest.php

@@ -178,13 +178,14 @@ public function testNonCallableOnProgressCallback()
     public function testHeadersArePassedOnRedirect()
     {
         $ipAddr = '104.26.14.6';
-        $url = sprintf('http://%s/', $ipAddr);
+        $url = \sprintf('http://%s/', $ipAddr);
         $content = 'foo';
 
         $callback = function ($method, $url, $options) use ($content): MockResponse {
             $this->assertArrayHasKey('headers', $options);
             $this->assertNotContains('content-type: application/json', $options['headers']);
             $this->assertContains('foo: bar', $options['headers']);
+
             return new MockResponse($content);
         };
         $responses = [