Fix Laravel 7 support (fixes #9)

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 7.1.3
-  - 7.2.1
+  - 7.2.5
+  - 7.3
+  - 7.4
 
 before_script:
   - travis_retry composer install --no-interaction --prefer-source

README.md

@@ -1,12 +1,24 @@
 # laravel-jsend
 
-[![Latest Stable Version](https://poser.pugx.org/shalvah/laravel-jsend/v/stable)](https://packagist.org/packages/shalvah/laravel-jsend) [![Total Downloads](https://poser.pugx.org/shalvah/laravel-jsend/downloads)](https://packagist.org/packages/shalvah/laravel-jsend)
+[![Latest Stable Version](https://poser.pugx.org/shalvah/laravel-jsend/v/stable)](https://packagist.org/packages/shalvah/laravel-jsend)
+[![Total Downloads](https://poser.pugx.org/shalvah/laravel-jsend/downloads)](https://packagist.org/packages/shalvah/laravel-jsend)
 [![Build Status](https://travis-ci.com/shalvah/laravel-jsend.svg?branch=master)](https://travis-ci.com/shalvah/laravel-jsend)
 
 Simple helpers to generate [JSend-compliant](https://labs.omniti.com/labs/jsend) responses for your Laravel app
 
 The [JSend specification](https://labs.omniti.com/labs/jsend) lays down some rules for how JSON responses from web servers should be formatted. JSend is especially suited for REST-style applications and APIs.
 
+## Installation
+Laravel 7 and above:
+```bash
+composer require shalvah/laravel-jsend
+```
+
+Laravel 5.1 - 6.*:
+```bash
+composer require shalvah/laravel-jsend:^1.0
+```
+
 ## Usage
 In your controller:
 
@@ -122,11 +134,5 @@ return jsend_fail(["location_id" => "Location not found"], 404);
 return jsend_error("Unable to connect to database", 'E0001', [], 503, ["X-My-Header" => "header value"]);
 ```
 
-## Installation
-
-```bash
-composer require shalvah/laravel-jsend
-```
-
 ## License
 MIT

composer.json

@@ -15,12 +15,12 @@
     }
   ],
   "require": {
-    "php": ">=5.6.4",
-    "laravel/framework": "^5.1|^6.0|^7.0",
-    "orchestra/testbench": "^3.6|^5.0"
+    "php": ">=7.2.5",
+    "laravel/framework": "^7.0",
+    "orchestra/testbench": "^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.0 || ^6.0 || ^7.3"
+    "phpunit/phpunit": "^8.0"
   },
   "autoload": {
     "files": [
@@ -37,10 +37,5 @@
   },
   "scripts": {
     "test": "phpunit tests"
-  },
-  "config": {
-    "platform": {
-      "php": "7.1.3"
-    }
   }
 }

src/JsendExceptionFormatter.php

@@ -2,12 +2,12 @@
 
 namespace Shalvah\LaravelJsend;
 
-use Exception;
+use Throwable;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
 
 /**
- * @mixin \App\Exceptions\Handler
+ * @mixin \Illuminate\Foundation\Exceptions\Handler
  */
 trait JsendExceptionFormatter
 {
@@ -33,7 +33,7 @@ protected function invalidJson($request, ValidationException $exception)
      * @param  \Exception $e
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      */
-    protected function prepareJsonResponse($request, Exception $e)
+    protected function prepareJsonResponse($request, Throwable $e)
     {
         $message = 'Server Error';
         if (config('app.debug') || $this->isHttpException($e)) {