fix: JsonApiResource::toArray don't filter on type and id

Ark4ne · Jun 9, 2022 · beacaf0 · beacaf0
1 parent 4aceb45
commit beacaf0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -1,6 +1,10 @@
 Release note
 ============
 
+# v1.1.9
+### Fixes
+- `JsonApiResource::toArray` don't filter on `type` and `id`
+
 # v1.1.8
 ### Add
 - `Skeleton::class` present skeleton of a `JsonApiResource::class`

diff --git a/src/Resources/JsonApiResource.php b/src/Resources/JsonApiResource.php
@@ -38,15 +38,15 @@ public function toArray(mixed $request, bool $included = true): array
         ];
 
         if ($included) {
-            $data += [
+            $data += Arr::toArray(array_filter([
                 'attributes' => $this->requestedAttributes($request),
                 'relationships' => $this->requestedRelationships($request),
                 'links' => $this->toLinks($request),
                 'meta' => $this->toResourceMeta($request)
-            ];
+            ]));
         }
 
-        return Arr::toArray(array_filter($data));
+        return $data;
     }
 
     /**