Merge branch 'release/1.0.1' into main

Author: lindyhopchris

CHANGELOG.md

@@ -3,6 +3,20 @@
 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.0.1] - 2021-12-08
+
+### Changed
+
+- The maximum PHP version is now 8.0. PHP 8.1 is not supported because it introduces a breaking change. The next major
+  version of this package will add support for PHP 8.1.
+
+### Fixed
+
+- [#139](https://github.com/laravel-json-api/laravel/issues/139) Fix the `WhereHas` and `WhereDoesntHave` filters.
+  Previously these were not iterating over the filters from the correct resource schema - they were iterating over
+  the filters from the schema to which the relationship belonged. They now correctly iterate over the filters from the
+  schema for the resource that is on the inverse side of the relationship.
+
 ## [1.0.0] - 2021-07-31
 
 ### Added

README.md

@@ -5,10 +5,98 @@
 Implement feature-rich [JSON:API](https://jsonapi.org) compliant APIs in your
 [Laravel](https://laravel.com) applications. Build your next standards-compliant API today.
 
+### Why use JSON:API?
+
+- Standardised, consistent APIs.
+- Feature rich - some of which are filtering, pagination, eager loading and sparse fieldsets.
+- Easy to understand.
+
+### Why use Laravel JSON:API?
+
+- Saves a lot of development time.
+- Highly maintainable code.
+- Great, extensive documentation.
+- Strong conventions, but also highly customisable.
+- Makes use of native Laravel features such as policies and form requests to make the shift easier for developers.
+- Beautiful, expressive Nova-style schemas.
+- Fully testable via expressive test helpers.
+
+```php
+class PostSchema extends Schema
+{
+
+    /**
+     * The model the schema corresponds to.
+     *
+     * @var string
+     */
+    public static string $model = Post::class;
+
+    /**
+     * The maximum include path depth.
+     *
+     * @var int
+     */
+    protected int $maxDepth = 3;
+
+    /**
+     * Get the resource fields.
+     *
+     * @return array
+     */
+    public function fields(): array
+    {
+        return [
+            ID::make(),
+            BelongsTo::make('author')->type('users')->readOnly(),
+            HasMany::make('comments')->readOnly(),
+            Str::make('content'),
+            DateTime::make('createdAt')->sortable()->readOnly(),
+            DateTime::make('publishedAt')->sortable(),
+            Str::make('slug'),
+            BelongsToMany::make('tags'),
+            Str::make('title')->sortable(),
+            DateTime::make('updatedAt')->sortable()->readOnly(),
+        ];
+    }
+
+    /**
+     * Get the resource filters.
+     *
+     * @return array
+     */
+    public function filters(): array
+    {
+        return [
+            WhereIdIn::make($this),
+            WhereIn::make('author', 'author_id'),
+        ];
+    }
+
+    /**
+     * Get the resource paginator.
+     *
+     * @return Paginator|null
+     */
+    public function pagination(): ?Paginator
+    {
+        return PagePagination::make();
+    }
+}
+```
+
 ## Documentation
 
 See our website, [laraveljsonapi.io](https://laraveljsonapi.io)
 
+### Tutorial
+
+New to JSON:API and/or Laravel JSON:API? Then
+the [Laravel JSON:API tutorial](https://laraveljsonapi.io/docs/1.0/tutorial/)
+is a great way to learn!
+
+Follow the tutorial to build a blog application with a JSON:API compliant API.
+
 ## Installation
 
 Install using [Composer](https://getcomposer.org)
@@ -32,7 +120,7 @@ composer up laravel-json-api/* cloudcreativity/json-api-testing
 ## Example Application
 
 To view an example Laravel application that uses this package, see the
-[Dummy Application](https://github.com/laravel-json-api/laravel/tree/main/tests/dummy) within the tests folder.
+[Tutorial Application](https://github.com/laravel-json-api/tutorial-app).
 
 ## License
 

composer.json

@@ -23,10 +23,10 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^7.4|8.0.*",
         "ext-json": "*",
         "laravel-json-api/core": "^1.0.0",
-        "laravel-json-api/eloquent": "^1.0.0",
+        "laravel-json-api/eloquent": "^1.0.1",
         "laravel-json-api/encoder-neomerx": "^1.0.0",
         "laravel-json-api/exceptions": "^1.0.0",
         "laravel-json-api/spec": "^1.0.0",

tests/dummy/tests/Api/V1/Posts/ReadTest.php

@@ -165,16 +165,24 @@ public function testSparseFieldSets(): void
 
         $expected = $this->serializer
             ->post($post)
-            ->only('slug', 'synopsis', 'title')
+            ->only('author', 'slug', 'synopsis', 'title')
+            ->replace('author', ['type' => 'users', 'id' => $post->author])
+            ->jsonSerialize();
+
+        $author = $this->serializer
+            ->user($post->author)
+            ->only('name')
             ->jsonSerialize();
 
         $response = $this
             ->withoutExceptionHandling()
             ->jsonApi('posts')
-            ->sparseFields('posts', ['slug', 'synopsis', 'title'])
+            ->sparseFields('posts', ['author', 'slug', 'synopsis', 'title'])
+            ->sparseFields('users', ['name'])
+            ->includePaths('author')
             ->get(url('/api/v1/posts', $expected['id']));
 
-        $response->assertFetchedOneExact($expected);
+        $response->assertFetchedOneExact($expected)->assertIncluded([$author]);
     }
 
     public function testWithCount(): void