Merge branch '5.3' into 5.4

* 5.3:
  [PHPUnitBridge] Fix skipping triggering file override on 5.3
  Do not override correct triggering file for return type deprecations
  [HttpClient] accept headers when CURLE_RECV_ERROR is received before the content
  Use PHPUnit 9.5 on PHP 8.1
  [Serializer] Attributes that extends the serializer`s annotations do not ignore by the serialization process

Author: nicolas-grekas

DeprecationErrorHandler/Deprecation.php

@@ -87,7 +87,7 @@ public function __construct($message, array $trace, $file)
                     $this->getOriginalFilesStack();
                     array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
 
-                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || preg_match('/^(?:The|Method) "([^":]++)/', $message, $m)) {
+                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (false === strpos($message, '()" will return') && false === strpos($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
                         $this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();
                         array_unshift($this->originalFilesStack, $this->triggeringFile);
                     }

bin/simple-phpunit.php

@@ -94,8 +94,8 @@
 };
 
 if (\PHP_VERSION_ID >= 80000) {
-    // PHP 8 requires PHPUnit 9.3+
-    $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.4') ?: '9.4';
+    // PHP 8 requires PHPUnit 9.3+, PHP 8.1 requires PHPUnit 9.5+
+    $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.5') ?: '9.5';
 } elseif (\PHP_VERSION_ID >= 70200) {
     // PHPUnit 8 requires PHP 7.2+
     $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '8.5') ?: '8.5';