fix

Author: staabm

src/Report/Xml/Facade.php

@@ -124,7 +124,9 @@ private function processDirectory(DirectoryNode $directory, Node $context): void
             $directoryName = '/';
         }
 
-        $directoryObject = $context->addDirectory($directoryName);
+        $this->xmlWriter->startElement('directory');
+        $this->xmlWriter->writeAttribute('name', $directoryName);
+        $directoryObject = $context->addDirectory();
 
         $this->setTotals($directory, $directoryObject->totals());
 
@@ -135,17 +137,19 @@ private function processDirectory(DirectoryNode $directory, Node $context): void
         foreach ($directory->files() as $node) {
             $this->processFile($node, $directoryObject);
         }
+        $this->xmlWriter->endElement();
     }
 
     /**
      * @throws XmlException
      */
     private function processFile(FileNode $file, Directory $context): void
     {
-        $fileObject = $context->addFile(
-            $file->name(),
-            $file->id() . '.xml',
-        );
+        $this->xmlWriter->startElement('file');
+        $this->xmlWriter->writeAttribute('name', $file->name());
+        $this->xmlWriter->writeAttribute('href', $file->id() . '.xml');
+
+        $fileObject = $context->addFile();
 
         $this->setTotals($file, $fileObject->totals());
 
@@ -154,7 +158,7 @@ private function processFile(FileNode $file, Directory $context): void
             strlen($this->project->projectSourceDirectory()),
         );
 
-        $fileReport = new Report($path);
+        $fileReport = new Report($this->xmlWriter, $path);
 
         $this->setTotals($file, $fileReport->totals());
 
@@ -177,16 +181,21 @@ private function processFile(FileNode $file, Directory $context): void
         }
         $this->xmlWriter->endElement();
 
+        $this->xmlWriter->endElement();
+
         $fileReport->source()->setSourceCode(
             file_get_contents($file->pathAsString()),
         );
+        $fileReport->finalize();
 
         $this->saveDocument($fileReport->asDom(), $file->id());
     }
 
     private function processUnit(ProcessedClassType|ProcessedTraitType $unit, Report $report): void
     {
         if ($unit instanceof ProcessedClassType) {
+            $this->xmlWriter->startElement('class');
+
             $unitObject = $report->classObject(
                 $unit->className,
                 $unit->namespace,
@@ -196,6 +205,8 @@ private function processUnit(ProcessedClassType|ProcessedTraitType $unit, Report
                 (float) $unit->crap,
             );
         } else {
+            $this->xmlWriter->startElement('trait');
+
             $unitObject = $report->traitObject(
                 $unit->traitName,
                 $unit->namespace,
@@ -218,6 +229,8 @@ private function processUnit(ProcessedClassType|ProcessedTraitType $unit, Report
                 $method->crap,
             );
         }
+
+        $this->xmlWriter->endElement();
     }
 
     private function processFunction(ProcessedFunctionType $function, Report $report): void

src/Report/Xml/File.php

@@ -20,7 +20,7 @@
  */
 class File
 {
-    private XMLWriter $xmlWriter;
+    protected XMLWriter $xmlWriter;
 
     public function __construct(XMLWriter $xmlWriter)
     {

src/Report/Xml/Node.php

@@ -32,31 +32,14 @@ public function totals(): Totals
         return new Totals($this->xmlWriter);
     }
 
-    public function addDirectory(string $name): Directory
+    public function addDirectory(): Directory
     {
-        $dirNode = $this->dom->createElementNS(
-            Facade::XML_NAMESPACE,
-            'directory',
-        );
-
-        $dirNode->setAttribute('name', $name);
-        $this->contextNode()->appendChild($dirNode);
-
-        return new Directory($dirNode);
+        return new Directory($this->xmlWriter);
     }
 
-    public function addFile(string $name, string $href): File
+    public function addFile(): File
     {
-        $fileNode = $this->dom->createElementNS(
-            Facade::XML_NAMESPACE,
-            'file',
-        );
-
-        $fileNode->setAttribute('name', $name);
-        $fileNode->setAttribute('href', $href);
-        $this->contextNode()->appendChild($fileNode);
-
-        return new File($fileNode);
+        return new File($this->xmlWriter);
     }
 
     protected function contextNode(): DOMElement

src/Report/Xml/Report.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Xml;
 
+use XMLWriter;
 use function assert;
 use function basename;
 use function dirname;
@@ -22,27 +23,32 @@ final class Report extends File
 {
     private readonly string $name;
 
-    public function __construct(string $name)
+    public function __construct(XMLWriter $xmlWriter, string $name)
     {
+        /*
         $dom = new DOMDocument;
         $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="https://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
 
         $contextNode = $dom->getElementsByTagNameNS(
             Facade::XML_NAMESPACE,
             'file',
         )->item(0);
-
-        parent::__construct($contextNode);
+*/
+        parent::__construct($xmlWriter);
 
         $this->name = $name;
+
+        $xmlWriter->startDocument('1.0', 'UTF-8');
+        $xmlWriter->startElement('phpunit');
+        $xmlWriter->startElement('file');
+        $xmlWriter->writeAttribute('name', basename($this->name));
+        $xmlWriter->writeAttribute('path', dirname($this->name));
     }
 
-    public function asDom(): DOMDocument
+    public function finalize(): void
     {
-        $this->contextNode()->setAttribute('name', basename($this->name));
-        $this->contextNode()->setAttribute('path', dirname($this->name));
-
-        return $this->dom;
+        $this->xmlWriter->endElement();
+        $this->xmlWriter->endElement();
     }
 
     public function functionObject(
@@ -85,16 +91,7 @@ public function classObject(
         int $executed,
         float $crap
     ): Unit {
-        $node = $this->contextNode()->appendChild(
-            $this->dom->createElementNS(
-                Facade::XML_NAMESPACE,
-                'class',
-            ),
-        );
-
-        assert($node instanceof DOMElement);
-
-        return new Unit($node, $name, $namespace, $start, $executable, $executed, $crap);
+        return new Unit($this->xmlWriter, $name, $namespace, $start, $executable, $executed, $crap);
     }
 
     public function traitObject(
@@ -105,16 +102,7 @@ public function traitObject(
         int $executed,
         float $crap
     ): Unit {
-        $node = $this->contextNode()->appendChild(
-            $this->dom->createElementNS(
-                Facade::XML_NAMESPACE,
-                'trait',
-            ),
-        );
-
-        assert($node instanceof DOMElement);
-
-        return new Unit($node, $name, $namespace, $start, $executable, $executed, $crap);
+        return new Unit($this->xmlWriter, $name, $namespace, $start, $executable, $executed, $crap);
     }
 
     public function source(): Source