Skip to content

refactor(application): Improve response handling and reset request state in StatelessApplication. #89

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
merged 2 commits into from
Aug 13, 2025
Merged

refactor(application): Improve response handling and reset request state in StatelessApplication. #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d6727
refactor(application): Improve response handling and reset request st…
terabytesoftw Aug 13, 2025
1630754
Apply fixed review coderabbitai nitpick comments.
terabytesoftw Aug 13, 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
13 changes: 7 additions & 6 deletions src/http/StatelessApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,12 @@ public function handle(ServerRequestInterface $request): ResponseInterface

$this->state = self::STATE_END;

return $this->terminate($response);
$psrResponse = $this->terminate($response);
} catch (Throwable $e) {
return $this->terminate($this->handleError($e));
$psrResponse = $this->terminate($this->handleError($e));
}

return $psrResponse;
}

/**
Expand Down Expand Up @@ -373,7 +375,7 @@ protected static function parseMemoryLimit(string $limit): int
* Resets the StatelessApplication state and prepares the Yii2 environment for handling a PSR-7 request.
*
* Performs a full reinitialization of the application state, including event tracking, error handler cleanup,
* session management, and PSR-7 request injection.
* request adapter reset, session management, and PSR-7 request injection.
*
* This method ensures that the application is ready to process a new stateless request in worker or SAPI
* environments, maintaining strict type safety and compatibility with Yii2 core components.
Expand Down Expand Up @@ -406,6 +408,7 @@ protected function reset(ServerRequestInterface $request): void
$this->requestedParams = [];

$this->errorHandler->setResponse($this->response);
$this->request->reset();
$this->request->setPsr7Request($request);

$this->session->close();
Expand All @@ -423,7 +426,7 @@ protected function reset(ServerRequestInterface $request): void
/**
* Finalizes the application lifecycle and converts the Yii2 Response to a PSR-7 ResponseInterface.
*
* Cleans up registered events, resets uploaded files, flushes the logger, and resets the request state.
* Cleans up registered events, resets uploaded files, flushes the logger.
*
* This method ensures that all application resources are released and the response is converted to a PSR-7
* ResponseInterface for interoperability with PSR-7 compatible HTTP stacks.
Expand All @@ -443,8 +446,6 @@ protected function terminate(Response $response): ResponseInterface

Yii::getLogger()->flush(true);

$this->request->reset();

return $response->getPsr7Response();
}

Expand Down
Loading