cloudcreativity · lindyhopchris · Feb 28, 2019 · Feb 4, 2019 · Feb 25, 2019 · Feb 28, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,10 @@ matrix:
     env:
     - LARAVEL_VERSION=5.7.*
     - PHPUNIT_VERSION=^7.0
+  - php: 7.2
+    env:
+      - LARAVEL_VERSION=5.8.*
+      - PHPUNIT_VERSION=^7.0
   - php: 7.3
     env:
     - LARAVEL_VERSION=5.5.*
@@ -40,6 +44,10 @@ matrix:
     env:
     - LARAVEL_VERSION=5.7.*
     - PHPUNIT_VERSION=^7.0
+  - php: 7.3
+    env:
+      - LARAVEL_VERSION=5.8.*
+      - PHPUNIT_VERSION=^7.5
 
 install:
 - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+### Added
+- Package now supports Laravel 5.8.
+
 ### Fixed
 - [#295](https://github.com/cloudcreativity/laravel-json-api/issues/295)
 Use `null` for empty `from`/`to` fields in cursor page meta.

diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 
 | Laravel | This Package | EOL? |
 | --- | --- | --- |
+| 5.8.* | `dev-laravel-5.8` | - |
 | 5.7.* | `1.0.0-rc.2` | - |
 | 5.6.* | `1.0.0-rc.2` | - |
 | 5.5.* | `1.0.0-rc.2` | - |

diff --git a/composer.json b/composer.json
@@ -25,24 +25,24 @@
         "php": "^7.1",
         "ext-json": "*",
         "cloudcreativity/utils-object": "^1.0",
-        "illuminate/console": "5.5.*|5.6.*|5.7.*",
-        "illuminate/contracts": "5.5.*|5.6.*|5.7.*",
-        "illuminate/database": "5.5.*|5.6.*|5.7.*",
-        "illuminate/filesystem": "5.5.*|5.6.*|5.7.*",
-        "illuminate/http": "5.5.*|5.6.*|5.7.*",
-        "illuminate/pagination": "5.5.*|5.6.*|5.7.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*",
+        "illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/filesystem": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
         "neomerx/json-api": "^1.0.3",
         "ramsey/uuid": "^3.0",
         "symfony/psr-http-message-bridge": "^1.0",
         "zendframework/zend-diactoros": "^1.3"
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "cloudcreativity/json-api-testing": "1.0.0-rc.1",
+        "cloudcreativity/json-api-testing": "^1.0.0",
         "guzzlehttp/guzzle": "^6.3",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "3.5.*|3.6.*|3.7.*",
+        "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*",
         "phpunit/phpunit": "^6.0|^7.0"
     },
     "suggest": {

diff --git a/src/Schema/CreatesEloquentIdentities.php b/src/Schema/CreatesEloquentIdentities.php
@@ -56,14 +56,24 @@ protected function createBelongsToIdentity(Model $model, $relationshipKey)
             ));
         }
 
-        $id = $model->{$relation->getForeignKey()};
+        // support Laravel 5.8
+        $foreignKey = method_exists($relation, 'getForeignKeyName') ?
+            $relation->getForeignKeyName() :
+            $relation->getForeignKey();
+
+        $id = $model->{$foreignKey};
 
         if (is_null($id)) {
             return null;
         }
 
+        // support Laravel 5.8
+        $ownerKey = method_exists($relation, 'getOwnerKeyName') ?
+            $relation->getOwnerKeyName() :
+            $relation->getOwnerKey();
+
         $related = $relation->getRelated()->replicate();
-        $related->{$relation->getOwnerKey()} = $id;
+        $related->{$ownerKey} = $id;
 
         return $related;
     }

diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
@@ -18,6 +18,7 @@
 namespace CloudCreativity\LaravelJsonApi\Validation;
 
 use CloudCreativity\LaravelJsonApi\Contracts\Validation\ValidatorInterface;
+use CloudCreativity\LaravelJsonApi\Exceptions\RuntimeException;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Neomerx\JsonApi\Exceptions\ErrorCollection;
 
@@ -69,6 +70,20 @@ public function validate()
         return $this->validator->validate();
     }
 
+
+    /**
+     * @inheritdoc
+     */
+    public function validated()
+    {
+        // @TODO remove when only supporting Laravel >=5.8
+        if (!method_exists($this->validator, 'validated')) {
+            throw new RuntimeException('Not supported until Laravel 5.8');
+        }
+
+        return $this->validator->validated();
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/tests/dummy/tests/Feature/Avatars/TestCase.php b/tests/dummy/tests/Feature/Avatars/TestCase.php
@@ -33,7 +33,7 @@ abstract class TestCase extends BaseTestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Storage::fake('local');

diff --git a/tests/dummy/tests/TestCase.php b/tests/dummy/tests/TestCase.php
@@ -40,7 +40,7 @@ abstract class TestCase extends BaseTestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->artisan('migrate');

diff --git a/tests/lib/Integration/Auth/AuthorizerTest.php b/tests/lib/Integration/Auth/AuthorizerTest.php
@@ -37,7 +37,7 @@ class AuthorizerTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Auth/ControllerAuthorizationTest.php b/tests/lib/Integration/Auth/ControllerAuthorizationTest.php
@@ -36,7 +36,7 @@ class ControllerAuthorizationTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Client/DeleteTest.php b/tests/lib/Integration/Client/DeleteTest.php
@@ -32,7 +32,7 @@ class DeleteTest extends TestCase
     /**
      *
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->post = factory(Post::class)->create();

diff --git a/tests/lib/Integration/Client/ReadTest.php b/tests/lib/Integration/Client/ReadTest.php
@@ -32,7 +32,7 @@ class ReadTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->post = factory(Post::class)->create();

diff --git a/tests/lib/Integration/Client/TestCase.php b/tests/lib/Integration/Client/TestCase.php
@@ -45,7 +45,7 @@ abstract class TestCase extends BaseTestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->handler = HandlerStack::create($this->mock = new MockHandler());

diff --git a/tests/lib/Integration/Client/ToManyTest.php b/tests/lib/Integration/Client/ToManyTest.php
@@ -31,7 +31,7 @@ class ToManyTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->post = factory(Post::class)->create();

diff --git a/tests/lib/Integration/Client/ToOneTest.php b/tests/lib/Integration/Client/ToOneTest.php
@@ -31,7 +31,7 @@ class ToOneTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->post = factory(Post::class)->create();

diff --git a/tests/lib/Integration/Client/UpdateTest.php b/tests/lib/Integration/Client/UpdateTest.php
@@ -32,7 +32,7 @@ class UpdateTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->post = factory(Post::class)->create();

diff --git a/tests/lib/Integration/ContentNegotiation/CustomTest.php b/tests/lib/Integration/ContentNegotiation/CustomTest.php
@@ -37,7 +37,7 @@ class CustomTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Eloquent/MorphToTest.php b/tests/lib/Integration/Eloquent/MorphToTest.php
@@ -43,7 +43,7 @@ class MorphToTest extends TestCase
     /**
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->actingAsUser();

diff --git a/tests/lib/Integration/Eloquent/PolymorphicHasManyTest.php b/tests/lib/Integration/Eloquent/PolymorphicHasManyTest.php
@@ -43,7 +43,7 @@ class PolymorphicHasManyTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->actingAsUser('admin', 'author');

diff --git a/tests/lib/Integration/Eloquent/ResourceTest.php b/tests/lib/Integration/Eloquent/ResourceTest.php
@@ -35,7 +35,7 @@ class ResourceTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Carbon::setTestNow('2018-12-01 12:00:00');
@@ -44,7 +44,7 @@ protected function setUp()
     /**
      * @return void
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         Carbon::setTestNow();

diff --git a/tests/lib/Integration/ErrorsTest.php b/tests/lib/Integration/ErrorsTest.php
@@ -41,7 +41,7 @@ class ErrorsTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->doNotRethrowExceptions();

diff --git a/tests/lib/Integration/GeneratorsTest.php b/tests/lib/Integration/GeneratorsTest.php
@@ -46,7 +46,7 @@ class GeneratorsTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -62,7 +62,7 @@ protected function setUp()
     /**
      * @return void
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 

diff --git a/tests/lib/Integration/Http/Controllers/HooksTest.php b/tests/lib/Integration/Http/Controllers/HooksTest.php
@@ -43,7 +43,7 @@ class HooksTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Issue154/IssueTest.php b/tests/lib/Integration/Issue154/IssueTest.php
@@ -37,7 +37,7 @@ class IssueTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Issue224/IssueTest.php b/tests/lib/Integration/Issue224/IssueTest.php
@@ -40,7 +40,7 @@ class IssueTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Issue67/IssueTest.php b/tests/lib/Integration/Issue67/IssueTest.php
@@ -32,7 +32,7 @@ class IssueTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->app->instance(PostsSchema::class, $this->app->make(Schema::class));

diff --git a/tests/lib/Integration/Pagination/CursorPagingTest.php b/tests/lib/Integration/Pagination/CursorPagingTest.php
@@ -44,7 +44,7 @@ class CursorPagingTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->faker = $this->app->make(Generator::class);

diff --git a/tests/lib/Integration/Pagination/StandardPagingTest.php b/tests/lib/Integration/Pagination/StandardPagingTest.php
@@ -36,7 +36,7 @@ class StandardPagingTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->app->instance(StandardStrategy::class, $this->strategy = new StandardStrategy());

diff --git a/tests/lib/Integration/Queue/ClientDispatchTest.php b/tests/lib/Integration/Queue/ClientDispatchTest.php
@@ -36,7 +36,7 @@ class ClientDispatchTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Queue::fake();

diff --git a/tests/lib/Integration/Queue/ControllerHooksTest.php b/tests/lib/Integration/Queue/ControllerHooksTest.php
@@ -38,7 +38,7 @@ class ControllerHooksTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Queue::fake();

diff --git a/tests/lib/Integration/Queue/CustomiseTest.php b/tests/lib/Integration/Queue/CustomiseTest.php
@@ -40,7 +40,7 @@ class CustomiseTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Queue/QueueEventsTest.php b/tests/lib/Integration/Queue/QueueEventsTest.php
@@ -28,7 +28,7 @@ class QueueEventsTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Carbon::setTestNow('2018-10-23 12:00:00.123456');

diff --git a/tests/lib/Integration/Resolver/ResolverTest.php b/tests/lib/Integration/Resolver/ResolverTest.php
@@ -40,7 +40,7 @@ class ResolverTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/lib/Integration/Routing/CustomTest.php b/tests/lib/Integration/Routing/CustomTest.php
@@ -40,7 +40,7 @@ class CustomTest extends TestCase
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();