Merge pull request #59 from OskarD/master

Fixed relationship data array format to follow JSON API v1.0 standard
nilportugues · May 11, 2016 · ea24d0f · ea24d0f
2 parents 6fe49a1 + 37f923f
commit ea24d0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/Helpers/DataLinksHelper.php b/src/Helpers/DataLinksHelper.php
@@ -133,8 +133,8 @@ public static function setResponseDataRelationship(array &$mappings, array &$arr
                                 }
 
                                 $newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName] = array_filter($newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName]);
-                                if (!empty($newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName])) {
-                                    $data[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyNameKey][] = $newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName];
+                                if (!empty($newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName][JsonApiTransformer::DATA_KEY])) {
+                                    $data[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyNameKey][JsonApiTransformer::DATA_KEY][] = $newData[JsonApiTransformer::RELATIONSHIPS_KEY][$propertyName][JsonApiTransformer::DATA_KEY];
                                 }
                             }
                         }

diff --git a/tests/JsonApiTransformerTest.php b/tests/JsonApiTransformerTest.php
@@ -83,14 +83,14 @@ public function testItWillSerializeToJsonApiAComplexObject()
                "id":"1"
             }
          },
-         "comments":[
-            {
-               "data":{
-                  "type":"comment",
-                  "id":"1000"
-               }
-            }
-         ]
+        "comments": {
+            "data": [
+                {
+                    "type": "comment",
+                    "id": "1000"
+                }
+            ]
+        }
       }
    },
    "included":[