Merge branch '4.4' into 5.1

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

Author: nicolas-grekas

Tests/DebugClassLoaderTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\ErrorHandler\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\ErrorHandler\Tests\Fixtures\ExtendsDeprecatedParent;
 use Symfony\Component\ErrorHandler\DebugClassLoader;
 
 class DebugClassLoaderTest extends TestCase
@@ -176,7 +177,7 @@ public function testDeprecatedSuperInSameNamespace()
         $e = error_reporting(0);
         trigger_error('', E_USER_NOTICE);
 
-        class_exists(\Symfony\Bridge\ErrorHandler\Tests\Fixtures\ExtendsDeprecatedParent::class, true);
+        class_exists(ExtendsDeprecatedParent::class, true);
 
         error_reporting($e);
         restore_error_handler();

Tests/ErrorHandlerTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\ErrorHandler\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Psr\Log\NullLogger;
 use Symfony\Component\ErrorHandler\BufferingLogger;
@@ -62,7 +63,7 @@ public function testRegister()
 
     public function testErrorGetLast()
     {
-        $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+        $logger = $this->createMock(LoggerInterface::class);
         $handler = ErrorHandler::register();
         $handler->setDefaultLogger($logger);
         $handler->screamAt(\E_ALL);
@@ -194,7 +195,7 @@ public function testConstruct()
     public function testDefaultLogger()
     {
         try {
-            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+            $logger = $this->createMock(LoggerInterface::class);
             $handler = ErrorHandler::register();
 
             $handler->setDefaultLogger($logger, \E_NOTICE);
@@ -269,7 +270,7 @@ public function testHandleError()
             restore_error_handler();
             restore_exception_handler();
 
-            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+            $logger = $this->createMock(LoggerInterface::class);
 
             $warnArgCheck = function ($logLevel, $message, $context) {
                 $this->assertEquals('info', $logLevel);
@@ -294,7 +295,7 @@ public function testHandleError()
             restore_error_handler();
             restore_exception_handler();
 
-            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+            $logger = $this->createMock(LoggerInterface::class);
 
             $line = null;
             $logArgCheck = function ($level, $message, $context) use (&$line) {
@@ -395,7 +396,7 @@ public function testHandleDeprecation()
             $this->assertSame('User Deprecated: Foo deprecation', $exception->getMessage());
         };
 
-        $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+        $logger = $this->createMock(LoggerInterface::class);
         $logger
             ->expects($this->once())
             ->method('log')
@@ -413,7 +414,7 @@ public function testHandleDeprecation()
     public function testHandleException(string $expectedMessage, \Throwable $exception)
     {
         try {
-            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+            $logger = $this->createMock(LoggerInterface::class);
             $handler = ErrorHandler::register();
 
             $logArgCheck = function ($level, $message, $context) use ($expectedMessage, $exception) {
@@ -505,7 +506,7 @@ public function testBootstrappingLogger()
 
         $bootLogger->log(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
 
-        $mockLogger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+        $mockLogger = $this->createMock(LoggerInterface::class);
         $mockLogger->expects($this->once())
             ->method('log')
             ->with(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
@@ -520,7 +521,7 @@ public function testSettingLoggerWhenExceptionIsBuffered()
 
         $exception = new \Exception('Foo message');
 
-        $mockLogger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+        $mockLogger = $this->createMock(LoggerInterface::class);
         $mockLogger->expects($this->once())
             ->method('log')
             ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', ['exception' => $exception]);
@@ -535,7 +536,7 @@ public function testSettingLoggerWhenExceptionIsBuffered()
     public function testHandleFatalError()
     {
         try {
-            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
+            $logger = $this->createMock(LoggerInterface::class);
             $handler = ErrorHandler::register();
 
             $error = [