Merge pull request #71 from swisnl/bugfix/item-hydrator-unset-relation-fix

Do not break out of loop when hydrating relations

Author: JaZo

src/ItemHydrator.php

@@ -85,7 +85,7 @@ protected function fillRelations(ItemInterface $item, array $attributes): void
             ) {
                 $relation->dissociate();
 
-                return;
+                continue;
             }
 
             // It is a valid relation

tests/ItemHydratorTest.php

@@ -523,6 +523,33 @@ public function it_hydrates_nested_relationship_items()
         $this->assertEquals('item-with-relationship', $hasOneParent->getIncluded()->getType());
     }
 
+    /**
+     * @test
+     */
+    public function it_dissociates_and_hydrates_relationships_in_one_call()
+    {
+        $data = [
+            'hasone_relation' => null,
+            'morphto_relation' => [
+                'id' => 1,
+                'type' => 'related-item',
+            ],
+        ];
+
+        $item = new WithRelationshipItem();
+        $item = $this->getItemHydrator()->hydrate($item, $data);
+
+        /** @var \Swis\JsonApi\Client\Relations\MorphToRelation $morphTo */
+        $morphTo = $item->getRelation('morphto_relation');
+        $this->assertInstanceOf(MorphToRelation::class, $morphTo);
+
+        $this->assertEquals($data['morphto_relation']['id'], $morphTo->getIncluded()->getId());
+        $this->assertEquals($data['morphto_relation']['type'], $morphTo->getIncluded()->getType());
+        $this->assertArrayNotHasKey('type', $morphTo->getIncluded()->getAttributes());
+
+        $this->assertArrayHasKey('morphto_relation', $item->toJsonApiArray()['relationships']);
+    }
+
     /**
      * @test
      * @dataProvider provideIdArguments