feature: use error pages

for #642

Author: g105b

src/Middleware/ErrorRequestHandler.php

@@ -43,8 +43,7 @@ public function handle(
 		$this->originalUri = $request->getUri();
 		$errorUri = new Uri("/_$errorCode");
 		$errorRequest = $request->withUri($errorUri);
-
-		$this->completeRequestHandling($errorRequest);
+		$this->completeRequestHandling($errorRequest, true);
 		$this->response = $this->response->withStatus($errorCode);
 		return $this->response;
 	}

src/Middleware/Lifecycle.php

@@ -97,13 +97,7 @@ public function start():void {
 			$response = $this->process($request, $handler);
 		}
 		catch(Throwable $throwable) {
-			echo "<pre>";
-			echo get_class($throwable), " - ";
-			$filePath = $throwable->getFile();
-			$filePath = str_replace(getcwd(), '', $filePath);
-			echo strip_tags($throwable->getMessage() . " " . $filePath . ":" . $throwable->getLine()), PHP_EOL;
-			die();
-			$this->throwable = $throwable;
+			Log::critical($throwable->getMessage(), ["uri" => $request->getUri()] + $request->getHeaders() + $throwable->getTrace()[0]);
 
 			$errorHandler = new ErrorRequestHandler(
 				ConfigFactory::createForProject(
@@ -119,11 +113,6 @@ public function start():void {
 				$originalGlobals["server"],
 			);
 			$response = $this->process($request, $errorHandler);
-
-			trigger_error(
-				$throwable->getMessage(),
-				E_USER_ERROR,
-			);
 		}
 
 // Now we can finish the HTTP lifecycle by providing the HTTP response for
@@ -206,6 +195,9 @@ public function finish(
 
 		foreach($response->getHeaders() as $key => $value) {
 			$stringValue = implode(", ", $value);
+			if(strtolower($key) === "location" && str_starts_with($stringValue, "/_")) {
+				continue;
+			}
 			header("$key: $stringValue", true);
 		}
 

src/Middleware/RequestHandler.php

@@ -48,6 +48,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
 
 class RequestHandler implements RequestHandlerInterface {
 	/** @var callable(ResponseInterface,ConfigSection) */
@@ -105,7 +106,8 @@ public function handle(
 	}
 
 	protected function completeRequestHandling(
-		ServerRequestInterface $request
+		ServerRequestInterface $request,
+		bool $ignoreLogicErrors = false,
 	):void {
 		$this->setupResponse($request);
 		$this->forceTrailingSlashes($request);
@@ -130,12 +132,19 @@ protected function completeRequestHandling(
 
 		$this->handleProtectedGlobals();
 
-		if(isset($this->viewModel) && $this->viewModel instanceof HTMLDocument) {
-			$this->handleHTMLDocumentViewModel();
+		try {
+			if(isset($this->viewModel) && $this->viewModel instanceof HTMLDocument) {
+				$this->handleHTMLDocumentViewModel();
 //			$this->handleCsrf($request);
-		}
+			}
 
-		$this->handleLogicExecution($this->logicAssembly);
+			$this->handleLogicExecution($this->logicAssembly);
+		}
+		catch(Throwable $throwable) {
+			if(!$ignoreLogicErrors) {
+				throw $throwable;
+			}
+		}
 
 // TODO: Why is this in the handle function?
 		$documentBinder = $this->serviceContainer->get(Binder::class);
@@ -277,9 +286,6 @@ protected function handleHTMLDocumentViewModel():void {
 
 		foreach($expandedLogicAssemblyList as $i => $assembly) {
 			$componentElement = $expandedComponentList[$i];
-			if(!$componentElement) {
-				var_dump($assembly);die();
-			}
 			$this->handleLogicExecution($assembly, $componentElement);
 		}
 	}