Remove middleware

Author: Maxim Lanin

README.md

@@ -9,7 +9,6 @@ The goal of this package is to provide you with a set of most common exceptions
 * Handles exceptions report to logs.
 * Overwrites default Validator to make validation errors more verbose.
 * Has a FormRequest that to handle validation errors and pass them to ApiExceptions layer.
-* Has middleware to catch all system errors such us `RuntimeExceptions` or `ModelNotFoundException` to handle them and threat as normal ApiExceptions.
 
 ## Installation
 
@@ -62,7 +61,7 @@ Also it can have `meta` attribute when there is additional info. For example for
 }
 ```
 
-For `ValidationApiException`, meta attribute has `errors` object that contains validations errors. 
+For `ValidationApiException`, meta attribute has `errors` object that contains validations errors.
 Every attribute of this object is a name of a request parameter to validate to and value is an array of errors with description.
 
 ### Handler
@@ -90,15 +89,10 @@ class Handler extends LaravelExceptionHandle
 ### FormRequest
 
 To use FormRequest extend all your Request classes with `\Lanin\Laravel\ApiExceptions\Support\Request`.
-It will automatically support validation errors and pass them to the output. 
+It will automatically support validation errors and pass them to the output.
 
 It also has a very handy helper method `validatedOnly()` that returns from request only those items that are registered in rules method.
 
-### RuntimeExceptionsHandler
-
-Also you can catch all system exceptions using `\Lanin\Laravel\ApiExceptions\Support\RuntimeExceptionsHandler`. 
-Just import it to your `Http\Kernel` $middleware array, and that's it.
-
 ## Contributing
 
 Please feel free to fork this package and contribute by submitting a pull request to enhance the functionalities.

src/LaravelExceptionHandler.php

@@ -54,23 +54,24 @@ public function render($request, Exception $e)
     {
         switch (true) {
             case $e instanceof ApiException:
-                $response = response()->json($e, $e->getCode(), $e->getHeaders());
                 break;
             case $e instanceof AuthorizationException:
                 $e = new UnauthorizedApiException('', $e);
-                $response = response()->json($e, $e->getCode());
+                break;
+            case $e instanceof MethodNotAllowedHttpException:
+                $e = new MethodNotAllowedApiException('', $e);
                 break;
             case $e instanceof ModelNotFoundException:
             case $e instanceof NotFoundHttpException:
                 $e = new NotFoundApiException();
-                $response = response()->json($e, $e->getCode());
                 break;
             default:
                 $e = new InternalServerErrorApiException('', $e);
-                $response = response()->json($e, $e->getCode());
                 break;
         }
 
+        $response = response()->json($e, $e->getCode(), $e->getHeaders());
+
         return $response;
     }
 }

src/LumenExceptionHandler.php

@@ -58,23 +58,24 @@ public function render($request, Exception $e)
     {
         switch (true) {
             case $e instanceof ApiException:
-                $response = response()->json($e, $e->getCode(), $e->getHeaders());
                 break;
             case $e instanceof AuthorizationException:
                 $e = new UnauthorizedApiException('', $e);
-                $response = response()->json($e, $e->getCode());
+                break;
+            case $e instanceof MethodNotAllowedHttpException:
+                $e = new MethodNotAllowedApiException('', $e);
                 break;
             case $e instanceof ModelNotFoundException:
             case $e instanceof NotFoundHttpException:
                 $e = new NotFoundApiException();
-                $response = response()->json($e, $e->getCode());
                 break;
             default:
                 $e = new InternalServerErrorApiException('', $e);
-                $response = response()->json($e, $e->getCode());
                 break;
         }
 
+        $response = response()->json($e, $e->getCode(), $e->getHeaders());
+
         return $response;
     }
 }