Fix to ensure serialised document data property is always present

huntie · Jul 27, 2017 · db83d98 · db83d98
1 parent 0a05f2e
commit db83d98
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/Serializers/JsonApiSerializer.php b/src/Serializers/JsonApiSerializer.php
@@ -108,13 +108,15 @@ public function addLinks($key, $value = null)
      */
     public function serializeToObject(): array
     {
-        return array_filter([
-            'data' => $this->getPrimaryData(),
-            'included' => $this->getIncluded()->values()->toArray(),
-            'links' => $this->getLinks(),
-            'meta' => $this->meta,
-            'jsonapi' => $this->getDocumentMeta(),
-        ]);
+        return array_merge(
+            ['data' => $this->getPrimaryData()],
+            array_filter([
+                'included' => $this->getIncluded()->values()->toArray(),
+                'links' => $this->getLinks(),
+                'meta' => $this->meta,
+                'jsonapi' => $this->getDocumentMeta(),
+            ])
+        );
     }
 
     /**