changed dom property to pop/pushable

connorhu · connorhu · commit 39615f47b46f · 2020-10-12T22:30:26.000+02:00
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -69,6 +69,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
      * @var \DOMDocument
      */
     private $dom;
+    private $domStack = [];
     private $format;
     private $context;
 
@@ -77,6 +78,24 @@ public function __construct(array $defaultContext = [])
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 
+    private function pushDom(array $context = []): void
+    {
+        if (null !== $this->dom) {
+            $this->domStack[] = $this->dom;
+        }
+
+        $this->dom = $this->createDomDocument($context);
+    }
+
+    private function popDom(): void
+    {
+        if (0 === \count($this->domStack)) {
+            return;
+        }
+
+        $this->dom = array_pop($this->domStack);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -90,7 +109,7 @@ public function encode($data, string $format, array $context = [])
 
         $xmlRootNodeName = $context[self::ROOT_NODE_NAME] ?? $this->defaultContext[self::ROOT_NODE_NAME];
 
-        $this->dom = $this->createDomDocument($context);
+        $this->pushDom($context);
         $this->format = $format;
         $this->context = $context;
 
@@ -102,7 +121,10 @@ public function encode($data, string $format, array $context = [])
             $this->appendNode($this->dom, $data, $xmlRootNodeName);
         }
 
-        return $this->dom->saveXML($ignorePiNode ? $this->dom->documentElement : null);
+        $encodedString = $this->dom->saveXML($ignorePiNode ? $this->dom->documentElement : null);
+        $this->popDom();
+
+        return $encodedString;
     }
 
     /**
