🌐 AI搜索 & 代理 主页
Skip to content

[HttpFoundation] Make Request::createFromGlobals() parse the body of PUT, DELETE, PATCH and QUERY requests #61961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 1 commit into from
Oct 9, 2025
Merged

[HttpFoundation] Make Request::createFromGlobals() parse the body of PUT, DELETE, PATCH and QUERY requests #61961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Component/HttpFoundation/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CHANGELOG
* Add support for structured MIME suffix
* Deprecate using `Request::sendHeaders()` after headers have already been sent; use a `StreamedResponse` instead
* Deprecate method `Request::get()`, use properties `->attributes`, `query` or `request` directly instead
* Make `Request::createFromGlobals()` parse the body of PUT, DELETE, PATCH and QUERY requests

7.3
---
Expand Down
16 changes: 13 additions & 3 deletions src/Symfony/Component/HttpFoundation/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,19 @@ public static function createFromGlobals(): static
{
$request = self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);

if (str_starts_with($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
&& \in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH', 'QUERY'], true)
) {
if (!\in_array($request->server->get('REQUEST_METHOD', 'GET'), ['PUT', 'DELETE', 'PATCH', 'QUERY'], true)) {
return $request;
}

if (\PHP_VERSION_ID >= 80400) {
try {
[$post, $files] = request_parse_body();

$request->request->add($post);
$request->files->add($files);
} catch (\RequestParseBodyException) {
}
} elseif (str_starts_with($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')) {
parse_str($request->getContent(), $data);
$request->request = new InputBag($data);
}
Expand Down
45 changes: 45 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/Fixtures/request-functional/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;

$parent = __DIR__;
while (!@file_exists($parent.'/vendor/autoload.php')) {
if (!@file_exists($parent)) {
// open_basedir restriction in effect
break;
}
if ($parent === dirname($parent)) {
echo "vendor/autoload.php not found\n";
exit(1);
}

$parent = dirname($parent);
}

require $parent.'/vendor/autoload.php';

error_reporting(-1);
ini_set('html_errors', 0);
ini_set('display_errors', 1);

if (filter_var(ini_get('xdebug.default_enable'), \FILTER_VALIDATE_BOOL)) {
xdebug_disable();
}

$request = Request::createFromGlobals();

$r = new JsonResponse([
'request' => $request->request->all(),
'files' => array_map(
static fn (UploadedFile $file) => [
'clientOriginalName' => $file->getClientOriginalName(),
'clientMimeType' => $file->getClientMimeType(),
'content' => $file->getContent(),
],
$request->files->all()
),
]);

$r->send();
97 changes: 97 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/RequestFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\HttpFoundation\Tests;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RequiresPhp;
use PHPUnit\Framework\TestCase;

#[RequiresPhp('>=8.4')]
class RequestFunctionalTest extends TestCase
{
/** @var resource|false */
private static $server;

public static function setUpBeforeClass(): void
{
$spec = [
1 => ['file', '/dev/null', 'w'],
2 => ['file', '/dev/null', 'w'],
];
if (!self::$server = @proc_open('exec '.\PHP_BINARY.' -S localhost:8054', $spec, $pipes, __DIR__.'/Fixtures/request-functional')) {
self::markTestSkipped('PHP server unable to start.');
}
sleep(1);
}

public static function tearDownAfterClass(): void
{
if (self::$server) {
proc_terminate(self::$server);
proc_close(self::$server);
}
}

public static function provideMethodsRequiringExplicitBodyParsing()
{
return [
['PUT'],
['DELETE'],
['PATCH'],
// PHP’s built-in server doesn’t support QUERY
];
}

#[DataProvider('provideMethodsRequiringExplicitBodyParsing')]
public function testFormUrlEncodedBodyParsing(string $method)
{
$response = file_get_contents('http://localhost:8054/', false, stream_context_create([
'http' => [
'header' => 'Content-type: application/x-www-form-urlencoded',
'method' => $method,
'content' => http_build_query(['foo' => 'bar']),
],
]));

$this->assertSame(['foo' => 'bar'], json_decode($response, true)['request']);
}

#[DataProvider('provideMethodsRequiringExplicitBodyParsing')]
public function testMultipartFormDataBodyParsing(string $method)
{
$response = file_get_contents('http://localhost:8054/', false, stream_context_create([
'http' => [
'header' => 'Content-Type: multipart/form-data; boundary=boundary',
'method' => $method,
'content' => "--boundary\r\n".
"Content-Disposition: form-data; name=foo\r\n".
"\r\n".
"bar\r\n".
"--boundary\r\n".
"Content-Disposition: form-data; name=baz; filename=baz.txt\r\n".
"Content-Type: text/plain\r\n".
"\r\n".
"qux\r\n".
'--boundary--',
],
]));

$data = json_decode($response, true);

$this->assertSame(['foo' => 'bar'], $data['request']);
$this->assertSame(['baz' => [
'clientOriginalName' => 'baz.txt',
'clientMimeType' => 'text/plain',
'content' => 'qux',
]], $data['files']);
}
}
63 changes: 26 additions & 37 deletions src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
use PHPUnit\Framework\Attributes\RequiresPhp;
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
use PHPUnit\Framework\Attributes\TestWith;
use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
use Symfony\Component\HttpFoundation\Exception\JsonException;
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
use Symfony\Component\HttpFoundation\InputBag;
use Symfony\Component\HttpFoundation\IpUtils;
use Symfony\Component\HttpFoundation\ParameterBag;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
Expand Down Expand Up @@ -1281,15 +1280,13 @@ public static function getContentCanBeCalledTwiceWithResourcesProvider()
];
}

public static function provideOverloadedMethods()
public static function provideMethodsRequiringExplicitBodyParsing()
{
return [
['PUT'],
['DELETE'],
['PATCH'],
['put'],
['delete'],
['patch'],
['QUERY'],
];
}

Expand Down Expand Up @@ -1331,50 +1328,42 @@ public function testGetPayload()
$this->assertSame([], $req->getPayload()->all());
}

#[DataProvider('provideOverloadedMethods')]
public function testCreateFromGlobals($method)
public function testCreateFromGlobals()
{
$normalizedMethod = strtoupper($method);

$_GET['foo1'] = 'bar1';
$_POST['foo2'] = 'bar2';
$_COOKIE['foo3'] = 'bar3';
$_FILES['foo4'] = ['bar4'];
$_SERVER['foo5'] = 'bar5';

$request = Request::createFromGlobals();
$this->assertEquals('bar1', $request->query->get('foo1'), '::fromGlobals() uses values from $_GET');
$this->assertEquals('bar2', $request->request->get('foo2'), '::fromGlobals() uses values from $_POST');
$this->assertEquals('bar3', $request->cookies->get('foo3'), '::fromGlobals() uses values from $_COOKIE');
$this->assertEquals(['bar4'], $request->files->get('foo4'), '::fromGlobals() uses values from $_FILES');
$this->assertEquals('bar5', $request->server->get('foo5'), '::fromGlobals() uses values from $_SERVER');
$this->assertInstanceOf(InputBag::class, $request->request);
$this->assertInstanceOf(ParameterBag::class, $request->request);
$this->assertEquals('bar1', $request->query->get('foo1'), '::createFromGlobals() uses values from $_GET');
$this->assertEquals('bar2', $request->request->get('foo2'), '::createFromGlobals() uses values from $_POST');
$this->assertEquals('bar3', $request->cookies->get('foo3'), '::createFromGlobals() uses values from $_COOKIE');
$this->assertEquals(['bar4'], $request->files->get('foo4'), '::createFromGlobals() uses values from $_FILES');
$this->assertEquals('bar5', $request->server->get('foo5'), '::createFromGlobals() uses values from $_SERVER');
}

public function testGetRealMethod()
{
Request::enableHttpMethodParameterOverride();
$request = new Request(request: ['_method' => 'PUT'], server: ['REQUEST_METHOD' => 'PoSt']);

unset($_GET['foo1'], $_POST['foo2'], $_COOKIE['foo3'], $_FILES['foo4'], $_SERVER['foo5']);
$this->assertEquals('POST', $request->getRealMethod(), '->getRealMethod() returns the uppercased request method, even if it has been overridden');

$this->disableHttpMethodParameterOverride();
}

#[RequiresPhp('< 8.4')]
#[DataProvider('provideMethodsRequiringExplicitBodyParsing')]
public function testFormUrlEncodedBodyParsing(string $method)
{
$_SERVER['REQUEST_METHOD'] = $method;
$_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$request = RequestContentProxy::createFromGlobals();
$this->assertEquals($normalizedMethod, $request->getMethod());
$this->assertEquals('mycontent', $request->request->get('content'));
$this->assertInstanceOf(InputBag::class, $request->request);
$this->assertInstanceOf(ParameterBag::class, $request->request);

unset($_SERVER['REQUEST_METHOD'], $_SERVER['CONTENT_TYPE']);

Request::createFromGlobals();
Request::enableHttpMethodParameterOverride();
$_POST['_method'] = $method;
$_POST['foo6'] = 'bar6';
$_SERVER['REQUEST_METHOD'] = 'PoSt';
$request = Request::createFromGlobals();
$this->assertEquals($normalizedMethod, $request->getMethod());
$this->assertEquals('POST', $request->getRealMethod());
$this->assertEquals('bar6', $request->request->get('foo6'));
$request = RequestContentProxy::createFromGlobals();

unset($_POST['_method'], $_POST['foo6'], $_SERVER['REQUEST_METHOD']);
$this->disableHttpMethodParameterOverride();
$this->assertEquals('mycontent', $request->request->get('content'));
}

public function testOverrideGlobals()
Expand Down Expand Up @@ -2675,7 +2664,7 @@ class RequestContentProxy extends Request
{
public function getContent($asResource = false)
{
return http_build_query(['_method' => 'PUT', 'content' => 'mycontent'], '', '&');
return http_build_query(['content' => 'mycontent'], '', '&');
}
}

Expand Down
Loading