Merge branch 'hotfix/2.1.2'

Author: lindyhopchris

CHANGELOG.md

@@ -3,6 +3,12 @@
 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/).
 
+## [2.1.2] - 2022-04-04
+
+### Fixed
+
+- [#175](https://github.com/laravel-json-api/laravel/issues/175) Fix page URLs missing sparse field sets.
+
 ## [2.1.1] - 2022-04-01
 
 ### Fixed

composer.json

@@ -26,7 +26,7 @@
         "php": "^7.4|^8.0",
         "ext-json": "*",
         "laravel-json-api/core": "^2.2",
-        "laravel-json-api/eloquent": "^2.1",
+        "laravel-json-api/eloquent": "^2.1.1",
         "laravel-json-api/encoder-neomerx": "^2.0",
         "laravel-json-api/exceptions": "^1.1",
         "laravel-json-api/spec": "^1.1.1",

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

@@ -218,11 +218,90 @@ public function testFilteredAndPaginated(): void
             ->page(['number' => 1, 'size' => 10])
             ->get('/api/v1/posts');
 
-        $response->assertFetchedMany($expected)
+        $response
+            ->assertFetchedMany($expected)
             ->assertMeta($meta)
             ->assertLinks($links);
     }
 
+    public function testSparseFieldSets(): void
+    {
+        $posts = Post::factory()->count(3)->create();
+
+        $expected = $posts->map(
+            fn(Post $post) => $this->serializer
+                ->post($post)
+                ->only('author', 'slug', 'synopsis', 'title')
+                ->replace('author', ['type' => 'users', 'id' => $post->author])
+        );
+
+        $authors = $this->identifiersFor(
+            'users', $posts->pluck('author')
+        );
+
+        $response = $this
+            ->jsonApi('posts')
+            ->sparseFields('posts', ['author', 'slug', 'synopsis', 'title'])
+            ->sparseFields('users', ['name'])
+            ->includePaths('author')
+            ->get('/api/v1/posts');
+
+        $response
+            ->assertFetchedManyExact($expected)
+            ->assertIncluded($authors);
+    }
+
+    public function testSparseFieldSetsAndPaginated(): void
+    {
+        $posts = Post::factory()->count(5)->create();
+
+        $expected = $posts->take(3)->map(
+            fn(Post $post) => $this->serializer
+                ->post($post)
+                ->only('author', 'slug', 'synopsis', 'title')
+                ->replace('author', ['type' => 'users', 'id' => $post->author])
+        );
+
+        $meta = [
+            'currentPage' => 1,
+            'from' => 1,
+            'lastPage' => 2,
+            'perPage' => 3,
+            'to' => 3,
+            'total' => 5,
+        ];
+
+        $links = [
+            'first' => 'http://localhost/api/v1/posts?' . Arr::query([
+                    'fields' => $fields = [
+                        'posts' => 'author,slug,synopsis,title',
+                    ],
+                    'include' => 'author',
+                    'page' => ['number' => 1, 'size' => 3],
+                    'sort' => '-createdAt',
+                ]),
+            'last' => $last = 'http://localhost/api/v1/posts?' . Arr::query([
+                    'fields' => $fields,
+                    'include' => 'author',
+                    'page' => ['number' => 2, 'size' => 3],
+                    'sort' => '-createdAt',
+                ]),
+            'next' => $last,
+        ];
+
+        $response = $this
+            ->jsonApi('posts')
+            ->sparseFields('posts', ['author', 'slug', 'synopsis', 'title'])
+            ->includePaths('author')
+            ->page(['number' => 1, 'size' => 3])
+            ->get('/api/v1/posts');
+
+        $response
+            ->assertFetchedManyExact($expected)
+            ->assertExactMeta($meta)
+            ->assertLinks($links);
+    }
+
     public function testWithCount(): void
     {
         $posts = Post::factory()

tests/dummy/tests/Api/V1/TestCase.php

@@ -21,6 +21,7 @@
 
 use App\Tests\TestCase as BaseTestCase;
 use Illuminate\Contracts\Routing\UrlRoutable;
+use Illuminate\Support\Collection;
 use LaravelJsonApi\Testing\MakesJsonApiRequests;
 
 class TestCase extends BaseTestCase
@@ -49,7 +50,7 @@ protected function setUp(): void
      */
     protected function identifiersFor(string $type, $modelsOrResourceIds): array
     {
-        return collect($modelsOrResourceIds)->map(fn($modelOrResourceId) => [
+        return Collection::make($modelsOrResourceIds)->map(fn($modelOrResourceId) => [
             'type' => $type,
             'id' => ($modelOrResourceId instanceof UrlRoutable) ?
                 (string) $modelOrResourceId->getRouteKey() :