merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4982 from devansh-webkul/exception-improvement 

Debug Check Added In Exceptions
This commit is contained in:
Jitendra Singh 2021-06-29 14:26:40 +05:30 committed by GitHub
parent 63b5c53cba af78f2bf71
commit b847d73f48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/Webkul/Core/src/Exceptions/Handler.php
View File

@ -2,12 +2,12 @@
namespace Webkul\Core\Exceptions;
use Throwable;
use PDOException;
use Illuminate\Auth\AuthenticationException;
use App\Exceptions\Handler as AppExceptionHandler;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use PDOException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Throwable;
class Handler extends AppExceptionHandler
{
@ -32,16 +32,8 @@ class Handler extends AppExceptionHandler
*/
public function render($request, Throwable $exception)
{
$path = $this->isAdminUri() ? 'admin' : 'shop';
if ($exception instanceof HttpException) {
$statusCode = in_array($exception->getStatusCode(), [401, 403, 404, 503]) ? $exception->getStatusCode() : 500;
return $this->response($path, $statusCode);
} elseif ($exception instanceof ModelNotFoundException) {
return $this->response($path, 404);
} elseif ($exception instanceof PDOException) {
return $this->response($path, 500);
if (! config('app.debug')) {
return $this->renderCustomResponse($request, $exception);
}
return parent::render($request, $exception);
@ -73,6 +65,32 @@ class Handler extends AppExceptionHandler
return strpos(\Illuminate\Support\Facades\Request::path(), 'admin') !== false ? true : false;
}
/**
* Render custom HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Throwable $exception
* @return \Illuminate\Http\Response|null
*/
private function renderCustomResponse($request, Throwable $exception)
{
$path = $this->isAdminUri() ? 'admin' : 'shop';
if ($exception instanceof HttpException) {
$statusCode = in_array($exception->getStatusCode(), [401, 403, 404, 503])
? $exception->getStatusCode()
: 500;
return $this->response($path, $statusCode);
} elseif ($exception instanceof ModelNotFoundException) {
return $this->response($path, 404);
} elseif ($exception instanceof PDOException) {
return $this->response($path, 500);
} else {
return parent::render($request, $exception);
}
}
/**
* Response.
*