Don't use autoloader in class_exists() check

alexpott · nicolas-grekas · commit bc777a5bce0f · 2017-10-25T10:00:02.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -251,14 +251,13 @@ public static function collectDeprecations($outputFile)
         $deprecations = array();
         $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$deprecations, &$previousErrorHandler) {
             if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
-                // This can be registered before the PHPUnit error handler.
-                if (!$previousErrorHandler) {
-                    $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
-
-                    return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
-                } else {
+                if ($previousErrorHandler) {
                     return $previousErrorHandler($type, $msg, $file, $line, $context);
                 }
+
+                $ErrorHandler = class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_ErrorHandler' : 'PHPUnit\Util\ErrorHandler';
+
+                return $ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
             $deprecations[] = array(error_reporting(), $msg);
         });
