Merge branch '5.1' into 5.2

* 5.1:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/MockHttpClientTest.php

@@ -267,7 +267,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 break;
 
             case 'testDnsError':
-                $mock = $this->getMockBuilder(ResponseInterface::class)->getMock();
+                $mock = $this->createMock(ResponseInterface::class);
                 $mock->expects($this->any())
                     ->method('getStatusCode')
                     ->willThrowException(new TransportException('DSN error'));
@@ -290,7 +290,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 break;
 
             case 'testTimeoutOnAccess':
-                $mock = $this->getMockBuilder(ResponseInterface::class)->getMock();
+                $mock = $this->createMock(ResponseInterface::class);
                 $mock->expects($this->any())
                     ->method('getHeaders')
                     ->willThrowException(new TransportException('Timeout'));
@@ -357,7 +357,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 break;
 
             case 'testMaxDuration':
-                $mock = $this->getMockBuilder(ResponseInterface::class)->getMock();
+                $mock = $this->createMock(ResponseInterface::class);
                 $mock->expects($this->any())
                     ->method('getContent')
                     ->willReturnCallback(static function (): void {

Tests/TraceableHttpClientTest.php

@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
 
     public function testItTracesRequest()
     {
-        $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
+        $httpClient = $this->createMock(HttpClientInterface::class);
         $httpClient
             ->expects($this->any())
             ->method('request')