Merge branch '6.2' into 6.3

* 6.2: (21 commits)
  Fix tests
  CS fix
  [HttpKernel] Tests for DataCollector
  for #49320
  [Console] Fix computing column width containing multibyte chars
  [Messenger] Fix deprecation layer of RedeliveryStamp
  [Mime] Form field values with integer keys not resolved correctly
  [Messenger] [Redis] Fixed problem where worker stops handling messages on first empty message
  [PHPUnitBridge] Fix PHPUnit 10.1 compatibility
  [VarDumper] Make the server TCP connection sync
  [Messenger] Fix warning message on failed messenger show command
  [Mailer] [Mailjet] Use body MessageID instead of X-MJ-Request-GUID
  [HttpFoundation] Fix BinaryFileResponse
  [Form] fix merge
  [HttpFoundation] Fix memory limit problems in BinaryFileResponse
  [PropertyAccess] Readonly properties must have no PropertyWriteInfo
  [Form] Cast choices value callback result to string
  [Serializer] Unexpected value should throw UnexpectedValueException
  [ErrorHandler] Don't throw deprecations for HttplugClient
  [Serializer] Fix denormalization of object with typed constructor arg (not castable) and with COLLECT_DENORMALIZATION_ERRORS
  ...

Author: nicolas-grekas

DeprecationErrorHandler.php

@@ -12,8 +12,9 @@
 namespace Symfony\Bridge\PhpUnit;
 
 use PHPUnit\Framework\TestResult;
+use PHPUnit\Runner\ErrorHandler;
 use PHPUnit\Util\Error\Handler;
-use PHPUnit\Util\ErrorHandler;
+use PHPUnit\Util\ErrorHandler as UtilErrorHandler;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Configuration;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\DeprecationGroup;
@@ -75,7 +76,12 @@ public static function register($mode = 0)
         if (null !== $oldErrorHandler) {
             restore_error_handler();
 
-            if ($oldErrorHandler instanceof ErrorHandler || [ErrorHandler::class, 'handleError'] === $oldErrorHandler) {
+            if (
+                $oldErrorHandler instanceof UtilErrorHandler
+                || [UtilErrorHandler::class, 'handleError'] === $oldErrorHandler
+                || $oldErrorHandler instanceof ErrorHandler
+                || [ErrorHandler::class, 'handleError'] === $oldErrorHandler
+            ) {
                 restore_error_handler();
                 self::register($mode);
             }
@@ -359,6 +365,8 @@ private static function getPhpUnitErrorHandler(): callable
         if (!$eh = self::$errorHandler) {
             if (class_exists(Handler::class)) {
                 $eh = self::$errorHandler = Handler::class;
+            } elseif (method_exists(UtilErrorHandler::class, '__invoke')) {
+                $eh = self::$errorHandler = UtilErrorHandler::class;
             } elseif (method_exists(ErrorHandler::class, '__invoke')) {
                 $eh = self::$errorHandler = ErrorHandler::class;
             } else {