test: relationship with custom value

Author: Ark4ne

src/Relationship.php

@@ -49,7 +49,7 @@ public function toArray($request, bool $minimal = false): array
             ];
         }
 
-        if (method_exists($resource, 'toArray')) {
+        if (is_object($resource) && method_exists($resource, 'toArray')) {
             $datum = $resource->toArray($request, $minimal);
         } else {
             $datum = collect($resource)->toArray();
@@ -67,20 +67,24 @@ public function toArray($request, bool $minimal = false): array
                     $included[] = $value;
                 }
             }
-        } else {
+        } elseif ($resource instanceof JsonResource) {
             $data['data'] = [
                 'type' => $datum['type'],
                 'id' => $datum['id']
             ];
             if (!$minimal) {
                 $included[] = $datum;
             }
+        } else {
+            $data['data'] = $datum;
         }
 
         return array_filter([
             'data' => array_filter($data),
             'included' => $included,
-            'with' => method_exists($resource, 'with') ? $resource->with($request) : null
+            'with' => is_object($resource) && method_exists($resource, 'with')
+                ? $resource->with($request)
+                : null
         ]);
     }
 

tests/Unit/RelationshipTest.php

@@ -140,6 +140,28 @@ public function testToArrayMissingValue()
         ], $relation->toArray(new Request(), true));
     }
 
+    public function testCustomValue()
+    {
+        $resource = $this->getJsonResourceMissingValue();
+        $relation = (new Relationship([
+            'foo' => 'bar'
+        ]))->withLinks([
+            'self' => 'link'
+        ])->withMeta([
+            'hash' => 'azerty'
+        ]);
+
+        $this->assertEquals([
+            'data' => [
+                'data' => [
+                    'foo' => 'bar'
+                ],
+                'links' => ['self' => 'link'],
+                'meta' => ['hash' => 'azerty'],
+            ],
+        ], $relation->toArray(new Request(), true));
+    }
+
     private function getJsonResource()
     {
         return new class((object)['id' => 1]) extends JsonResource implements Resourceable {