v0.5.2

Author: neomerx

src/Document/Presenters/ElementPresenter.php

@@ -60,10 +60,13 @@ public function setRelationshipTo(
         $name         = $relation->getName();
         $parentExists = isset($target[$parentType][$parentId]);
 
-        assert('$parentExists === true');
-        assert('isset($target[$parentType][$parentId][\''.Document::KEYWORD_RELATIONSHIPS.'\'][$name]) === false');
-
+        // parent object might be already fully parsed (with children) so
+        // - it won't exist in $target
+        // - it won't make any sense to parse it again (we'll got exactly the same result and it will be thrown away
+        //   as duplicate relations/included resources are not allowed)
         if ($parentExists === true) {
+            assert('isset($target[$parentType][$parentId][\''.Document::KEYWORD_RELATIONSHIPS.'\'][$name]) === false');
+
             $representation = [];
 
             if ($relation->isShowData() === true) {

tests/Encoder/EncodeIncludedObjectsTest.php

@@ -463,4 +463,116 @@ public function testEncodeWithLinkWithPagination()
 
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * Test encode deep duplicate hierarchies.
+     *
+     * Test for issue 35
+     */
+    public function testEncodeDeepDuplicateHierarchies()
+    {
+        $actual = Encoder::instance([
+            Author::class  => AuthorSchema::class,
+            Comment::class => CommentSchema::class,
+            Post::class    => PostSchema::class,
+            Site::class    => SiteSchema::class,
+        ], $this->encoderOptions)->encode([$this->site, $this->site]);
+
+        $expected = <<<EOL
+        {
+            "data" : [{
+                "type"  : "sites",
+                "id"    : "2",
+                "attributes" : {
+                    "name"  : "site name"
+                },
+                "relationships" : {
+                    "posts" : {
+                        "data" : {
+                            "type" : "posts",
+                            "id" : "1"
+                        }
+                    }
+                },
+                "links" : {
+                    "self" : "http://example.com/sites/2"
+                }
+            }, {
+                "type"  : "sites",
+                "id"    : "2",
+                "attributes" : {
+                    "name"  : "site name"
+                },
+                "relationships" : {
+                    "posts" : {
+                        "data" : {
+                            "type" : "posts",
+                            "id" : "1"
+                        }
+                    }
+                },
+                "links" : {
+                    "self" : "http://example.com/sites/2"
+                }
+            }],
+            "included" : [{
+                "type" : "people",
+                "id"   : "9",
+                "attributes" : {
+                    "first_name" : "Dan",
+                    "last_name"  : "Gebhardt"
+                },
+                "relationships":{
+                    "comments" : { "data":null }
+                }
+            }, {
+                "type" : "comments",
+                "id"   : "5",
+                "attributes" : {
+                    "body" : "First!"
+                },
+                "relationships" : {
+                    "author" : {
+                        "data" : { "type":"people", "id":"9" }
+                    }
+                },
+                "links":{
+                    "self" : "http://example.com/comments/5"
+                }
+            }, {
+                "type" : "comments",
+                "id"   : "12",
+                "attributes" : {
+                    "body" : "I like XML better"
+                },
+                "relationships":{
+                    "author" : {
+                        "data" : { "type":"people", "id":"9" }
+                    }
+                },
+                "links":{
+                    "self" : "http://example.com/comments/12"
+                }
+            }, {
+                "type"  : "posts",
+                "id"    : "1",
+                "attributes" : {
+                    "title" : "JSON API paints my bikeshed!",
+                    "body"  : "Outside every fat man there was an even fatter man trying to close in"
+                },
+                "relationships" : {
+                    "author"   : { "data" : { "type" : "people", "id" : "9" } },
+                    "comments" : { "data" : [
+                        { "type" : "comments", "id" : "5" },
+                        { "type" : "comments", "id" : "12" }
+                    ]}
+                }
+            }]
+        }
+EOL;
+        // remove formatting from 'expected'
+        $expected = json_encode(json_decode($expected));
+
+        $this->assertEquals($expected, $actual);
+    }
 }

tests/Encoder/EncodeSimpleObjectsTest.php

@@ -158,6 +158,43 @@ public function testEncodeObjectWithAttributesOnlyInArray()
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * Test encode simple object with attributes only associative array.
+     */
+    public function testEncodeObjectWithAttributesOnlyInAssocArray()
+    {
+        $author   = Author::instance(9, 'Dan', 'Gebhardt');
+        $endcoder = Encoder::instance([
+            Author::class => function ($factory, $container) {
+                $schema = new AuthorSchema($factory, $container);
+                $schema->linkRemove(Author::LINK_COMMENTS);
+                return $schema;
+            }
+        ], $this->encoderOptions);
+
+        $actual = $endcoder->encode(['key_doesnt_matter' => $author]);
+
+        $expected = <<<EOL
+        {
+            "data" : [{
+                "type"       : "people",
+                "id"         : "9",
+                "attributes" : {
+                    "first_name" : "Dan",
+                    "last_name"  : "Gebhardt"
+                },
+                "links" : {
+                    "self" : "http://example.com/people/9"
+                }
+            }]
+        }
+EOL;
+        // remove formatting from 'expected'
+        $expected = json_encode(json_decode($expected));
+
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Test encode simple object in pretty format.
      */