Merge branch '5.1' into 5.2

* 5.1:
  Use ::class keyword when possible

Author: fabpot

DeprecationErrorHandler.php

@@ -338,7 +338,7 @@ private function displayDeprecations($groups, $configuration, $isFailing)
     private static function getPhpUnitErrorHandler()
     {
         if (!isset(self::$isAtLeastPhpUnit83)) {
-            self::$isAtLeastPhpUnit83 = class_exists('PHPUnit\Util\ErrorHandler') && method_exists('PHPUnit\Util\ErrorHandler', '__invoke');
+            self::$isAtLeastPhpUnit83 = class_exists(ErrorHandler::class) && method_exists(ErrorHandler::class, '__invoke');
         }
         if (!self::$isAtLeastPhpUnit83) {
             return 'PHPUnit\Util\ErrorHandler::handleError';

Legacy/SymfonyTestsListenerTrait.php

@@ -135,8 +135,8 @@ public function startTestSuite($suite)
             echo "Testing $suiteName\n";
             $this->state = 0;
 
-            if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
-                if (method_exists('Doctrine\Common\Annotations\AnnotationRegistry', 'registerUniqueLoader')) {
+            if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+                if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
                     AnnotationRegistry::registerUniqueLoader('class_exists');
                 } else {
                     AnnotationRegistry::registerLoader('class_exists');

Tests/Fixtures/coverage/tests/BarCovTest.php

@@ -17,7 +17,7 @@ class BarCovTest extends TestCase
 {
     public function testBarCov()
     {
-        if (!class_exists('PhpUnitCoverageTest\FooCov')) {
+        if (!class_exists(\PhpUnitCoverageTest\FooCov::class)) {
             $this->markTestSkipped('This test is not part of the main Symfony test suite. It\'s here to test the CoverageListener.');
         }
 

Tests/ProcessIsolationTest.php

@@ -24,7 +24,7 @@ public function testIsolation()
 
     public function testCallingOtherErrorHandler()
     {
-        $this->expectException('PHPUnit\Framework\Exception');
+        $this->expectException(\PHPUnit\Framework\Exception::class);
         $this->expectExceptionMessage('Test that PHPUnit\'s error handler fires.');
 
         trigger_error('Test that PHPUnit\'s error handler fires.', \E_USER_WARNING);

bin/simple-phpunit.php

@@ -269,17 +269,17 @@
 define('PHPUNIT_COMPOSER_INSTALL', __DIR__.'/vendor/autoload.php');
 require PHPUNIT_COMPOSER_INSTALL;
 
-if (!class_exists('SymfonyExcludeListPhpunit', false)) {
+if (!class_exists(\SymfonyExcludeListPhpunit::class, false)) {
     class SymfonyExcludeListPhpunit {}
 }
-if (method_exists('PHPUnit\Util\ExcludeList', 'addDirectory')) {
+if (method_exists(\PHPUnit\Util\ExcludeList::class, 'addDirectory')) {
     (new PHPUnit\Util\Excludelist())->getExcludedDirectories();
-    PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListPhpunit'))->getFileName()));
-    class_exists('SymfonyExcludeListSimplePhpunit', false) && PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
-} elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
+    PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
+    class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
+} elseif (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
     (new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
-    PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListPhpunit'))->getFileName()));
-    class_exists('SymfonyExcludeListSimplePhpunit', false) && PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
+    PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListPhpunit::class))->getFileName()));
+    class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass(\SymfonyExcludeListSimplePhpunit::class))->getFileName()));
 } else {
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListPhpunit'] = 1;
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListSimplePhpunit'] = 1;
@@ -404,7 +404,7 @@ class_exists('SymfonyExcludeListSimplePhpunit', false) && PHPUnit\Util\Blacklist
         }
     }
 } elseif (!isset($argv[1]) || 'install' !== $argv[1] || file_exists('install')) {
-    if (!class_exists('SymfonyExcludeListSimplePhpunit', false)) {
+    if (!class_exists(\SymfonyExcludeListSimplePhpunit::class, false)) {
         class SymfonyExcludeListSimplePhpunit
         {
         }

bootstrap.php

@@ -12,7 +12,7 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
-if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
+if (class_exists(\PHPUnit_Runner_Version::class) && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
     $classes = [
         'PHPUnit_Framework_Assert', // override PhpUnit's ForwardCompat child class
         'PHPUnit_Framework_AssertionFailedError', // override PhpUnit's ForwardCompat child class
@@ -110,15 +110,15 @@ class_alias('PHPUnit_Framework_Error', 'PHPUnit\Framework\Error\Error');
 }
 
 // Detect if we're loaded by an actual run of phpunit
-if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
+if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists(\PHPUnit_TextUI_Command::class, false) && !class_exists(\PHPUnit\TextUI\Command::class, false)) {
     return;
 }
 
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');
 
-if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
-    if (method_exists('Doctrine\Common\Annotations\AnnotationRegistry', 'registerUniqueLoader')) {
+if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+    if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
         AnnotationRegistry::registerUniqueLoader('class_exists');
     } else {
         AnnotationRegistry::registerLoader('class_exists');