From: Michael Wallner <mike@php.net>
Date: Fri, 8 May 2015 19:15:17 +0000 (+0200)
Subject: nicer exception handling
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b0a2ea11d6b820abe4758aaf56e6d226ded72942;p=pharext%2Fpharext.org

nicer exception handling
---

diff --git a/app/Web.php b/app/Web.php
index c9659b6..0353a99 100644
--- a/app/Web.php
+++ b/app/Web.php
@@ -29,28 +29,36 @@ class Web
 
 		switch ($route[0]) {
 			case Dispatcher::NOT_FOUND:
-				$this->response->setResponseCode(404);
-				$this->response->getBody()->append($this->view->render("404"));
+				$this->display(404, null, 404);
 				break;
 
 			case Dispatcher::METHOD_NOT_ALLOWED:
-				$this->response->setResponseCode(405);
-				$this->response->setHeader("Allowed", $route[1]);
-				$this->response->getBody()->append($this->view->render("405"));
+				$this->display(405, null, 405, ["Allowed" => $route[1]]);
 				break;
 
 			case Dispatcher::FOUND:
 				list(, $handler, $args) = $route;
-				$handler(array_map("urldecode", $args));
+				try {
+					$handler(array_map("urldecode", $args));
+				} catch (\Exception $exception) {
+					self::cleanBuffers();
+					$this->display(500, compact("exception"), 500, ["X-Exception", get_class($exception)]);
+				}
 				break;
 		}
 
 		$this->response->send();
 	}
 
-	function display($view, array $data = []) {
+	function display($view, array $data = null, $code = null, array $headers = []) {
+		if (isset($code)) {
+			$this->response->setResponseCode($code);
+		}
+		if ($headers) {
+			$this->response->addHeaders($headers);
+		}
 		$this->response->getBody()->append(
-			$this->view->render($view, $data));
+			$this->view->render($view, (array) $data));
 	}
 
 	function redirect($url, $code = 302) {
@@ -73,4 +81,12 @@ class Web
 	function getResponse() {
 		return $this->response;
 	}
+	
+	static function cleanBuffers() {
+		while (ob_get_level()) {
+			if (!@ob_end_clean()) {
+				break;
+			}
+		}
+	}
 }
diff --git a/app/views/404.phtml b/app/views/404.phtml
index 491df9c..f8fd0bb 100644
--- a/app/views/404.phtml
+++ b/app/views/404.phtml
@@ -1,5 +1,8 @@
 <?php $this->layout("layout") ?>
 
 <div class="page-header">
-	<h1>404 <small>Not Found</small>
+	<h1>Not Found <small>404</small></h1>
 </div>
+<p>
+	Page <?= $this->e($request->getRequestUrl()) ?> was not found.
+</p>
diff --git a/app/views/405.phtml b/app/views/405.phtml
index ec25164..0143f67 100644
--- a/app/views/405.phtml
+++ b/app/views/405.phtml
@@ -1,5 +1,8 @@
 <?php $this->layout("layout") ?>
 
 <div class="page-header">
-	<h1>405 <small>Method Not Allowed</small>
+	<h1>Method Not Allowed <small>405</small>
 </div>
+<p>
+	Request method <?= $this->e($request->getRequestMethod()) ?> is not allowed.
+</p>
diff --git a/app/views/500.phtml b/app/views/500.phtml
new file mode 100644
index 0000000..98692b9
--- /dev/null
+++ b/app/views/500.phtml
@@ -0,0 +1,7 @@
+<?php $this->layout("layout") ?>
+
+<div class="page-header">
+	<h1>Application error <small>500</small></h1>
+</div>
+
+<?= $this->fetch("alert", compact("exception")) ?>
diff --git a/app/views/alert.phtml b/app/views/alert.phtml
index bd8c0b7..5d0a516 100644
--- a/app/views/alert.phtml
+++ b/app/views/alert.phtml
@@ -1,6 +1,6 @@
 
 <div class="alert alert-danger" role="alert">
-	<strong><?= $this->e($exception->getMessage()) ?></strong><br>
+	<strong><?= nl2br($this->e($exception->getMessage())) ?></strong><br>
 	<?php if ($exception instanceof \app\Github\Exception\TokenException) : ?>
 		You might want to try to <a href="<?= $baseUrl->mod("./github/signin") ?>">renew your token</a>!
 	<?php endif; ?>
@@ -8,3 +8,8 @@
 		You might want to try to <a href="<?= $baseUrl->mod("./github/signin") ?>">try again</a>!
 	<?php endif; ?>
 </div>
+
+<?php if (APP_ENVIRONMENT != "production") : ?>
+<h3>Stack Trace</h3>
+<pre><?= $this->e($exception->getTraceAsString()) ?></pre>
+<?php endif; ?>
diff --git a/app/views/github/repo.phtml b/app/views/github/repo.phtml
index 36849c0..d321830 100644
--- a/app/views/github/repo.phtml
+++ b/app/views/github/repo.phtml
@@ -181,7 +181,7 @@
 				<?= $this->e($v->tag->name) ?>
 				<span class="label label-default pull-right">Tag</span>
 			<?php else : ?>
-				<?= $this->e($v->release->name) ?>
+				<?= $this->e($v->release->name ?: $v->tag->name) ?>
 				<span class="label label-info pull-right">Release</span>
 			<?php endif; ?>
 		</h3>
diff --git a/public/index.php b/public/index.php
index 5718129..7603f62 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,6 +2,38 @@
 
 namespace app;
 
-$bootstrap = require "../app/bootstrap.php";
-$injector = $bootstrap(["config", "github", "plates", "model", "web"]);
-$injector->execute(Web::class);
+try {
+	$bootstrap = require "../app/bootstrap.php";
+	$injector = $bootstrap(["config", "github", "plates", "model", "web"]);
+	return $injector->execute(Web::class);
+} catch (\Exception $e) {
+	$error = $e->getMessage();
+	$stack = $e->getTraceAsString();
+	@header("X-Exception: ".get_class($e), false, 500);
+	Web::cleanBuffers();
+}
+?>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>Application Error</title>
+		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
+	</head>
+	<body>
+		<div class="container">
+			<div class="jumbotron">
+				<h1>Application Error</h1>
+				<h2>Aww, you really gotta do that?!</h2>
+				<p class="text-danger">
+					<strong><?= htmlspecialchars($error) ?></strong>
+				</p>
+				<p>
+					Sorry, anyway.
+				</p>
+			</div>
+			<?php if (APP_ENVIRONMENT != "production") : ?>
+			<pre><?= htmlspecialchars($stack) ?></pre>
+			<?php endif; ?>
+		</div>
+	</body>
+</html>