Merge pull request #24 from staabm/patch-1

Simplify XMLSerializer

Author: theseer

src/XMLSerializer.php

@@ -5,12 +5,6 @@
 
 class XMLSerializer {
 
-    /** @var \XMLWriter */
-    private $writer;
-
-    /** @var Token */
-    private $previousToken;
-
     /** @var NamespaceUri */
     private $xmlns;
 
@@ -35,45 +29,41 @@ public function toDom(TokenCollection $tokens): DOMDocument {
     }
 
     public function toXML(TokenCollection $tokens): string {
-        $this->writer = new \XMLWriter();
-        $this->writer->openMemory();
-        $this->writer->setIndent(true);
-        $this->writer->startDocument();
-        $this->writer->startElement('source');
-        $this->writer->writeAttribute('xmlns', $this->xmlns->asString());
+        $writer = new \XMLWriter();
+        $writer->openMemory();
+        $writer->setIndent(true);
+        $writer->startDocument();
+        $writer->startElement('source');
+        $writer->writeAttribute('xmlns', $this->xmlns->asString());
 
         if (\count($tokens) > 0) {
-            $this->writer->startElement('line');
-            $this->writer->writeAttribute('no', '1');
+            $writer->startElement('line');
+            $writer->writeAttribute('no', '1');
 
-            $this->previousToken = $tokens[0];
+            $previousToken = $tokens[0];
 
             foreach ($tokens as $token) {
-                $this->addToken($token);
+                if ($previousToken->getLine() < $token->getLine()) {
+                    $writer->endElement();
+        
+                    $writer->startElement('line');
+                    $writer->writeAttribute('no', (string)$token->getLine());
+                    $previousToken = $token;
+                }
+        
+                if ($token->getValue() !== '') {
+                    $writer->startElement('token');
+                    $writer->writeAttribute('name', $token->getName());
+                    $writer->writeRaw(\htmlspecialchars($token->getValue(), \ENT_NOQUOTES | \ENT_DISALLOWED | \ENT_XML1));
+                    $writer->endElement();
+                }
             }
         }
 
-        $this->writer->endElement();
-        $this->writer->endElement();
-        $this->writer->endDocument();
-
-        return $this->writer->outputMemory();
-    }
-
-    private function addToken(Token $token): void {
-        if ($this->previousToken->getLine() < $token->getLine()) {
-            $this->writer->endElement();
-
-            $this->writer->startElement('line');
-            $this->writer->writeAttribute('no', (string)$token->getLine());
-            $this->previousToken = $token;
-        }
+        $writer->endElement();
+        $writer->endElement();
+        $writer->endDocument();
 
-        if ($token->getValue() !== '') {
-            $this->writer->startElement('token');
-            $this->writer->writeAttribute('name', $token->getName());
-            $this->writer->writeRaw(\htmlspecialchars($token->getValue(), \ENT_NOQUOTES | \ENT_DISALLOWED | \ENT_XML1));
-            $this->writer->endElement();
-        }
+        return $writer->outputMemory();
     }
 }