Merge branch 'release/1.0.0-beta.4' into main

Author: lindyhopchris

CHANGELOG.md

@@ -3,6 +3,13 @@
 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.0-beta.4] - 2021-06-02
+
+### Fixed
+
+- [#76](https://github.com/laravel-json-api/laravel/issues/76) Pagination links will now be correctly added to related
+  resources and relationship identifiers responses.
+
 ## [1.0.0-beta.3] - 2021-04-26
 
 ### Added

composer.json

@@ -25,8 +25,8 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "laravel-json-api/core": "^1.0.0-beta.3",
-        "laravel-json-api/eloquent": "^1.0.0-beta.4",
+        "laravel-json-api/core": "^1.0.0-beta.4",
+        "laravel-json-api/eloquent": "^1.0.0-beta.5",
         "laravel-json-api/encoder-neomerx": "^1.0.0-beta.1",
         "laravel-json-api/exceptions": "^1.0.0-beta.2",
         "laravel-json-api/spec": "^1.0.0-beta.1",

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

@@ -22,6 +22,7 @@
 use App\Models\Comment;
 use App\Models\Post;
 use App\Tests\Api\V1\TestCase;
+use Illuminate\Support\Arr;
 
 class ReadCommentIdentifiersTest extends TestCase
 {
@@ -102,6 +103,12 @@ public function testPaginated(): void
                 'to' => 3,
                 'total' => 5,
             ],
+        ])->assertLinks([
+            'first' => $self . '?' . Arr::query(['page' => ['number' => 1, 'size' => 3], 'sort' => 'id']),
+            'last' => $self . '?' . Arr::query(['page' => ['number' => 2, 'size' => 3], 'sort' => 'id']),
+            'next' => $self . '?' . Arr::query(['page' => ['number' => 2, 'size' => 3], 'sort' => 'id']),
+            'related' => url('/api/v1/posts', [$this->post, 'comments']),
+            'self' => $self,
         ]);
     }
 

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

@@ -22,6 +22,7 @@
 use App\Models\Comment;
 use App\Models\Post;
 use App\Tests\Api\V1\TestCase;
+use Illuminate\Support\Arr;
 
 class ReadCommentsTest extends TestCase
 {
@@ -78,7 +79,7 @@ public function testPaginated(): void
             ->jsonApi('comments')
             ->page(['number' => '1', 'size' => '3'])
             ->sort('id')
-            ->get(url('/api/v1/posts', [$this->post, 'comments']));
+            ->get($url = url('/api/v1/posts', [$this->post, 'comments']));
 
         $response->assertFetchedMany($expected)->assertExactMeta([
             'count' => 5,
@@ -90,6 +91,10 @@ public function testPaginated(): void
                 'to' => 3,
                 'total' => 5,
             ],
+        ])->assertLinks([
+            'first' => $url . '?' . Arr::query(['page' => ['number' => 1, 'size' => 3], 'sort' => 'id']),
+            'last' => $url . '?' . Arr::query(['page' => ['number' => 2, 'size' => 3], 'sort' => 'id']),
+            'next' => $url . '?' . Arr::query(['page' => ['number' => 2, 'size' => 3], 'sort' => 'id']),
         ]);
     }