Clean up code and refactor xml saving

Author: theseer

src/Report/Xml/Coverage.php

@@ -33,7 +33,7 @@ public function __construct(\DOMElement $context, $line)
     {
         $this->contextNode = $context;
 
-        $this->writer = new \XMLWriter;
+        $this->writer = new \XMLWriter();
         $this->writer->openMemory();
         $this->writer->startElementNs(null, $context->nodeName, 'http://schema.phpunit.de/coverage/1.0');
         $this->writer->writeAttribute('nr', $line);

src/Report/Xml/Facade.php

@@ -52,16 +52,13 @@ public function process(CodeCoverage $coverage, $target)
         $this->processTests($coverage->getTests());
         $this->processDirectory($report, $this->project);
 
-        $index                     = $this->project->asDom();
-        $index->formatOutput       = true;
-        $index->preserveWhiteSpace = false;
-        $index->save($target . '/index.xml');
+        $this->saveDocument($this->project->asDom(), 'index');
     }
 
     /**
      * @param string $directory
      */
-    private function initTargetDirectory($directory)
+    protected function initTargetDirectory($directory)
     {
         if (file_exists($directory)) {
             if (!is_dir($directory)) {
@@ -101,7 +98,7 @@ private function processFile(FileNode $file, Directory $context)
     {
         $fileObject = $context->addFile(
             $file->getName(),
-            $file->getId() . '.xml'
+            $file->getId().'.xml'
         );
 
         $this->setTotals($file, $fileObject->getTotals());
@@ -132,14 +129,7 @@ private function processFile(FileNode $file, Directory $context)
             $coverage->finalize();
         }
 
-        $this->initTargetDirectory(
-            $this->target . dirname($file->getId()) . '/'
-        );
-
-        $fileDom                     = $fileReport->asDom();
-        $fileDom->formatOutput       = true;
-        $fileDom->preserveWhiteSpace = false;
-        $fileDom->save($this->target . $file->getId() . '.xml');
+        $this->saveDocument($fileReport->asDom(), $file->getId());
     }
 
     private function processUnit($unit, Report $report)
@@ -235,4 +225,23 @@ private function setTotals(AbstractNode $node, Totals $totals)
             $node->getNumTestedFunctions()
         );
     }
+
+    /**
+     * @return string
+     */
+    protected function getTargetDirectory()
+    {
+        return $this->target;
+    }
+
+    protected function saveDocument(\DOMDocument $document, $name)
+    {
+        $filename = sprintf('%s/%s.xml', $this->getTargetDirectory(), $name);
+
+        $document->formatOutput = true;
+        $document->preserveWhiteSpace = false;
+        $this->initTargetDirectory(dirname($filename));
+
+        $document->save($filename);
+    }
 }

src/Report/Xml/File.php

@@ -15,19 +15,35 @@ class File
     /**
      * @var \DOMDocument
      */
-    protected $dom;
+    private $dom;
 
     /**
      * @var \DOMElement
      */
-    protected $contextNode;
+    private $contextNode;
 
     public function __construct(\DOMElement $context)
     {
-        $this->dom         = $context->ownerDocument;
+        $this->dom = $context->ownerDocument;
         $this->contextNode = $context;
     }
 
+    /**
+     * @return \DOMElement
+     */
+    protected function getContextNode()
+    {
+        return $this->contextNode;
+    }
+
+    /**
+     * @return \DOMDocument
+     */
+    protected function getDomDocument()
+    {
+        return $this->dom;
+    }
+
     public function getTotals()
     {
         $totalsContainer = $this->contextNode->firstChild;

src/Report/Xml/Node.php

@@ -29,7 +29,7 @@ public function __construct(\DOMElement $context)
 
     protected function setContextNode(\DOMElement $context)
     {
-        $this->dom         = $context->ownerDocument;
+        $this->dom = $context->ownerDocument;
         $this->contextNode = $context;
     }
 

src/Report/Xml/Project.php

@@ -12,6 +12,9 @@
 
 class Project extends Node
 {
+    /**
+     * @param string $name
+     */
     public function __construct($name)
     {
         $this->init();

src/Report/Xml/Report.php

@@ -14,31 +14,32 @@ class Report extends File
 {
     public function __construct($name)
     {
-        $this->dom = new \DOMDocument;
-        $this->dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
+        $dom = new \DOMDocument();
+        $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
 
-        $this->contextNode = $this->dom->getElementsByTagNameNS(
+        $contextNode = $dom->getElementsByTagNameNS(
             'http://schema.phpunit.de/coverage/1.0',
             'file'
         )->item(0);
 
+        parent::__construct($contextNode);
         $this->setName($name);
     }
 
     private function setName($name)
     {
-        $this->contextNode->setAttribute('name', $name);
+        $this->getContextNode()->setAttribute('name', $name);
     }
 
     public function asDom()
     {
-        return $this->dom;
+        return $this->getDomDocument();
     }
 
     public function getFunctionObject($name)
     {
-        $node = $this->contextNode->appendChild(
-            $this->dom->createElementNS(
+        $node = $this->getContextNode()->appendChild(
+            $this->getDomDocument()->createElementNS(
                 'http://schema.phpunit.de/coverage/1.0',
                 'function'
             )
@@ -59,8 +60,8 @@ public function getTraitObject($name)
 
     private function getUnitObject($tagName, $name)
     {
-        $node = $this->contextNode->appendChild(
-            $this->dom->createElementNS(
+        $node = $this->getContextNode()->appendChild(
+            $this->getDomDocument()->createElementNS(
                 'http://schema.phpunit.de/coverage/1.0',
                 $tagName
             )

src/Report/Xml/Totals.php

@@ -47,7 +47,7 @@ class Totals
     public function __construct(\DOMElement $container)
     {
         $this->container = $container;
-        $dom             = $container->ownerDocument;
+        $dom = $container->ownerDocument;
 
         $this->linesNode = $dom->createElementNS(
             'http://schema.phpunit.de/coverage/1.0',