Implement new error handling stack

src/Admin/AdminServiceProvider.php

@@ -16,6 +16,10 @@
 use Flarum\Extension\Event\Enabled;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\Application;
+use Flarum\Foundation\ErrorHandling\Registry;
+use Flarum\Foundation\ErrorHandling\Reporter;
+use Flarum\Foundation\ErrorHandling\ViewRenderer;
+use Flarum\Foundation\ErrorHandling\WhoopsRenderer;
 use Flarum\Foundation\Event\ClearingCache;
 use Flarum\Frontend\AddLocaleAssets;
 use Flarum\Frontend\AddTranslations;
@@ -51,11 +55,11 @@ public function register()
             $pipe = new MiddlewarePipe;
 
             // All requests should first be piped through our global error handler
-            if ($app->inDebugMode()) {
-                $pipe->pipe($app->make(HttpMiddleware\HandleErrorsWithWhoops::class));
-            } else {
-                $pipe->pipe($app->make(HttpMiddleware\HandleErrorsWithView::class));
-            }
+            $pipe->pipe(new HttpMiddleware\HandleErrors(
+                $app->make(Registry::class),
+                $app->inDebugMode() ? $app->make(WhoopsRenderer::class) : $app->make(ViewRenderer::class),
+                $app->tagged(Reporter::class)
+            ));
 
             $pipe->pipe($app->make(HttpMiddleware\ParseJsonBody::class));
             $pipe->pipe($app->make(HttpMiddleware\StartSession::class));

src/Api/ApiServiceProvider.php

@@ -20,12 +20,13 @@
 use Flarum\Event\ConfigureNotificationTypes;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\Application;
+use Flarum\Foundation\ErrorHandling\JsonApiRenderer;
+use Flarum\Foundation\ErrorHandling\Registry;
+use Flarum\Foundation\ErrorHandling\Reporter;
 use Flarum\Http\Middleware as HttpMiddleware;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
-use Tobscure\JsonApi\ErrorHandler;
-use Tobscure\JsonApi\Exception\Handler\InvalidParameterExceptionHandler;
 use Zend\Stratigility\MiddlewarePipe;
 
 class ApiServiceProvider extends AbstractServiceProvider
@@ -49,7 +50,11 @@ public function register()
         $this->app->singleton('flarum.api.middleware', function (Application $app) {
             $pipe = new MiddlewarePipe;
 
-            $pipe->pipe($app->make(Middleware\HandleErrors::class));
+            $pipe->pipe(new HttpMiddleware\HandleErrors(
+                $app->make(Registry::class),
+                $app->make(JsonApiRenderer::class),
+                $app->tagged(Reporter::class)
+            ));
 
             $pipe->pipe($app->make(HttpMiddleware\ParseJsonBody::class));
             $pipe->pipe($app->make(Middleware\FakeHttpMethods::class));
@@ -68,25 +73,6 @@ public function register()
         $this->app->afterResolving('flarum.api.middleware', function (MiddlewarePipe $pipe) {
             $pipe->pipe(new HttpMiddleware\DispatchRoute($this->app->make('flarum.api.routes')));
         });
-
-        $this->app->singleton(ErrorHandler::class, function () {
-            $handler = new ErrorHandler;
-
-            $handler->registerHandler(new ExceptionHandler\FloodingExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\IlluminateValidationExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\InvalidAccessTokenExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\InvalidConfirmationTokenExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\MethodNotAllowedExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\ModelNotFoundExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\PermissionDeniedExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\RouteNotFoundExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\TokenMismatchExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\ValidationExceptionHandler);
-            $handler->registerHandler(new InvalidParameterExceptionHandler);
-            $handler->registerHandler(new ExceptionHandler\FallbackExceptionHandler($this->app->inDebugMode(), $this->app->make('log')));
-
-            return $handler;
-        });
     }
 
     /**

src/Api/Client.php

@@ -12,11 +12,14 @@
 namespace Flarum\Api;
 
 use Exception;
+use Flarum\Foundation\ErrorHandling\JsonApiRenderer;
+use Flarum\Foundation\ErrorHandling\Registry;
 use Flarum\User\User;
 use Illuminate\Contracts\Container\Container;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
 use Zend\Diactoros\ServerRequestFactory;
 
 class Client
@@ -27,18 +30,18 @@ class Client
     protected $container;
 
     /**
-     * @var ErrorHandler
+     * @var Registry
      */
-    protected $errorHandler;
+    protected $registry;
 
     /**
      * @param Container $container
-     * @param ErrorHandler $errorHandler
+     * @param Registry $registry
      */
-    public function __construct(Container $container, ErrorHandler $errorHandler = null)
+    public function __construct(Container $container, Registry $registry)
     {
         $this->container = $container;
-        $this->errorHandler = $errorHandler;
+        $this->registry = $registry;
     }
 
     /**
@@ -69,23 +72,14 @@ public function send($controller, User $actor = null, array $queryParams = [], a
 
         try {
             return $controller->handle($request);
-        } catch (Exception $e) {
-            if (! $this->errorHandler) {
+        } catch (Throwable $e) {
+            $error = $this->registry->handle($e);
+
+            if ($error->shouldBeReported()) {
                 throw $e;
             }
 
-            return $this->errorHandler->handle($e);
+            return (new JsonApiRenderer)->format($error, $request);
         }
     }
-
-    /**
-     * @param ErrorHandler $errorHandler
-     * @return Client
-     */
-    public function setErrorHandler(?ErrorHandler $errorHandler): self
-    {
-        $this->errorHandler = $errorHandler;
-
-        return $this;
-    }
 }

src/Api/Exception/InvalidAccessTokenException.php

@@ -12,7 +12,12 @@
 namespace Flarum\Api\Exception;
 
 use Exception;
+use Flarum\Foundation\KnownError;
 
-class InvalidAccessTokenException extends Exception
+class InvalidAccessTokenException extends Exception implements KnownError
 {
+    public function getType(): string
+    {
+        return 'invalid_access_token';
+    }
 }