Merge branch '4.2' into 4.3

* 4.2:
  Use willReturn() instead of will(returnValue()).

Author: Kyra Farrow

Tests/Exception/HttpExceptionTraitTest.php

@@ -35,14 +35,14 @@ public function testParseError(string $mimeType, string $json): void
         $response = $this->createMock(ResponseInterface::class);
         $response
             ->method('getInfo')
-            ->will($this->returnValueMap([
+            ->willReturnMap([
                 ['http_code', 400],
                 ['url', 'http://example.com'],
                 ['response_headers', [
                     'HTTP/1.1 400 Bad Request',
                     'Content-Type: '.$mimeType,
                 ]],
-            ]));
+            ]);
         $response->method('getContent')->willReturn($json);
 
         $e = new TestException($response);