Allow multiple nested serializer calls

src/JMS/Serializer/GenericSerializationVisitor.php

@@ -21,19 +21,42 @@
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Exception\InvalidArgumentException;
 use JMS\Serializer\Metadata\PropertyMetadata;
+use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
 
 abstract class GenericSerializationVisitor extends AbstractVisitor
 {
+    private $navigatorStack;
     private $navigator;
+    private $rootStack;
     private $root;
+    private $dataStackStack;
     private $dataStack;
     private $data;
 
+    public function __construct(PropertyNamingStrategyInterface $namingStrategy)
+    {
+        parent::__construct($namingStrategy);
+        $this->navigatorStack = new \SplStack;
+        $this->dataStackStack = new \SplStack;
+        $this->rootStack = new \SplStack;
+    }
+
     public function setNavigator(GraphNavigator $navigator)
     {
+        $this->navigatorStack->push($this->navigator);
+        $this->dataStackStack->push($this->dataStack);
+        $this->rootStack->push($this->root);
+
         $this->navigator = $navigator;
-        $this->root = null;
         $this->dataStack = new \SplStack;
+        $this->root = null;
+    }
+
+    public function endNavigator()
+    {
+        $this->navigator = $this->navigatorStack->pop();
+        $this->dataStack = $this->dataStackStack->pop();
+        $this->root = $this->rootStack->pop();
     }
 
     /**

src/JMS/Serializer/Serializer.php

@@ -89,8 +89,10 @@ public function serialize($data, $format, SerializationContext $context = null)
 
         $visitor->setNavigator($this->navigator);
         $this->navigator->accept($visitor->prepare($data), null, $context);
+        $result = $visitor->getResult();
+        $visitor->endNavigator();
 
-        return $visitor->getResult();
+        return $result;
     }
 
     public function deserialize($data, $type, $format, DeserializationContext $context = null)

src/JMS/Serializer/XmlSerializationVisitor.php

@@ -21,6 +21,7 @@
 use JMS\Serializer\Exception\RuntimeException;
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\PropertyMetadata;
+use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
 
 /**
  * XmlSerializationVisitor.
@@ -31,18 +32,31 @@ class XmlSerializationVisitor extends AbstractVisitor
 {
     public $document;
 
+    private $documentStack;
     private $navigator;
+    private $navigatorStack;
     private $defaultRootName = 'result';
     private $defaultRootNamespace;
     private $defaultVersion = '1.0';
     private $defaultEncoding = 'UTF-8';
     private $stack;
+    private $stackStack;
     private $metadataStack;
+    private $metadataStackStack;
     private $currentNode;
     private $currentMetadata;
     private $hasValue;
     private $nullWasVisited;
 
+    public function __construct(PropertyNamingStrategyInterface $namingStrategy)
+    {
+        parent::__construct($namingStrategy);
+        $this->navigatorStack = new \SplStack;
+        $this->documentStack = new \SplStack;
+        $this->stackStack = new \SplStack;
+        $this->metadataStackStack = new \SplStack;
+    }
+
     public function setDefaultRootName($name, $namespace = null)
     {
         $this->defaultRootName = $name;
@@ -69,12 +83,25 @@ public function setDefaultEncoding($encoding)
 
     public function setNavigator(GraphNavigator $navigator)
     {
+        $this->navigatorStack->push($this->navigator);
+        $this->documentStack->push($this->document);
+        $this->stackStack->push($this->stack);
+        $this->metadataStackStack->push($this->metadataStack);
+
         $this->navigator = $navigator;
         $this->document = null;
         $this->stack = new \SplStack;
         $this->metadataStack = new \SplStack;
     }
 
+    public function endNavigator()
+    {
+        $this->navigator = $this->navigatorStack->pop();
+        $this->document = $this->documentStack->pop();
+        $this->stack = $this->stackStack->pop();
+        $this->metadataStack = $this->metadataStackStack->pop();
+    }
+
     public function getNavigator()
     {
         return $this->navigator;
@@ -199,7 +226,7 @@ public function startVisitingObject(ClassMetadata $metadata, $data, array $type,
             }
             $this->document->appendChild($this->currentNode);
         }
-        
+
         $this->addNamespaceAttributes($metadata, $this->currentNode);
 
         $this->hasValue = false;
@@ -421,7 +448,7 @@ private function attachNullNamespace()
             $this->nullWasVisited = true;
         }
     }
-    
+
     /**
      * Adds namespace attributes to the XML root element
      *

src/JMS/Serializer/YamlSerializationVisitor.php

@@ -35,25 +35,42 @@ class YamlSerializationVisitor extends AbstractVisitor
     public $writer;
 
     private $navigator;
+    private $navigatorStack;
     private $stack;
+    private $stackStack;
     private $metadataStack;
+    private $metadataStackStack;
     private $currentMetadata;
 
     public function __construct(PropertyNamingStrategyInterface $namingStrategy)
     {
         parent::__construct($namingStrategy);
 
         $this->writer = new Writer();
+        $this->navigatorStack = new \SplStack;
+        $this->stackStack = new \SplStack;
+        $this->metadataStackStack = new \SplStack;
     }
 
     public function setNavigator(GraphNavigator $navigator)
     {
+        $this->navigatorStack->push($this->navigator);
+        $this->stackStack->push($this->stack);
+        $this->metadataStackStack->push($this->metadataStack);
+
         $this->navigator = $navigator;
         $this->writer->reset();
         $this->stack = new \SplStack;
         $this->metadataStack = new \SplStack;
     }
 
+    public function endNavigator()
+    {
+        $this->navigator = $this->navigatorStack->pop();
+        $this->stack = $this->stackStack->pop();
+        $this->metadataStack = $this->metadataStackStack->pop();
+    }
+
     public function visitNull($data, array $type, Context $context)
     {
         if ('' === $this->writer->content) {