From 7ecb28b598f4f125eaa00e07f0b0d07b6b5b52a0 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Wed, 4 Sep 2019 20:28:37 -0700 Subject: [PATCH] [L6] No longer necessary with L5.8 --- app/Exceptions/Handler.php | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index ae8536c86..9df75620e 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -15,7 +15,6 @@ use Illuminate\Database\Eloquent\ModelNotFoundException; use Symfony\Component\HttpKernel\Exception\HttpException; use Pterodactyl\Exceptions\Repository\RecordNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; class Handler extends ExceptionHandler { @@ -154,26 +153,6 @@ class Handler extends ExceptionHandler $connections->rollBack(0); } - // Because of some breaking change snuck into a Laravel update that didn't get caught - // by any of the tests, exceptions implementing the HttpExceptionInterface get marked - // as being HttpExceptions, but aren't actually implementing the HttpException abstract. - // - // This is incredibly annoying because we can't just temporarily override the handler to - // allow these (at least without taking on a high maintenance cost). Laravel 5.8 fixes this, - // so when we update (or have updated) this code can be removed. - // - // @see https://github.com/laravel/framework/pull/25975 - // @todo remove this code when upgrading to Laravel 5.8 - if ($exception instanceof HttpExceptionInterface && ! $exception instanceof HttpException) { - $exception = new HttpException( - $exception->getStatusCode(), - $exception->getMessage(), - $exception, - $exception->getHeaders(), - $exception->getCode() - ); - } - return parent::render($request, $exception); }