Merge pull request #28 from swisnl/bugfix/do-not-fill-type-in-unmapped-morph-relation

Do not fill type attribute in unmapped items in morph(to) relationships

Author: JaZo

src/ItemHydrator.php

@@ -152,11 +152,12 @@ protected function hydrateHasManyRelation(array $attributes, string $availableRe
      */
     protected function hydrateMorphToRelation(array $attributes, MorphToRelation $relation, string $availableRelation)
     {
-        if (!array_key_exists('type', $attributes[$availableRelation])) {
+        $relationData = $attributes[$availableRelation];
+        if (!array_key_exists('type', $relationData)) {
             throw new \InvalidArgumentException('Always provide a "type" attribute in a morphTo relationship');
         }
+        $relationItem = $this->buildRelationItem($relation, array_diff_key($relationData, ['type' => 'type']), $relationData['type']);
 
-        $relationItem = $this->buildRelationItem($relation, $attributes[$availableRelation], $attributes[$availableRelation]['type']);
         $relation->associate($relationItem);
     }
 
@@ -173,7 +174,7 @@ protected function hydrateMorphToManyRelation(array $attributes, MorphToManyRela
             if (!array_key_exists('type', $relationData)) {
                 throw new \InvalidArgumentException('Always provide a "type" attribute in a morphToMany relationship entry');
             }
-            $relationItem = $this->buildRelationItem($relation, $relationData, $relationData['type']);
+            $relationItem = $this->buildRelationItem($relation, array_diff_key($relationData, ['type' => 'type']), $relationData['type']);
 
             $relation->associate($relation->getIncluded()->push($relationItem));
         }

tests/ItemHydratorTest.php

@@ -185,13 +185,38 @@ public function it_hydrates_items_with_morphto_relationship()
         $this->assertEquals($data['testattribute1'], $item->getAttribute('testattribute1'));
         $this->assertEquals($data['testattribute2'], $item->getAttribute('testattribute2'));
         $this->assertEquals('related-item', $morphTo->getType());
+        $this->assertEquals('related-item', $morphTo->getIncluded()->getType());
         $this->assertEquals(
             $data['morphto_relation']['test_related_attribute1'],
             $morphTo->getIncluded()->getAttribute('test_related_attribute1')
         );
         $this->assertArrayHasKey('morphto_relation', $item->toJsonApiArray()['relationships']);
     }
 
+    /**
+     * @test
+     */
+    public function it_hydrates_unmapped_items_with_morphto_relationship()
+    {
+        $data = [
+            'morphto_relation' => [
+                'id'                      => 1,
+                'type'                    => 'unmapped-item',
+                'test_related_attribute1' => 'test',
+            ],
+        ];
+
+        $item = new WithRelationshipItem();
+        $item = $this->getItemHydrator()->hydrate($item, $data);
+
+        /** @var \Swis\JsonApi\Client\Relations\MorphToRelation $morphTo */
+        $morphTo = $item->getRelationship('morphto_relation');
+
+        $this->assertEquals('unmapped-item', $morphTo->getType());
+        $this->assertEquals('unmapped-item', $morphTo->getIncluded()->getType());
+        $this->assertArrayNotHasKey('type', $morphTo->getIncluded()->getAttributes());
+    }
+
     /**
      * @test
      */
@@ -265,6 +290,38 @@ public function it_hydrates_items_with_morphtomany_relationship()
         $this->assertArrayHasKey('morphtomany_relation', $item->toJsonApiArray()['relationships']);
     }
 
+    /**
+     * @test
+     */
+    public function it_hydrates_unmapped_items_with_morphtomany_relationship()
+    {
+        $data = [
+            'morphtomany_relation' => [
+                [
+                    'id'                      => 1,
+                    'type'                    => 'unmapped-item',
+                    'test_related_attribute1' => 'test1',
+                ],
+                [
+                    'id'                      => 2,
+                    'type'                    => 'unmapped-item',
+                    'test_related_attribute1' => 'test2',
+                ],
+            ],
+        ];
+
+        $item = new WithRelationshipItem();
+        $item = $this->getItemHydrator()->hydrate($item, $data);
+
+        /** @var \Swis\JsonApi\Client\Relations\MorphToManyRelation $morphToMany */
+        $morphToMany = $item->getRelationship('morphtomany_relation');
+
+        $this->assertEquals('unmapped-item', $morphToMany->getIncluded()[0]->getType());
+        $this->assertEquals('unmapped-item', $morphToMany->getIncluded()[1]->getType());
+        $this->assertArrayNotHasKey('type', $morphToMany->getIncluded()[0]->getAttributes());
+        $this->assertArrayNotHasKey('type', $morphToMany->getIncluded()[1]->getAttributes());
+    }
+
     /**
      * @test
      */