Merge branch '6.4' into 7.0

* 6.4:
  [PhpUnitBridge] Fix error handler triggered outside of tests

Author: fabpot

Diff for: DeprecationErrorHandler.php

@@ -367,22 +367,26 @@ private static function getPhpUnitErrorHandler(): callable
 
         if ('PHPUnit\Util\ErrorHandler::handleError' === $eh) {
             return $eh;
-        } elseif (ErrorHandler::class === $eh) {
-            return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
-                ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
-
-                return true;
-            };
         }
 
         foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
-            if (isset($frame['object']) && $frame['object'] instanceof TestResult) {
+            if (!isset($frame['object'])) {
+                continue;
+            }
+
+            if ($frame['object'] instanceof TestResult) {
                 return new $eh(
                     $frame['object']->getConvertDeprecationsToExceptions(),
                     $frame['object']->getConvertErrorsToExceptions(),
                     $frame['object']->getConvertNoticesToExceptions(),
                     $frame['object']->getConvertWarningsToExceptions()
                 );
+            } elseif (ErrorHandler::class === $eh && $frame['object'] instanceof TestCase) {
+                return function (int $errorNumber, string $errorString, string $errorFile, int $errorLine) {
+                    ErrorHandler::instance()($errorNumber, $errorString, $errorFile, $errorLine);
+
+                    return true;
+                };
             }
         }