Merge branch '4.4' into 5.1

* 4.4:
  Use ::class keyword when possible

Author: fabpot

DebugClassLoader.php

@@ -231,8 +231,8 @@ public function getClassLoader(): callable
     public static function enable(): void
     {
         // Ensures we don't hit https://bugs.php.net/42098
-        class_exists('Symfony\Component\ErrorHandler\ErrorHandler');
-        class_exists('Psr\Log\LogLevel');
+        class_exists(\Symfony\Component\ErrorHandler\ErrorHandler::class);
+        class_exists(\Psr\Log\LogLevel::class);
 
         if (!\is_array($functions = spl_autoload_functions())) {
             return;

Tests/DebugClassLoaderTest.php

@@ -51,7 +51,7 @@ public function testIdempotence()
                 $reflProp = $reflClass->getProperty('classLoader');
                 $reflProp->setAccessible(true);
 
-                $this->assertNotInstanceOf('Symfony\Component\ErrorHandler\DebugClassLoader', $reflProp->getValue($function[0]));
+                $this->assertNotInstanceOf(DebugClassLoader::class, $reflProp->getValue($function[0]));
 
                 return;
             }
@@ -62,7 +62,7 @@ public function testIdempotence()
 
     public function testThrowingClass()
     {
-        $this->expectException('Exception');
+        $this->expectException(\Exception::class);
         $this->expectExceptionMessage('boo');
         try {
             class_exists(Fixtures\Throwing::class);
@@ -77,14 +77,14 @@ class_exists(Fixtures\Throwing::class);
 
     public function testNameCaseMismatch()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
         class_exists(TestingCaseMismatch::class, true);
     }
 
     public function testFileCaseMismatch()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Case mismatch between class and real file names');
         if (!file_exists(__DIR__.'/Fixtures/CaseMismatch.php')) {
             $this->markTestSkipped('Can only be run on case insensitive filesystems');
@@ -95,7 +95,7 @@ class_exists(Fixtures\CaseMismatch::class, true);
 
     public function testPsr4CaseMismatch()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Case mismatch between loaded and declared class names');
         class_exists(__NAMESPACE__.'\Fixtures\Psr4CaseMismatch', true);
     }
@@ -176,7 +176,7 @@ public function testDeprecatedSuperInSameNamespace()
         $e = error_reporting(0);
         trigger_error('', E_USER_NOTICE);
 
-        class_exists('Symfony\Bridge\ErrorHandler\Tests\Fixtures\ExtendsDeprecatedParent', true);
+        class_exists(\Symfony\Bridge\ErrorHandler\Tests\Fixtures\ExtendsDeprecatedParent::class, true);
 
         error_reporting($e);
         restore_error_handler();

Tests/ErrorHandlerTest.php

@@ -35,7 +35,7 @@ public function testRegister()
         $handler = ErrorHandler::register();
 
         try {
-            $this->assertInstanceOf('Symfony\Component\ErrorHandler\ErrorHandler', $handler);
+            $this->assertInstanceOf(ErrorHandler::class, $handler);
             $this->assertSame($handler, ErrorHandler::register());
 
             $newHandler = new ErrorHandler();
@@ -62,7 +62,7 @@ public function testRegister()
 
     public function testErrorGetLast()
     {
-        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
         $handler = ErrorHandler::register();
         $handler->setDefaultLogger($logger);
         $handler->screamAt(\E_ALL);
@@ -194,7 +194,7 @@ public function testConstruct()
     public function testDefaultLogger()
     {
         try {
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
             $handler = ErrorHandler::register();
 
             $handler->setDefaultLogger($logger, \E_NOTICE);
@@ -269,7 +269,7 @@ public function testHandleError()
             restore_error_handler();
             restore_exception_handler();
 
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
 
             $warnArgCheck = function ($logLevel, $message, $context) {
                 $this->assertEquals('info', $logLevel);
@@ -294,7 +294,7 @@ public function testHandleError()
             restore_error_handler();
             restore_exception_handler();
 
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
 
             $line = null;
             $logArgCheck = function ($level, $message, $context) use (&$line) {
@@ -395,7 +395,7 @@ public function testHandleDeprecation()
             $this->assertSame('User Deprecated: Foo deprecation', $exception->getMessage());
         };
 
-        $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
         $logger
             ->expects($this->once())
             ->method('log')
@@ -413,7 +413,7 @@ public function testHandleDeprecation()
     public function testHandleException(string $expectedMessage, \Throwable $exception)
     {
         try {
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
             $handler = ErrorHandler::register();
 
             $logArgCheck = function ($level, $message, $context) use ($expectedMessage, $exception) {
@@ -505,7 +505,7 @@ public function testBootstrappingLogger()
 
         $bootLogger->log(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
 
-        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $mockLogger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
         $mockLogger->expects($this->once())
             ->method('log')
             ->with(LogLevel::WARNING, 'Foo message', ['exception' => $exception]);
@@ -520,7 +520,7 @@ public function testSettingLoggerWhenExceptionIsBuffered()
 
         $exception = new \Exception('Foo message');
 
-        $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+        $mockLogger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
         $mockLogger->expects($this->once())
             ->method('log')
             ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', ['exception' => $exception]);
@@ -535,7 +535,7 @@ public function testSettingLoggerWhenExceptionIsBuffered()
     public function testHandleFatalError()
     {
         try {
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+            $logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)->getMock();
             $handler = ErrorHandler::register();
 
             $error = [
@@ -584,7 +584,7 @@ public function testHandleErrorException()
 
     public function testCustomExceptionHandler()
     {
-        $this->expectException('Exception');
+        $this->expectException(\Exception::class);
         $handler = new ErrorHandler();
         $handler->setExceptionHandler(function ($e) use ($handler) {
             $handler->setExceptionHandler(null);