From 54b4292c5e64370535535c6feb9a6530c36a930e Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Thu, 22 Aug 2019 00:06:04 +0200
Subject: [PATCH] Remove superfluous ForbiddenException

It has the same effect as the PermissionDeniedException, so let's
just use that.

Refs #1641.
---
 .../Extension/DefaultLanguagePackGuard.php    |  4 ++--
 .../src/Foundation/ErrorServiceProvider.php   |  1 -
 .../src/Http/Exception/ForbiddenException.php | 23 -------------------
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 framework/core/src/Http/Exception/ForbiddenException.php

diff --git a/framework/core/src/Extension/DefaultLanguagePackGuard.php b/framework/core/src/Extension/DefaultLanguagePackGuard.php
index 48de5c9e4..212b0d1ed 100644
--- a/framework/core/src/Extension/DefaultLanguagePackGuard.php
+++ b/framework/core/src/Extension/DefaultLanguagePackGuard.php
@@ -12,8 +12,8 @@
 namespace Flarum\Extension;
 
 use Flarum\Extension\Event\Disabling;
-use Flarum\Http\Exception\ForbiddenException;
 use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Support\Arr;
 
 class DefaultLanguagePackGuard
@@ -38,7 +38,7 @@ class DefaultLanguagePackGuard
         $locale = Arr::get($event->extension->extra, 'flarum-locale.code');
 
         if ($locale === $defaultLocale) {
-            throw new ForbiddenException('You cannot disable the default language pack!');
+            throw new PermissionDeniedException('You cannot disable the default language pack!');
         }
     }
 }
diff --git a/framework/core/src/Foundation/ErrorServiceProvider.php b/framework/core/src/Foundation/ErrorServiceProvider.php
index aa7060bb5..1d892976d 100644
--- a/framework/core/src/Foundation/ErrorServiceProvider.php
+++ b/framework/core/src/Foundation/ErrorServiceProvider.php
@@ -33,7 +33,6 @@ class ErrorServiceProvider extends AbstractServiceProvider
                 'invalid_access_token' => 401,
 
                 // 403 Forbidden
-                'forbidden' => 403,
                 'invalid_confirmation_token' => 403,
                 'permission_denied' => 403,
 
diff --git a/framework/core/src/Http/Exception/ForbiddenException.php b/framework/core/src/Http/Exception/ForbiddenException.php
deleted file mode 100644
index 903ae98cb..000000000
--- a/framework/core/src/Http/Exception/ForbiddenException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\Http\Exception;
-
-use Exception;
-use Flarum\Foundation\KnownError;
-
-class ForbiddenException extends Exception implements KnownError
-{
-    public function getType(): string
-    {
-        return 'forbidden';
-    }
-}