Merge 4b889b0 into 5ba985e

Author: huntie

src/Support/JsonApiTransforms.php

@@ -48,7 +48,7 @@ protected function transformRecord($record, array $fields = [], array $include =
         }
 
         $data = array_filter([
-            'type' => $record->getTable(),
+            'type' => str_slug($record->getTable()),
             'id' => $record->id,
             'attributes' => array_except($attributes, ['id']),
             'relationships' => $relationships,
@@ -71,7 +71,7 @@ protected function transformRecordSimple($record)
 
         return [
             'data' => [
-                'type' => $record->getTable(),
+                'type' => str_slug($record->getTable()),
                 'id' => $record->id,
                 'attributes' => $attributes,
             ]
@@ -89,7 +89,7 @@ protected function transformRecordIdentifier($record)
     {
         return [
             'data' => [
-                'type' => $record->getTable(),
+                'type' => str_slug($record->getTable()),
                 'id' => $record->id,
             ]
         ];
@@ -100,16 +100,25 @@ protected function transformRecordIdentifier($record)
      *
      * @param Collection|LengthAwarePaginator $records
      * @param array                           $fields
+     * @param array|null                      $include
      *
      * @return array
      */
-    protected function transformCollection($records, array $fields = [])
+    protected function transformCollection($records, array $fields = [], array $include = [])
     {
-        $data = $records->map(function ($record) use ($fields) {
-            return $this->transformRecord($record, $fields)['data'];
-        })->toArray();
-
+        $data = [];
         $links = [];
+        $included = [];
+
+        foreach ($records as $record) {
+            $object = $this->transformRecord($record, $fields, $include);
+
+            if (isset($object['included'])) {
+                $included = array_merge($included, $object['included']);
+            }
+
+            $data[] = $object['data'];
+        }
 
         if ($records instanceof LengthAwarePaginator) {
             $links['first'] = $records->url(1);
@@ -118,7 +127,7 @@ protected function transformCollection($records, array $fields = [])
             $links['next'] = $records->nextPageUrl();
         }
 
-        return array_merge(compact('data'), array_filter(compact('links')));
+        return array_merge(compact('data'), array_filter(compact('links', 'included')));
     }
 
     /**