Merge pull request #1585 from seamuslee001/libxml_improve

Ensure that entity_loader disable variable is re-set back to the orig…

Author: troosan

src/PhpWord/Shared/Html.php

@@ -72,14 +72,15 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
         }
 
         // Load DOM
-        libxml_disable_entity_loader(true);
+        $orignalLibEntityLoader = libxml_disable_entity_loader(true);
         $dom = new \DOMDocument();
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
         self::$xpath = new \DOMXPath($dom);
         $node = $dom->getElementsByTagName('body');
 
         self::parseNode($node->item(0), $element);
+        libxml_disable_entity_loader($orignalLibEntityLoader);
     }
 
     /**

src/PhpWord/TemplateProcessor.php

@@ -170,7 +170,7 @@ protected function readPartWithRels($fileName)
      */
     protected function transformSingleXml($xml, $xsltProcessor)
     {
-        libxml_disable_entity_loader(true);
+        $orignalLibEntityLoader = libxml_disable_entity_loader(true);
         $domDocument = new \DOMDocument();
         if (false === $domDocument->loadXML($xml)) {
             throw new Exception('Could not load the given XML document.');
@@ -180,6 +180,7 @@ protected function transformSingleXml($xml, $xsltProcessor)
         if (false === $transformedXml) {
             throw new Exception('Could not transform the given XML document.');
         }
+        libxml_disable_entity_loader($orignalLibEntityLoader);
 
         return $transformedXml;
     }

tests/PhpWord/_includes/XmlDocument.php

@@ -76,10 +76,10 @@ public function getFileDom($file = 'word/document.xml')
         $this->file = $file;
 
         $file = $this->path . '/' . $file;
-        libxml_disable_entity_loader(false);
+        $orignalLibEntityLoader = libxml_disable_entity_loader(false);
         $this->dom = new \DOMDocument();
         $this->dom->load($file);
-        libxml_disable_entity_loader(true);
+        libxml_disable_entity_loader($orignalLibEntityLoader);
 
         return $this->dom;
     }