Skip to content

Request handler uri #590

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
g105b merged 2 commits into from
Dec 31, 2022
Merged

Request handler uri #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d0ff17
Update RequestHandler.php
Dec 18, 2022
55cd2fc
Update ErrorRequestHandler.php
Dec 18, 2022
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/Middleware/ErrorRequestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function handle(
$errorCode = $this->throwable->getHttpCode();
}

$this->originalUri = $request->getUri();
$errorUri = new Uri("/_$errorCode");
$errorRequest = $request->withUri($errorUri);

Expand Down
5 changes: 4 additions & 1 deletion src/Middleware/RequestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Gt\Http\Response;
use Gt\Http\ServerInfo;
use Gt\Http\StatusCode;
use Gt\Http\Uri;
use Gt\Input\Input;
use Gt\Input\InputData\InputData;
use Gt\Logger\LogConfig;
Expand Down Expand Up @@ -49,6 +50,7 @@ class RequestHandler implements RequestHandlerInterface {
protected DynamicPath $dynamicPath;
protected HTMLDocument/*|NullViewModel*/ $viewModel;
protected BaseView $view;
protected Uri $originalUri;

public function __construct(
protected readonly Config $config,
Expand Down Expand Up @@ -89,6 +91,7 @@ public function getServiceContainer():Container {
public function handle(
ServerRequestInterface $request
):ResponseInterface {
$this->originalUri = $request->getUri();
$this->completeRequestHandling($request);
return $this->response;
}
Expand Down Expand Up @@ -151,7 +154,7 @@ protected function handleRouting(ServerRequestInterface $request) {
$this->logicAssembly = $router->getLogicAssembly();

$this->dynamicPath = new DynamicPath(
$request->getUri()->getPath(),
$this->originalUri->getPath(),
$this->viewAssembly,
$this->logicAssembly,
);
Expand Down