Merge branch '6.1' into 6.2

* 6.1:
  Fix merge
  Fix wrong handling of null values when Unique::fields is set

Author: nicolas-grekas

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -172,7 +172,7 @@ public function testItGeneratesCurlCommandsAsExpected(array $request, string $ex
     {
         $sut = new HttpClientDataCollector();
         $sut->registerClient('http_client', $this->httpClientThatHasTracedRequests([$request]));
-        $sut->collect(new Request(), new Response());
+        $sut->lateCollect();
         $collectedData = $sut->getClients();
         self::assertCount(1, $collectedData['http_client']['traces']);
         $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];
@@ -356,7 +356,7 @@ public function testItDoesNotFollowRedirectionsWhenGeneratingCurlCommands()
                 ],
             ],
         ]));
-        $sut->collect(new Request(), new Response());
+        $sut->lateCollect();
         $collectedData = $sut->getClients();
         self::assertCount(1, $collectedData['http_client']['traces']);
         $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];
@@ -386,7 +386,7 @@ public function testItDoesNotGeneratesCurlCommandsForUnsupportedBodyType()
                 ],
             ],
         ]));
-        $sut->collect(new Request(), new Response());
+        $sut->lateCollect();
         $collectedData = $sut->getClients();
         self::assertCount(1, $collectedData['http_client']['traces']);
         $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];
@@ -408,7 +408,7 @@ public function testItDoesNotGeneratesCurlCommandsForNotEncodableBody()
                 ],
             ],
         ]));
-        $sut->collect(new Request(), new Response());
+        $sut->lateCollect();
         $collectedData = $sut->getClients();
         self::assertCount(1, $collectedData['http_client']['traces']);
         $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];
@@ -430,7 +430,7 @@ public function testItDoesNotGeneratesCurlCommandsForTooBigData()
                 ],
             ],
         ]));
-        $sut->collect(new Request(), new Response());
+        $sut->lateCollect();
         $collectedData = $sut->getClients();
         self::assertCount(1, $collectedData['http_client']['traces']);
         $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];