[Bugfix] Fix passing empty to-one relations in resource object

lindyhopchris · lindyhopchris · commit 652a17955c7d · 2018-11-05T17:17:51.000Z
diff --git a/src/Document/ResourceObject.php b/src/Document/ResourceObject.php
@@ -351,7 +351,7 @@ public function withoutRelationships(): self
     public function getRelations(): Collection
     {
         return $this->getRelationships()->filter(function (array $relation) {
-            return isset($relation['data']);
+            return array_key_exists('data', $relation);
         })->map(function (array $relation) {
             return $relation['data'];
         });
diff --git a/tests/lib/Unit/Document/ResourceObjectTest.php b/tests/lib/Unit/Document/ResourceObjectTest.php
@@ -122,6 +122,35 @@ public function testFields(): array
         return $expected;
     }
 
+    public function testFieldsWithEmptyToOne(): void
+    {
+        $this->values['relationships']['author']['data'] = null;
+
+        $expected = [
+            'author' => null,
+            'content' => '...',
+            'id' => '1',
+            'published' => null,
+            'tags' => [
+                [
+                    'type' => 'tags',
+                    'id' => '4',
+                ],
+                [
+                    'type' => 'tags',
+                    'id' => '5',
+                ],
+            ],
+            'title' => 'Hello World',
+            'type' => 'posts',
+        ];
+
+        $resource = ResourceObject::create($this->values);
+        $this->assertSame($expected, $resource->all());
+        $this->assertNull($resource['author']);
+        $this->assertNull($resource->get('author', true));
+    }
+
     /**
      * @param array $expected
      * @depends testFields

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public function withoutRelationships(): self`
`351`	`351`	`public function getRelations(): Collection`
`352`	`352`	`{`
`353`	`353`	`return $this->getRelationships()->filter(function (array $relation) {`
`354`		`- return isset($relation['data']);`
	`354`	`+ return array_key_exists('data', $relation);`
`355`	`355`	`})->map(function (array $relation) {`
`356`	`356`	`return $relation['data'];`
`357`	`357`	`});`