MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-24 17:23:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dane/restore-backups

Browse Source
This commit is contained in:
Dane Everitt
2021-01-25 19:16:40 -08:00
parent f24193801a b7d1c45bcc
commit 663143de0b
575 changed files with 6080 additions and 6864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Exceptions/Http/Connection/DaemonConnectionException.php
View File

@@ -29,9 +29,6 @@ class DaemonConnectionException extends DisplayException
/**
* Throw a displayable exception caused by a daemon connection error.
*
* @param \GuzzleHttp\Exception\GuzzleException $previous
* @param bool $useStatusCode
*/
public function __construct(GuzzleException $previous, bool $useStatusCode = true)
{

3
app/Exceptions/Http/HttpForbiddenException.php
View File

@@ -9,9 +9,6 @@ class HttpForbiddenException extends HttpException
{
/**
* HttpForbiddenException constructor.
*
* @param string|null $message
* @param \Throwable|null $previous
*/
public function __construct(string $message = null, \Throwable $previous = null)
{

4
app/Exceptions/Http/TwoFactorAuthRequiredException.php
View File

@@ -11,11 +11,9 @@ class TwoFactorAuthRequiredException extends HttpException implements HttpExcept
{
/**
* TwoFactorAuthRequiredException constructor.
*
* @param \Throwable|null $previous
*/
public function __construct(Throwable $previous = null)
{
parent::__construct(Response::HTTP_BAD_REQUEST, "Two-factor authentication is required on this account in order to access this endpoint.", $previous);
parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
}
}