Laravel 7.0 and 8.0 prepare

.gitignore

@@ -11,4 +11,5 @@ npm-debug.log
 yarn-error.log
 .env
 composer.lock
-.php_cs.cache
+.php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -3,13 +3,17 @@ language: php
 matrix:
   include:
     - php: "7.2"
-      env: LARAVEL_VERSION="5.8.*"
+      env: LARAVEL_VERSION="7.0.*"
     - php: "7.3"
-      env: LARAVEL_VERSION="5.8.*"
+      env: LARAVEL_VERSION="7.0.*"
+    - php: "7.4"
+      env: LARAVEL_VERSION="7.0.*"
     - php: "7.2"
-      env: LARAVEL_VERSION="6.0.*"
+      env: LARAVEL_VERSION="8.0.*"
     - php: "7.3"
-      env: LARAVEL_VERSION="6.0.*" $RUN_CS_FIXER=1
+      env: LARAVEL_VERSION="8.0.*"
+    - php: "7.4"
+      env: LARAVEL_VERSION="8.0.*" $RUN_CS_FIXER=1
 
 sudo: false
 

composer.json

@@ -39,18 +39,19 @@
   ],
   "require": {
     "php": ">=7.2",
+    "ext-json": "*",
     "astrotomic/laravel-translatable": "^11.6",
-    "laravel/framework": "^5.8|^6.0"
+    "laravel/framework": "^7.0|^8.0"
   },
   "require-dev": {
     "filp/whoops": "~2.0",
     "friendsofphp/php-cs-fixer": "^2.16",
     "mockery/mockery": "^1.0",
-    "orchestra/testbench": "3.8.*|^4.0",
-    "phpunit/php-code-coverage": "^6.0|^7.0",
-    "phpunit/phpunit": "^7.0|^8.0",
+    "orchestra/testbench": "^5.0|^6.0",
+    "phpunit/php-code-coverage": "^7.0",
+    "phpunit/phpunit": "^8.0",
     "spatie/phpunit-watcher": "^1.3",
-    "squizlabs/php_codesniffer": "^2.3|^3.5"
+    "squizlabs/php_codesniffer": "^3.5"
   },
   "autoload": {
     "psr-4": {

src/Http/Resources/BaseApiResource.php

@@ -4,12 +4,12 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Swis\JsonApi\Server\Traits\HandlesRelationships;
 
-class BaseApiResource extends Resource
+class BaseApiResource extends JsonResource
 {
     use HandlesRelationships;
 
@@ -44,7 +44,7 @@ public function setValues()
         if (!$this->resource) {
             return;
         }
-        $this->resource->addHidden($this->resource->getKeyName());
+        $this->resource->makeHidden($this->resource->getKeyName());
 
         $this->jsonApiModel->setId((string) $this->resource->getKey());
         $this->jsonApiModel->setType($this->getResourceType());