From ed325d2fe555abaf67dc8204808d1ae52e4512bc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 12 Jan 2017 19:38:40 -0800
Subject: [PATCH] Let whatever the other error is fall through

---
 app/Exceptions/Handler.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index f0a0c8f1b8..6a931372f5 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -55,26 +55,37 @@ class Handler extends ExceptionHandler
 
         // Handle Ajax requests that fail because the model doesn't exist
         if ($request->ajax() || $request->wantsJson()) {
+
             if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
                 $className = last(explode('\\', $e->getModel()));
                 return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
             }
+
+            if ($this->isHttpException($e)) {
+
+                switch ($e->getStatusCode()) {
+                    case '404':
+                       return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' not found'), 404);
+                       break;
+                    case '405':
+                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
+                        break;
+                    default:
+                        return response()->json(Helper::formatStandardApiResponse('error', null, $e->getStatusCode()), 405);
+
+                }
+            }
+
         }
 
 
         if ($this->isHttpException($e)) {
 
-
             $statusCode = $e->getStatusCode();
 
             switch ($statusCode) {
 
                 case '404':
-                    if ($request->ajax() || $request->wantsJson())
-                    {
-                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' not found'), 404);
-                    }
-
                     return response()->view('layouts/basic', [
                         'content' => view('errors/404')
                     ]);
@@ -95,7 +106,7 @@ class Handler extends ExceptionHandler
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
+            return response()->json(['error' => 'Unauthorized.'], 401);
         }
 
         return redirect()->guest('login');