Merge branch '5.4' into 6.2

* 5.4:
  CS fix
  Fix test provider

Author: nicolas-grekas

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -166,6 +166,7 @@ public function testItIsEmptyAfterReset()
 
     /**
      * @requires extension openssl
+     *
      * @dataProvider provideCurlRequests
      */
     public function testItGeneratesCurlCommandsAsExpected(array $request, string $expectedCurlCommand)

Tests/HttpClientTraitTest.php

@@ -54,15 +54,15 @@ public function testPrepareRequestWithBodyIsArray()
         $defaults = [
             'base_uri' => 'http://example.com?c=c',
             'query' => ['a' => 1, 'b' => 'b'],
-            'body' => []
+            'body' => [],
         ];
         [, $defaults] = self::prepareRequest(null, null, $defaults);
 
         [,$options] = self::prepareRequest(null, 'http://example.com', [
             'body' => [1, 2],
             'headers' => [
-                'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8'
-            ]
+                'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8',
+            ],
         ], $defaults);
 
         $this->assertContains('Content-Type: application/x-www-form-urlencoded; charset=utf-8', $options['headers']);