Merge branch '7.4' into 8.0

* 7.4:
  [FrameworkBundle] Dump all registered extensions’ configuration reference
  fix merge
  Mark FormFlow as finished if the last step is skipped
  [HttpKernel] Fix using MapRequestPayload on nullable arguments
  [ObjectMapper] bypass lazy ghost with class transform
  [WebProfilerBundle] fix displaying runner
  [DependencyInjection] Fix preloading LazyClosure
  [Emoji] Update list to version 17
  make doLoadClassMetadata() methods private
  fix routing config type information
  [HttpClient] Don't reset unused clients in data collector

Author: nicolas-grekas

DataCollector/HttpClientDataCollector.php

@@ -64,7 +64,9 @@ public function lateCollect(): void
             $this->data['error_count'] += $errorCount;
             $this->data['clients'][$name]['error_count'] += $errorCount;
 
-            $client->reset();
+            if ($traces) {
+                $client->reset();
+            }
         }
     }
 

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
 use Symfony\Component\HttpClient\TraceableHttpClient;
 use Symfony\Contracts\HttpClient\Test\TestHttpServer;
@@ -436,4 +437,42 @@ private function httpClientThatHasTracedRequests($tracedRequests): TraceableHttp
 
         return $httpClient;
     }
+
+    #[DataProvider('provideClientIsResetWhenExpectedCases')]
+    public function testClientIsResetWhenExpected(\Closure $request, bool $wasReset)
+    {
+        $mockHttpClient = new class extends MockHttpClient {
+            public bool $wasReset = false;
+
+            public function reset(): void
+            {
+                parent::reset();
+
+                $this->wasReset = true;
+            }
+        };
+
+        $sut = new HttpClientDataCollector();
+        $sut->registerClient('http_client', $traceableHttpClient = new TraceableHttpClient($mockHttpClient));
+        $request($traceableHttpClient);
+        $sut->lateCollect();
+
+        $this->assertSame($wasReset, $mockHttpClient->wasReset);
+    }
+
+    public static function provideClientIsResetWhenExpectedCases(): iterable
+    {
+        yield [
+            function (TraceableHttpClient $traceableHttpClient) {
+                $response = $traceableHttpClient->request('GET', 'http://localhost/');
+                $response->getContent();
+            },
+            true,
+        ];
+
+        yield [
+            fn () => null,
+            false,
+        ];
+    }
 }