Merge branch 'develop' into async-with-cn

lindyhopchris · lindyhopchris · commit 76c7db3ad8b8 · 2018-11-02T16:29:36.000Z
diff --git a/docs/fetching/filtering.md b/docs/fetching/filtering.md
@@ -60,7 +60,7 @@ If your resource does not support filtering, you should reject any request that
 parameter. You can do this by disallowing filtering parameters on your [Validators](../basics/validators.md)
 class as follows:
 
-```php****
+```php
 class Validators extends AbstractValidators
 {
     // ...
diff --git a/src/Document/ResourceObject.php b/src/Document/ResourceObject.php
@@ -683,10 +683,10 @@ private function putAttr(string $field, $value): self
 
     /**
      * @param string $field
-     * @param array $value
+     * @param array|null $value
      * @return ResourceObject
      */
-    private function putRelation(string $field, array $value): self
+    private function putRelation(string $field, ?array $value): self
     {
         $copy = clone $this;
         $copy->relationships[$field] = $copy->relationships[$field] ?? [];
diff --git a/tests/lib/Unit/Document/ResourceObjectTest.php b/tests/lib/Unit/Document/ResourceObjectTest.php
@@ -288,7 +288,29 @@ public function testReplaceAttribute(): void
         $this->assertSame($expected, $actual->toArray());
     }
 
-    public function testReplaceRelationship(): void
+    public function testReplaceToOne(): void
+    {
+        $author = ['type' => 'users', 'id' => '999'];
+
+        $expected = $this->values;
+        $expected['relationships']['author']['data'] = $author;
+
+        $this->assertNotSame($this->resource, $actual = $this->resource->replace('author', $author));
+        $this->assertSame($this->values, $this->resource->toArray(), 'original resource is not modified');
+        $this->assertSame($expected, $actual->toArray());
+    }
+
+    public function testReplaceToOneNull(): void
+    {
+        $expected = $this->values;
+        $expected['relationships']['author']['data'] = null;
+
+        $this->assertNotSame($this->resource, $actual = $this->resource->replace('author', null));
+        $this->assertSame($this->values, $this->resource->toArray(), 'original resource is not modified');
+        $this->assertSame($expected, $actual->toArray());
+    }
+
+    public function testReplaceToMany(): void
     {
         $comments = [
             ['type' => 'comments', 'id' => '123456'],

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ If your resource does not support filtering, you should reject any request that`
`60`	`60`	`parameter. You can do this by disallowing filtering parameters on your [Validators](../basics/validators.md)`
`61`	`61`	`class as follows:`
`62`	`62`
`63`		-```php****
	`63`	+```php
`64`	`64`	`class Validators extends AbstractValidators`
`65`	`65`	`{`
`66`	`66`	`// ...`