This commit is contained in:
Manish Verma
2016-12-13 18:18:25 +05:30
parent fc98add11c
commit 2d8e640e9b
2314 changed files with 97798 additions and 75664 deletions

View File

@@ -1,7 +1,5 @@
<?php
namespace App\Exceptions;
// controller
use Bugsnag;
//use Illuminate\Validation\ValidationException;
@@ -13,7 +11,6 @@ use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Validation\ValidationException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Handler extends ExceptionHandler
{
/**
@@ -30,7 +27,6 @@ class Handler extends ExceptionHandler
ModelNotFoundException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
];
/**
* Report or log an exception.
*
@@ -52,10 +48,8 @@ class Handler extends ExceptionHandler
$version = \Config::get('app.version');
Bugsnag::setAppVersion($version);
}
return parent::report($e);
}
/**
* Render an exception into an HTTP response.
*
@@ -77,7 +71,6 @@ class Handler extends ExceptionHandler
return $this->common($request, $e);
}
}
/**
* Function to render 500 error page.
*
@@ -90,14 +83,12 @@ class Handler extends ExceptionHandler
{
if (config('app.debug') == true) {
return parent::render($request, $e);
} elseif ($e instanceof ValidationException) {
}elseif($e instanceof ValidationException){
return parent::render($request, $e);
}
return response()->view('errors.500');
//return redirect()->route('error500', []);
}
/**
* Function to render 404 error page.
*
@@ -108,23 +99,21 @@ class Handler extends ExceptionHandler
*/
public function render404($request, $e)
{
$seg = $request->segments();
if (in_array('api', $seg)) {
return response()->json(['status' => '404']);
}
if (config('app.debug') == true) {
if ($e->getStatusCode() == '404') {
if($e->getStatusCode() == '404') {
return redirect()->route('error404', []);
}
return parent::render($request, $e);
}
return redirect()->route('error404', []);
}
/**
* Function to render database connection failed.
* Function to render database connection failed
*
* @param type $request
* @param type $e
@@ -140,10 +129,8 @@ class Handler extends ExceptionHandler
if (config('app.debug') == true) {
return parent::render($request, $e);
}
return redirect()->route('error404', []);
}
/**
* Common finction to render both types of codes.
*
@@ -160,7 +147,7 @@ class Handler extends ExceptionHandler
case $e instanceof NotFoundHttpException:
return $this->render404($request, $e);
case $e instanceof PDOException:
if (strpos('1045', $e->getMessage()) == true) {
if(strpos('1045', $e->getMessage()) == true) {
return $this->renderDB($request, $e);
} else {
return $this->render500($request, $e);
@@ -174,7 +161,6 @@ class Handler extends ExceptionHandler
default:
return $this->render500($request, $e);
}
return parent::render($request, $e);
}
}
}