Merge pull request #104 from tyler-sommer/recursion-fix

Potential fix for "recursion detected" issue
schmittjoh · Jan 9, 2014 · 6c3982f · 6c3982f
2 parents cf70eea + 3a151d1
commit 6c3982f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/JMS/Serializer/JsonSerializationVisitor.php b/src/JMS/Serializer/JsonSerializationVisitor.php
@@ -61,7 +61,7 @@ public function endVisitingObject(ClassMetadata $metadata, $data, array $type, C
             $rs = new \ArrayObject();
 
             if (array() === $this->getRoot()) {
-                $this->setRoot($rs);
+                $this->setRoot(clone $rs);
             }
         }
 

diff --git a/tests/JMS/Serializer/Tests/Serializer/JsonSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/JsonSerializationTest.php
@@ -175,6 +175,11 @@ public function testSerializeEmptyObject()
         $this->assertEquals('{}', $this->serialize(new Author(null)));
     }
 
+    public function testSerializeArrayWithEmptyObject()
+    {
+        $this->assertEquals('{"0":{}}', $this->serialize(array(new \stdClass())));
+    }
+
     protected function getFormat()
     {
         return 'json';