github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove superfluous ForbiddenException

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

Refs #1641.
This commit is contained in:
Franz Liedke 2019-08-22 00:06:04 +02:00
parent 70e98f810c
commit 98464a8a33
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Extension/DefaultLanguagePackGuard.php
View File

@ -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!');
}
}
}

1
src/Foundation/ErrorServiceProvider.php
View File

@ -33,7 +33,6 @@ class ErrorServiceProvider extends AbstractServiceProvider
'invalid_access_token' => 401,
// 403 Forbidden
'forbidden' => 403,
'invalid_confirmation_token' => 403,
'permission_denied' => 403,

23
src/Http/Exception/ForbiddenException.php
View File

@ -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';
}
}