Merge branch '7.4' into 8.0

* 7.4:
  [HttpFoundation] Improve logic in Request::createFromGlobals()

Author: nicolas-grekas

Request.php

@@ -285,21 +285,18 @@ public function initialize(array $query = [], array $request = [], array $attrib
      */
     public static function createFromGlobals(): static
     {
-        $request = self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
-
-        if (!\in_array($request->server->get('REQUEST_METHOD', 'GET'), ['PUT', 'DELETE', 'PATCH', 'QUERY'], true)) {
-            return $request;
+        if (!\in_array($_SERVER['REQUEST_METHOD'] ?? null, ['PUT', 'DELETE', 'PATCH', 'QUERY'], true)) {
+            return self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
         }
 
         try {
             [$post, $files] = request_parse_body();
-
-            $request->request->add($post);
-            $request->files->add($files);
         } catch (\RequestParseBodyException) {
+            $post = $_POST;
+            $files = $_FILES;
         }
 
-        return $request;
+        return self::createRequestFromFactory($_GET, $post, [], $_COOKIE, $files, $_SERVER);
     }
 
     /**
@@ -1496,10 +1493,8 @@ public function getProtocolVersion(): ?string
      */
     public function getContent(bool $asResource = false)
     {
-        $currentContentIsResource = \is_resource($this->content);
-
-        if (true === $asResource) {
-            if ($currentContentIsResource) {
+        if ($asResource) {
+            if (\is_resource($this->content)) {
                 rewind($this->content);
 
                 return $this->content;
@@ -1519,7 +1514,7 @@ public function getContent(bool $asResource = false)
             return fopen('php://input', 'r');
         }
 
-        if ($currentContentIsResource) {
+        if (\is_resource($this->content)) {
             rewind($this->content);
 
             return stream_get_contents($this->content);

Tests/RequestTest.php

@@ -3001,14 +3001,6 @@ public static function providePreferredFormatRfc9110(): iterable
     }
 }
 
-class RequestContentProxy extends Request
-{
-    public function getContent($asResource = false)
-    {
-        return http_build_query(['content' => 'mycontent'], '', '&');
-    }
-}
-
 class NewRequest extends Request
 {
     public function getFoo()