Merge branch '6.2' into 6.3

* 6.2: (25 commits)
  Bump Symfony version to 6.2.7
  Update VERSION for 6.2.6
  Update CHANGELOG for 6.2.6
  Bump Symfony version to 5.4.21
  Update VERSION for 5.4.20
  Update CHANGELOG for 5.4.20
  [HttpFoundation] Fix bad return type in IpUtils::checkIp4()
  [DependencyInjection] Fix order of arguments when mixing positional and named ones
  [HttpClient] Fix collecting data non-late for the profiler
  [Security/Http] Fix compat of persistent remember-me with legacy tokens
  Bump Symfony version to 6.2.6
  Update VERSION for 6.2.5
  Update CHANGELOG for 6.2.5
  Bump Symfony version to 6.1.12
  Update VERSION for 6.1.11
  Update CHANGELOG for 6.1.11
  Bump Symfony version to 6.0.20
  Update VERSION for 6.0.19
  Update CHANGELOG for 6.0.19
  Bump Symfony version to 5.4.20
  ...

Author: nicolas-grekas

DataCollector/HttpClientDataCollector.php

@@ -38,22 +38,28 @@ public function registerClient(string $name, TraceableHttpClient $client)
 
     public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
+        $this->lateCollect();
     }
 
     public function lateCollect()
     {
-        $this->reset();
+        $this->data['request_count'] = 0;
+        $this->data['error_count'] = 0;
+        $this->data += ['clients' => []];
 
         foreach ($this->clients as $name => $client) {
             [$errorCount, $traces] = $this->collectOnClient($client);
 
-            $this->data['clients'][$name] = [
-                'traces' => $traces,
-                'error_count' => $errorCount,
+            $this->data['clients'] += [
+                $name => [
+                    'traces' => [],
+                    'error_count' => 0,
+                ],
             ];
 
+            $this->data['clients'][$name]['traces'] = array_merge($this->data['clients'][$name]['traces'], $traces);
             $this->data['request_count'] += \count($traces);
-            $this->data['error_count'] += $errorCount;
+            $this->data['error_count'] += $this->data['clients'][$name]['error_count'] += $errorCount;
 
             $client->reset();
         }