From c83e386ed2e109003f8cb25bf4e402f44b370d27 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 14 Oct 2015 12:23:20 +1030
Subject: [PATCH] Show 404 errors as the "pretty" page even in debug mode

closes #503
---
 framework/core/src/Admin/Server.php           |  7 ++----
 framework/core/src/Forum/Server.php           |  7 +-----
 .../core/src/Http/Middleware/HandleErrors.php | 22 +++++++++++++++++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/framework/core/src/Admin/Server.php b/framework/core/src/Admin/Server.php
index 41ee63560..d417d2f70 100644
--- a/framework/core/src/Admin/Server.php
+++ b/framework/core/src/Admin/Server.php
@@ -37,11 +37,8 @@ class Server extends AbstractServer
             $pipe->pipe($adminPath, $app->make('Flarum\Admin\Middleware\RequireAdministrateAbility'));
             $pipe->pipe($adminPath, $app->make('Flarum\Http\Middleware\DispatchRoute', compact('routes')));
 
-            if ($app->inDebugMode()) {
-                $pipe->pipe(new WhoopsMiddleware);
-            } else {
-                $pipe->pipe(new HandleErrors(__DIR__.'/../../error'));
-            }
+            $pipe->pipe(new HandleErrors(__DIR__.'/../../error', $app->inDebugMode()));
+
         }
 
         return $pipe;
diff --git a/framework/core/src/Forum/Server.php b/framework/core/src/Forum/Server.php
index 40827e6f6..0adde2019 100644
--- a/framework/core/src/Forum/Server.php
+++ b/framework/core/src/Forum/Server.php
@@ -15,7 +15,6 @@ use Flarum\Foundation\Application;
 use Flarum\Http\AbstractServer;
 use Zend\Stratigility\MiddlewarePipe;
 use Flarum\Http\Middleware\HandleErrors;
-use Franzl\Middleware\Whoops\Middleware as WhoopsMiddleware;
 
 class Server extends AbstractServer
 {
@@ -44,11 +43,7 @@ class Server extends AbstractServer
 
         $pipe->pipe($basePath, $app->make('Flarum\Http\Middleware\DispatchRoute', compact('routes')));
 
-        if ($app->inDebugMode() || ! $installed) {
-            $pipe->pipe(new WhoopsMiddleware);
-        } else {
-            $pipe->pipe(new HandleErrors(__DIR__.'/../../error'));
-        }
+        $pipe->pipe(new HandleErrors(__DIR__.'/../../error', $app->inDebugMode() || ! $installed));
 
         return $pipe;
     }
diff --git a/framework/core/src/Http/Middleware/HandleErrors.php b/framework/core/src/Http/Middleware/HandleErrors.php
index ea6311515..062a53f90 100644
--- a/framework/core/src/Http/Middleware/HandleErrors.php
+++ b/framework/core/src/Http/Middleware/HandleErrors.php
@@ -14,6 +14,7 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Response\HtmlResponse;
 use Zend\Stratigility\ErrorMiddlewareInterface;
+use Franzl\Middleware\Whoops\Middleware as WhoopsMiddleware;
 
 class HandleErrors implements ErrorMiddlewareInterface
 {
@@ -23,11 +24,18 @@ class HandleErrors implements ErrorMiddlewareInterface
     protected $templateDir;
 
     /**
-     * @param string $templateDir
+     * @var bool
      */
-    public function __construct($templateDir)
+    protected $debug;
+
+    /**
+     * @param string $templateDir
+     * @param bool $debug
+     */
+    public function __construct($templateDir, $debug = false)
     {
         $this->templateDir = $templateDir;
+        $this->debug = $debug;
     }
 
     /**
@@ -44,11 +52,21 @@ class HandleErrors implements ErrorMiddlewareInterface
             $status = $errorCode;
         }
 
+        if ($this->debug && $errorCode !== 404) {
+            $whoops = new WhoopsMiddleware;
+
+            return $whoops($error, $request, $response, $out);;
+        }
+
         $errorPage = $this->getErrorPage($status);
 
         return new HtmlResponse($errorPage, $status);
     }
 
+    /**
+     * @param string $status
+     * @return string
+     */
     protected function getErrorPage($status)
     {
         if (! file_exists($errorPage = $this->templateDir."/$status.html")) {