Merge pull request #21 from emil-nasso/relationships-emptydata

Relationships with empty data, issue #20
woohoolabs · May 3, 2016 · d4e9633 · d4e9633
2 parents 06c3b5e + a6cb118
commit d4e9633
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/JsonApi/Schema/Relationship/AbstractRelationship.php b/src/JsonApi/Schema/Relationship/AbstractRelationship.php
@@ -125,7 +125,7 @@ public function transform(
         ) {
             $transformedData = $this->transformData($transformation, $relationshipName, $defaultRelationships);
         } else {
-            $transformedData = null;
+            $transformedData = false;
         }
 
         if ($transformation->request->isIncludedField($resourceType, $relationshipName)) {
@@ -143,7 +143,7 @@ public function transform(
             }
 
             // DATA
-            if (isset($transformedData) === true) {
+            if ($transformedData !== false) {
                 $relationship["data"] = $transformedData;
             }
         }

diff --git a/src/JsonApi/Schema/Relationship/ToManyRelationship.php b/src/JsonApi/Schema/Relationship/ToManyRelationship.php
@@ -34,7 +34,7 @@ protected function transformData(
     ) {
         $data = $this->retrieveData();
         if (empty($data) || $this->resourceTransformer === null) {
-            return null;
+            return [];
         }
 
         $content = [];