Added the ability to specify the resource type in the resource data

Author: kordum

src/Serializer/JsonApiSerializer.php

@@ -14,6 +14,7 @@
 use InvalidArgumentException;
 use League\Fractal\Pagination\PaginatorInterface;
 use League\Fractal\Resource\ResourceInterface;
+use UnexpectedValueException;
 
 class JsonApiSerializer extends ArraySerializer
 {
@@ -46,6 +47,10 @@ public function item(?string $resourceKey, array $data): array
     {
         $id = $this->getIdFromData($data);
 
+        $resourceKey = $resourceKey
+            ?? $data['type']
+            ?? throw new UnexpectedValueException('The resource must have a key specified.');
+
         $resource = [
             'data' => [
                 'type' => $resourceKey,
@@ -54,7 +59,10 @@ public function item(?string $resourceKey, array $data): array
             ],
         ];
 
-        unset($resource['data']['attributes']['id']);
+        unset(
+            $resource['data']['attributes']['id'],
+            $resource['data']['attributes']['type'],
+        );
 
         if (isset($resource['data']['attributes']['links'])) {
             $custom_links = $data['links'];
@@ -150,7 +158,7 @@ public function null(): ?array
      */
     public function includedData(ResourceInterface $resource, array $data): array
     {
-        list($serializedData, $linkedIds) = $this->pullOutNestedIncludedData($data);
+        [$serializedData, $linkedIds] = $this->pullOutNestedIncludedData($data);
 
         foreach ($data as $value) {
             foreach ($value as $includeObject) {
@@ -160,7 +168,7 @@ public function includedData(ResourceInterface $resource, array $data): array
 
                 $includeObjects = $this->createIncludeObjects($includeObject);
 
-                list($serializedData, $linkedIds) = $this->serializeIncludedObjectsWithCacheKey(
+                [$serializedData, $linkedIds] = $this->serializeIncludedObjectsWithCacheKey(
                     $includeObjects,
                     $linkedIds,
                     $serializedData
@@ -329,7 +337,7 @@ protected function pullOutNestedIncludedData(array $data): array
         foreach ($data as $value) {
             foreach ($value as $includeObject) {
                 if (isset($includeObject['included'])) {
-                    list($includedData, $linkedIds) = $this->serializeIncludedObjectsWithCacheKey(
+                    [$includedData, $linkedIds] = $this->serializeIncludedObjectsWithCacheKey(
                         $includeObject['included'],
                         $linkedIds,
                         $includedData

test/Serializer/JsonApiSerializerTest.php

@@ -87,6 +87,37 @@ public function testSerializeCollectionWithExtraMeta()
         $this->assertSame($expectedJson, $scope->toJson());
     }
 
+    public function testSerializingItemResourceWithNestedType()
+    {
+        $this->manager->parseIncludes('author');
+
+        $bookData = [
+            'id' => 1,
+            'type' => 'books',
+            'title' => 'Foo',
+            'year' => '1991',
+        ];
+
+        $resource = new Item($bookData, new JsonApiBookTransformer());
+        $scope = new Scope($this->manager, $resource);
+
+        $expected = [
+            'data' => [
+                'type' => 'books',
+                'id' => '1',
+                'attributes' => [
+                    'title' => 'Foo',
+                    'year' => 1991,
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $scope->toArray());
+
+        $expectedJson = '{"data":{"type":"books","id":"1","attributes":{"title":"Foo","year":1991}}}';
+        $this->assertSame($expectedJson, $scope->toJson());
+    }
+
     public function testSerializingItemResourceWithHasOneInclude()
     {
         $this->manager->parseIncludes('author');