[Build] Make Laravel 7 minimum version

Author: lindyhopchris

.travis.yml

@@ -10,13 +10,13 @@ matrix:
   include:
     - php: "7.2"
       env:
-        - LARAVEL_VERSION=^6.0
+        - LARAVEL_VERSION=^7.0
     - php: "7.3"
       env:
-        - LARAVEL_VERSION=^6.0
+        - LARAVEL_VERSION=^7.0
     - php: "7.4"
       env:
-        - LARAVEL_VERSION=^6.0
+        - LARAVEL_VERSION=^7.0
 
 install:
   - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n

CHANGELOG.md

@@ -14,7 +14,7 @@ floats. This is to ensure that the developer is correctly testing boolean filter
 
 ### Changed
 - Minimum PHP version is now `7.2`.
-- Minimum Laravel version is now `6.0`.
+- Minimum Laravel version is now `7.0`.
 - Amended the store interface so that it always takes a string resource type and string id,
 instead of the deprecated resource identifier object.
 - Moved the `Validation\ErrorTranslator` class to `Error\Translator`.

README.md

@@ -62,7 +62,8 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 
 | Laravel | This Package |
 | --- | --- |
-| `^6.0` | `^2.0` |
+| `^7.0` | `^2.0` |
+| `^6.0` | `^1.0` |
 | `5.8.*` | `^1.0` |
 | `5.7.*` | `^1.0` |
 | `5.6.*` | `^1.0` |
@@ -71,9 +72,6 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/)
 when upgrading between major or pre-release versions.
 
-> You may notice that there are `2.0.0-alpha` tags. We **do not** recommend using these versions
-> until we hit `beta` releases.
-
 ## Lumen
 
 Currently we have not integrated the package with Lumen. We do not have any active projects that use Lumen,

composer.json

@@ -24,13 +24,13 @@
     "require": {
         "php": "^7.2",
         "ext-json": "*",
-        "illuminate/console": "^6.0",
-        "illuminate/contracts": "^6.0",
-        "illuminate/database": "^6.0",
-        "illuminate/filesystem": "^6.0",
-        "illuminate/http": "^6.0",
-        "illuminate/pagination": "^6.0",
-        "illuminate/support": "^6.0",
+        "illuminate/console": "^7.0",
+        "illuminate/contracts": "^7.0",
+        "illuminate/database": "^7.0",
+        "illuminate/filesystem": "^7.0",
+        "illuminate/http": "^7.0",
+        "illuminate/pagination": "^7.0",
+        "illuminate/support": "^7.0",
         "neomerx/json-api": "^1.0.3",
         "nyholm/psr7": "^1.2",
         "ramsey/uuid": "^3.0",
@@ -40,8 +40,9 @@
         "ext-sqlite3": "*",
         "cloudcreativity/json-api-testing": "^2.1",
         "guzzlehttp/guzzle": "^6.3",
+        "laravel/ui": "^2.0",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "^4.0",
+        "orchestra/testbench": "^5.0",
         "phpunit/phpunit": "^8.0"
     },
     "suggest": {

src/Exceptions/HandlesErrors.php

@@ -21,12 +21,12 @@
 use CloudCreativity\LaravelJsonApi\Routing\Route;
 use CloudCreativity\LaravelJsonApi\Services\JsonApiService;
 use CloudCreativity\LaravelJsonApi\Utils\Helpers;
-use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Neomerx\JsonApi\Contracts\Document\ErrorInterface;
 use Neomerx\JsonApi\Exceptions\JsonApiException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Throwable;
 
 /**
  * Trait HandlesErrors
@@ -44,10 +44,10 @@ trait HandlesErrors
      * API via its Accept header.
      *
      * @param Request $request
-     * @param Exception $e
+     * @param Throwable $e
      * @return bool
      */
-    public function isJsonApi($request, Exception $e)
+    public function isJsonApi($request, Throwable $e)
     {
         if (Helpers::wantsJsonApi($request)) {
             return true;
@@ -63,10 +63,10 @@ public function isJsonApi($request, Exception $e)
      * Render an exception as a JSON API error response.
      *
      * @param Request $request
-     * @param Exception $e
+     * @param Throwable $e
      * @return Response
      */
-    public function renderJsonApi($request, Exception $e)
+    public function renderJsonApi($request, Throwable $e)
     {
         $headers = ($e instanceof HttpException) ? $e->getHeaders() : [];
 

src/Testing/TestExceptionHandler.php

@@ -21,6 +21,7 @@
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Neomerx\JsonApi\Exceptions\JsonApiException;
+use Throwable;
 
 /**
  * Class TestExceptionHandler
@@ -57,20 +58,20 @@ class TestExceptionHandler extends ExceptionHandler
     ];
 
     /**
-     * @param Exception $e
+     * @param Throwable $e
      * @throws Exception
      */
-    public function report(Exception $e)
+    public function report(Throwable $e)
     {
         // no-op
     }
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @param Exception $e
-     * @return \Illuminate\Http\Response
+     * @param Throwable $e
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)
     {
         if ($this->isJsonApi($request, $e)) {
             return $this->renderJsonApi($request, $e);
@@ -80,10 +81,10 @@ public function render($request, Exception $e)
     }
 
     /**
-     * @param Exception $e
-     * @return Exception
+     * @param Throwable $e
+     * @return Throwable
      */
-    protected function prepareException(Exception $e)
+    protected function prepareException(Throwable $e)
     {
         if ($e instanceof JsonApiException) {
             return $this->prepareJsonApiException($e);

src/Testing/TestResponse.php

@@ -19,7 +19,7 @@
 
 use CloudCreativity\JsonApi\Testing\Concerns\HasHttpAssertions;
 use CloudCreativity\JsonApi\Testing\Document;
-use Illuminate\Foundation\Testing\TestResponse as BaseTestResponse;
+use Illuminate\Testing\TestResponse as BaseTestResponse;
 use Illuminate\Http\Response;
 
 /**

tests/lib/Integration/TestCase.php

@@ -30,6 +30,7 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
+use Laravel\Ui\UiServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 /**
@@ -70,6 +71,7 @@ protected function getPackageProviders($app)
     {
         return [
             ServiceProvider::class,
+            UiServiceProvider::class,
             DummyPackage\ServiceProvider::class,
             DummyApp\Providers\AppServiceProvider::class,
         ];