Merge branch 'release/1.5.0'

Author: lindyhopchris

CHANGELOG.md

@@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [1.5.0] - 2019-10-14
+
+### Added
+- [#415](https://github.com/cloudcreativity/laravel-json-api/issues/415)
+Added a has-one-through JSON API resource relationship for the Eloquent has-one-through
+relationship that was added in Laravel 5.8.
+
+### Fixed
+- [#439](https://github.com/cloudcreativity/laravel-json-api/issues/439)
+Fixed tests failing in Laravel `^6.1`. **Applications using Laravel 6 need to upgrade
+the JSON API testing package to `^2.0`** as follows:
+
+```bash
+$ composer require --dev cloudcreativity/json-api-testing:^2.0
+```
+
 ## [1.4.0] - 2019-09-04
 
 ### Added

composer.json

@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "cloudcreativity/json-api-testing": "^1.2",
+        "cloudcreativity/json-api-testing": "^1.2|^2.0",
         "composer/semver": "^1.5",
         "guzzlehttp/guzzle": "^6.3",
         "mockery/mockery": "^1.1",

docs/basics/adapters.md

@@ -224,6 +224,7 @@ for Eloquent models. The relationship types available are `belongsTo`, `hasOne`,
 | Eloquent | JSON API |
 | :-- | :-- |
 | `hasOne` | `hasOne` |
+| `hasOneThrough` | `hasOneThrough` |
 | `belongsTo` | `belongsTo` |
 | `hasMany` | `hasMany` |
 | `belongsToMany` | `hasMany` |
@@ -338,15 +339,16 @@ class Adapter extends AbstractAdapter
 }
 ```
 
-#### Has-Many-Through
+#### Has-One-Through and Has-Many-Through
 
-The JSON API `hasManyThrough` relation can be used for an Eloquent `hasManyThrough` relation. The important thing
-to note about this relationship is it is **read-only**. This is because the relationship can be modified in your API
-by modifying the intermediary model. For example, a `countries` resource might have many `posts` resources through
-an intermediate `users` resource. The relationship is effectively modified by creating and deleting posts and/or a
-user changing which country they are associated to.
+The JSON API `hasOneThrough` and `hasManyThrough` relations can be used for an Eloquent `hasOneThrough`
+and `hasManyThrough` relation. The important thing to note about these relationships is that both are **read-only**.
+This is because the relationship can be modified in your API by modifying the intermediary model.
+For example, a `countries` resource might have many `posts` resources through an intermediate `users` resource.
+The relationship is effectively modified by creating and deleting posts and/or a user changing which country they
+are associated to.
 
-Define a has-many-through relationship on an adapter as follows:
+Use the `hasOneThrough()` or `hasManyThrough()` methods on your adapter as follows:
 
 ```php
 class Adapter extends AbstractAdapter

docs/installation.md

@@ -2,9 +2,9 @@
 
 Install using [Composer](http://getcomposer.org):
 
-``` bash
+```bash
 $ composer require cloudcreativity/laravel-json-api
-$ composer require --dev cloudcreativity/json-api-testing
+$ composer require --dev "cloudcreativity/json-api-testing:^1.2|^2.0"
 ```
 
 This package's service provider and facade will be automatically added using package discovery. You will

src/Eloquent/AbstractAdapter.php

@@ -555,6 +555,15 @@ protected function hasOne($modelKey = null)
         return new HasOne($modelKey ?: $this->guessRelation());
     }
 
+    /**
+     * @param string|null $modelKey
+     * @return HasOneThrough
+     */
+    protected function hasOneThrough($modelKey = null)
+    {
+        return new HasOneThrough($modelKey ?: $this->guessRelation());
+    }
+
     /**
      * @param string|null $modelKey
      * @return HasMany

src/Eloquent/Concerns/SoftDeletesModels.php

@@ -19,8 +19,8 @@
 
 use Carbon\Carbon;
 use CloudCreativity\LaravelJsonApi\Utils\Str;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Schema\Builder;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 

src/Eloquent/HasOneThrough.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright 2019 Cloud Creativity Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace CloudCreativity\LaravelJsonApi\Eloquent;
+
+use CloudCreativity\LaravelJsonApi\Exceptions\RuntimeException;
+use Illuminate\Database\Eloquent\Relations;
+use Neomerx\JsonApi\Contracts\Encoder\Parameters\EncodingParametersInterface;
+
+class HasOneThrough extends BelongsTo
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function update($record, array $relationship, EncodingParametersInterface $parameters)
+    {
+        throw new RuntimeException('Modifying a has-one-through Eloquent relation is not supported.');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function replace($record, array $relationship, EncodingParametersInterface $parameters)
+    {
+        throw new RuntimeException('Modifying a has-one-through Eloquent relation is not supported.');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function acceptRelation($relation)
+    {
+        return $relation instanceof Relations\HasOneThrough;
+    }
+}

tests/dummy/app/History.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright 2019 Cloud Creativity Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace DummyApp;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class History extends Model
+{
+
+    /**
+     * @var array
+     */
+    protected $fillable = ['detail'];
+
+    /**
+     * @return BelongsTo
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}

tests/dummy/app/JsonApi/Histories/Adapter.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2019 Cloud Creativity Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace DummyApp\JsonApi\Histories;
+
+use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter;
+use DummyApp\History;
+use Illuminate\Support\Collection;
+
+class Adapter extends AbstractAdapter
+{
+
+    /**
+     * Adapter constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(new History());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function filter($query, Collection $filters)
+    {
+        // TODO: Implement filter() method.
+    }
+
+}

tests/dummy/app/JsonApi/Histories/Schema.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright 2019 Cloud Creativity Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace DummyApp\JsonApi\Histories;
+
+use DummyApp\History;
+use Neomerx\JsonApi\Schema\SchemaProvider;
+
+class Schema extends SchemaProvider
+{
+
+    /**
+     * @var string
+     */
+    protected $resourceType = 'histories';
+
+    /**
+     * @param History $resource
+     * @return string
+     */
+    public function getId($resource)
+    {
+        return (string) $resource->getRouteKey();
+    }
+
+    /**
+     * @param History $resource
+     * @return array
+     */
+    public function getAttributes($resource)
+    {
+        return ['detail' => $resource->detail];
+    }
+
+    /**
+     * @param History $resource
+     * @param bool $isPrimary
+     * @param array $includeRelationships
+     * @return array
+     */
+    public function getRelationships($resource, $isPrimary, array $includeRelationships)
+    {
+        return [
+            'user' => [
+                self::SHOW_SELF => false,
+                self::SHOW_RELATED => false,
+                self::SHOW_DATA => isset($includeRelationships['user']),
+                self::DATA => static function () use ($resource) {
+                    return $resource->user;
+                },
+            ],
+        ];
+    }
+
+
+}