Skip to content

fix(http): Enhance setPsr7Request: parse body #196

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(http): Enhance setPsr7Request: parse body #196

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84147bf
fix(http): Enhance setPsr7Request: parse body
Blezigen Nov 26, 2025
ca94b34
fix(http): fix problem from Coderabbitai
Blezigen Nov 26, 2025
178a159
fix(http): Remove the unnecessary cast
Blezigen Nov 26, 2025
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
35 changes: 31 additions & 4 deletions src/http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Psr\Http\Message\{ServerRequestInterface, UploadedFileInterface};
use Yii;
use yii\base\InvalidConfigException;
use yii\web\{CookieCollection, HeaderCollection, NotFoundHttpException};
use yii\web\{CookieCollection, HeaderCollection, NotFoundHttpException, RequestParserInterface};
use yii2\extensions\psrbridge\adapter\ServerRequestAdapter;
use yii2\extensions\psrbridge\exception\Message;

Expand Down Expand Up @@ -768,7 +768,7 @@ public function resolve(): array
return parent::resolve();
}

/**
/**
* Sets and bridges a PSR-7 ServerRequestInterface instance for the current request.
*
* Wraps the provided PSR-7 {@see ServerRequestInterface} in a {@see ServerRequestAdapter} to enable full PSR-7
Expand All @@ -789,10 +789,37 @@ public function resolve(): array
*/
public function setPsr7Request(ServerRequestInterface $request): void
{
$rawContentType = $request->getHeaderLine('Content-Type');
if (($pos = strpos((string)$rawContentType, ';')) !== false) {
// e.g. text/html; charset=UTF-8
$contentType = substr($rawContentType, 0, $pos);
} else {
$contentType = $rawContentType;
}

$parsedParams = null;

if (isset($this->parsers[$contentType])) {
$parser = Yii::createObject($this->parsers[$contentType]);
if (!($parser instanceof RequestParserInterface)) {
throw new InvalidConfigException("The '$contentType' request parser is invalid. It must implement the yii\\web\\RequestParserInterface.");
}
$parsedParams = $parser->parse((string)$request->getBody(), $rawContentType);
} elseif (isset($this->parsers['*'])) {
$parser = Yii::createObject($this->parsers['*']);
if (!($parser instanceof RequestParserInterface)) {
throw new InvalidConfigException('The fallback request parser is invalid. It must implement the yii\\web\\RequestParserInterface.');
}
$parsedParams = $parser->parse((string)$request->getBody(), $rawContentType);
}

if ($parsedParams !== null) {
$request = $request->withParsedBody((array)$parsedParams);
}

$this->adapter = new ServerRequestAdapter(
$request->withHeader('statelessAppStartTime', (string) microtime(true)),
$request->withHeader('statelessAppStartTime', (string) microtime(true))
);

UploadedFile::setPsr7Adapter($this->adapter);
}

Expand Down