Fixed issue with nested includes & parent key tracking

czim · Jun 17, 2017 · eaf80bc · eaf80bc
1 parent 978439f
commit eaf80bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Encoder/Transformers/ModelRelationshipTransformer.php b/src/Encoder/Transformers/ModelRelationshipTransformer.php
@@ -127,7 +127,7 @@ protected function getRelatedFullData(ResourceInterface $resource, $includeKey)
         $related = $resource->relationshipData($includeKey);
 
         $transformer = $this->encoder->makeTransformer($related);
-        $transformer->setParent($this->parent . '.' . $includeKey);
+        $transformer->setParent(trim($this->parent . '.' . $includeKey, '.'));
         $transformer->setIsVariable($resource->isRelationshipVariable($includeKey));
 
         // For nullable singular relations, make sure we return data normalized under a data key

diff --git a/src/Encoder/Transformers/ModelTransformer.php b/src/Encoder/Transformers/ModelTransformer.php
@@ -122,7 +122,7 @@ protected function processRelationships(ResourceInterface $resource)
             ]);
 
             $transformer = $this->encoder->makeTransformer($transformParameters);
-            $transformer->setParent($this->parent . '.' . $key);
+            $transformer->setParent($this->parent);
 
             $data[ $key ] = $transformer->transform($transformParameters);
         }