Merge branch 'release/5.0.2'

lindyhopchris · lindyhopchris · commit 63d8c4c25487 · 2025-01-11T17:37:20.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [5.0.2] - 2025-01-11
+
+### Fixed
+
+- [#23](https://github.com/laravel-json-api/core/pull/23) Ensure relationship meta is included in paginated relationship
+  responses.
+
 ## [5.0.1] - 2024-11-30
 
 ### Fixed
diff --git a/src/Core/Responses/Concerns/HasRelationship.php b/src/Core/Responses/Concerns/HasRelationship.php
@@ -48,7 +48,7 @@ private function allMeta(): ?Hash
      *
      * @return array|null
      */
-    private function metaForRelationship(): ?array
+    protected function metaForRelationship(): ?array
     {
         if ($this->hasRelationMeta && $relation = $this->relation()) {
             return $relation->meta();
diff --git a/src/Core/Responses/Internal/PaginatedIdentifierResponse.php b/src/Core/Responses/Internal/PaginatedIdentifierResponse.php
@@ -43,6 +43,8 @@ public function __construct(JsonApiResource $resource, string $fieldName, Page $
     public function meta(): Hash
     {
         return Hash::cast($this->page->meta())->merge(
+            Hash::cast(parent::metaForRelationship())
+        )->merge(
             parent::meta()
         );
     }
diff --git a/src/Core/Responses/Internal/PaginatedRelatedResourceResponse.php b/src/Core/Responses/Internal/PaginatedRelatedResourceResponse.php
@@ -43,6 +43,8 @@ public function __construct(JsonApiResource $resource, string $fieldName, Page $
     public function meta(): Hash
     {
         return Hash::cast($this->page->meta())->merge(
+            Hash::cast(parent::metaForRelationship())
+        )->merge(
             parent::meta()
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private function allMeta(): ?Hash`
`48`	`48`	`*`
`49`	`49`	`* @return array\|null`
`50`	`50`	`*/`
`51`		`- private function metaForRelationship(): ?array`
	`51`	`+ protected function metaForRelationship(): ?array`
`52`	`52`	`{`
`53`	`53`	`if ($this->hasRelationMeta && $relation = $this->relation()) {`
`54`	`54`	`return $relation->meta();`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public function __construct(JsonApiResource $resource, string $fieldName, Page $`
`43`	`43`	`public function meta(): Hash`
`44`	`44`	`{`
`45`	`45`	`return Hash::cast($this->page->meta())->merge(`
	`46`	`+ Hash::cast(parent::metaForRelationship())`
	`47`	`+ )->merge(`
`46`	`48`	`parent::meta()`
`47`	`49`	`);`
`48`	`50`	`}`