Merge branch '4.4' into 5.1

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

Author: nicolas-grekas

Tests/MockHttpClientTest.php

@@ -258,7 +258,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'));
@@ -281,7 +281,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'));
@@ -348,7 +348,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

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