Skip to content

Commit 4962ceb

Browse files
author
Greg Bowler
authored
Request handler uri (#590)
* Update RequestHandler.php * Update ErrorRequestHandler.php
1 parent 8c012cf commit 4962ceb

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/Middleware/ErrorRequestHandler.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public function handle(
4040
$errorCode = $this->throwable->getHttpCode();
4141
}
4242

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

src/Middleware/RequestHandler.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Gt\Http\Response;
1616
use Gt\Http\ServerInfo;
1717
use Gt\Http\StatusCode;
18+
use Gt\Http\Uri;
1819
use Gt\Input\Input;
1920
use Gt\Input\InputData\InputData;
2021
use Gt\Logger\LogConfig;
@@ -49,6 +50,7 @@ class RequestHandler implements RequestHandlerInterface {
4950
protected DynamicPath $dynamicPath;
5051
protected HTMLDocument/*|NullViewModel*/ $viewModel;
5152
protected BaseView $view;
53+
protected Uri $originalUri;
5254

5355
public function __construct(
5456
protected readonly Config $config,
@@ -89,6 +91,7 @@ public function getServiceContainer():Container {
8991
public function handle(
9092
ServerRequestInterface $request
9193
):ResponseInterface {
94+
$this->originalUri = $request->getUri();
9295
$this->completeRequestHandling($request);
9396
return $this->response;
9497
}
@@ -151,7 +154,7 @@ protected function handleRouting(ServerRequestInterface $request) {
151154
$this->logicAssembly = $router->getLogicAssembly();
152155

153156
$this->dynamicPath = new DynamicPath(
154-
$request->getUri()->getPath(),
157+
$this->originalUri->getPath(),
155158
$this->viewAssembly,
156159
$this->logicAssembly,
157160
);

0 commit comments

Comments
 (0)