Merge branch '7.4' into 8.0

* 7.4:
  fix merge
  [HttpFoundation] Fix tests
  [JsonStreamer] Finish #62063 upmerge
  [Console] Fix signal handlers not being cleared after command termination
  [HttpFoundation] Fix RequestTest insulation
  ReflectionMethod::setAccessible() is no-op since PHP 8.1
  CS fix
  fix merge

Author: nicolas-grekas

AcceptHeader.php

@@ -46,18 +46,15 @@ public function __construct(array $items)
      */
     public static function fromString(?string $headerValue): self
     {
-        $parts = HeaderUtils::split($headerValue ?? '', ',;=');
+        $items = [];
+        foreach (HeaderUtils::split($headerValue ?? '', ',;=') as $i => $parts) {
+            $part = array_shift($parts);
+            $item = new AcceptHeaderItem($part[0], HeaderUtils::combine($parts));
 
-        return new self(array_map(function ($subParts) {
-            static $index = 0;
-            $part = array_shift($subParts);
-            $attributes = HeaderUtils::combine($subParts);
-
-            $item = new AcceptHeaderItem($part[0], $attributes);
-            $item->setIndex($index++);
+            $items[] = $item->setIndex($i);
+        }
 
-            return $item;
-        }, $parts));
+        return new self($items);
     }
 
     /**
@@ -95,10 +92,11 @@ public function get(string $value): ?AcceptHeaderItem
             return null;
         }
 
-        usort($candidates, fn ($a, $b) =>
-            $this->getSpecificity($b, $queryItem) <=> $this->getSpecificity($a, $queryItem) // Descending specificity
-            ?: $b->getQuality() <=> $a->getQuality() // Descending quality
-            ?: $a->getIndex() <=> $b->getIndex() // Ascending index (stability)
+        usort(
+            $candidates,
+            fn ($a, $b) => $this->getSpecificity($b, $queryItem) <=> $this->getSpecificity($a, $queryItem) // Descending specificity
+                ?: $b->getQuality() <=> $a->getQuality() // Descending quality
+                ?: $a->getIndex() <=> $b->getIndex() // Ascending index (stability)
         );
 
         return reset($candidates);

Tests/Fixtures/response-functional/invalid_cookie_name.php

@@ -6,6 +6,6 @@
 
 try {
     $r->headers->setCookie(new Cookie('Hello + world', 'hodor', 0, null, null, null, false, true));
-} catch (\InvalidArgumentException $e) {
+} catch (InvalidArgumentException $e) {
     echo $e->getMessage();
 }

Tests/RequestTest.php

@@ -31,6 +31,8 @@ protected function tearDown(): void
         Request::setTrustedProxies([], -1);
         Request::setTrustedHosts([]);
         Request::setAllowedHttpMethodOverride(null);
+        Request::setFactory(null);
+        \Closure::bind(static fn () => self::$formats = null, null, Request::class)();
     }
 
     public function testInitialize()
@@ -583,11 +585,11 @@ public static function getFormatToMimeTypeMapProvider()
             ['form', ['application/x-www-form-urlencoded', 'multipart/form-data']],
             ['rss', ['application/rss+xml']],
             ['soap', ['application/soap+xml']],
-            ['html', ['application/xhtml+xml']],
+            ['html', ['text/html', 'application/xhtml+xml']],
             ['problem', ['application/problem+json']],
             ['hal', ['application/hal+json', 'application/hal+xml']],
             ['jsonapi', ['application/vnd.api+json']],
-            ['yaml', ['application/x-yaml', 'text/yaml']],
+            ['yaml', ['text/yaml', 'application/x-yaml']],
             ['wbxml', ['application/vnd.wap.wbxml']],
         ];
     }