From 5eff7b010d3dce277175fa2fc4734f9f27bacec6 Mon Sep 17 00:00:00 2001 From: luceos Date: Wed, 29 Jul 2020 01:38:32 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- src/Foundation/ErrorHandling/FrontendFormatter.php | 10 ++++------ src/Http/HttpServiceProvider.php | 2 +- src/Http/Middleware/HandleErrors.php | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Foundation/ErrorHandling/FrontendFormatter.php b/src/Foundation/ErrorHandling/FrontendFormatter.php index 8166f9d13..888390089 100644 --- a/src/Foundation/ErrorHandling/FrontendFormatter.php +++ b/src/Foundation/ErrorHandling/FrontendFormatter.php @@ -10,9 +10,9 @@ namespace Flarum\Foundation\ErrorHandling; use Flarum\Frontend\Controller; -use Flarum\Http\Content\PermissionDenied; use Flarum\Http\Content\NotAuthenticated; use Flarum\Http\Content\NotFound; +use Flarum\Http\Content\PermissionDenied; use Flarum\Settings\SettingsRepositoryInterface; use Illuminate\Contracts\Container\Container; use Psr\Http\Message\ResponseInterface as Response; @@ -56,15 +56,13 @@ class FrontendFormatter implements HttpFormatter public function format(HandledError $error, Request $request): Response { - $frontend = $this->container->make("flarum.frontend.forum"); + $frontend = $this->container->make('flarum.frontend.forum'); if ($error->getStatusCode() === 401) { $frontend->content(new NotAuthenticated); - } - elseif ($error->getStatusCode() === 403) { + } elseif ($error->getStatusCode() === 403) { $frontend->content(new PermissionDenied); - } - elseif ($error->getStatusCode() === 404) { + } elseif ($error->getStatusCode() === 404) { $frontend->content(new NotFound); } diff --git a/src/Http/HttpServiceProvider.php b/src/Http/HttpServiceProvider.php index 0369155a8..1947efe28 100644 --- a/src/Http/HttpServiceProvider.php +++ b/src/Http/HttpServiceProvider.php @@ -16,9 +16,9 @@ use Flarum\Settings\SettingsRepositoryInterface; use Flarum\User\User; use Flarum\User\UsernameSlugDriver; use Illuminate\Support\Arr; +use Flarum\Foundation\ErrorHandling\FrontendFormatter; use Flarum\Foundation\ErrorHandling\Registry; use Flarum\Foundation\ErrorHandling\Reporter; -use Flarum\Foundation\ErrorHandling\FrontendFormatter; use Flarum\Foundation\ErrorHandling\WhoopsFormatter; use Flarum\Http\Exception\RouteNotFoundException; use Flarum\User\Exception\NotAuthenticatedException; diff --git a/src/Http/Middleware/HandleErrors.php b/src/Http/Middleware/HandleErrors.php index bd1e27100..242cff509 100644 --- a/src/Http/Middleware/HandleErrors.php +++ b/src/Http/Middleware/HandleErrors.php @@ -76,10 +76,9 @@ class HandleErrors implements Middleware } } - if (!$handled) { + if (! $handled) { throw $e; } - } $error = $this->registry->handle($e);