Merge pull request #5 from fusionspim/hotfix/catch-domdocument-warnings

Convert DOMDocument warnings to exception

Author: ziadoz

.gitignore

@@ -3,3 +3,5 @@
 .DS_Store
 out
 vendor
+tests/output/*
+.gitkeep

src/Document.php

@@ -142,9 +142,11 @@ public function save($path)
     {
         $this->build();
 
-        $this->dom->save($path);
+        $results = $this->dom->save($path);
 
         Xml::validate($path);
+
+        return $results > 0;
     }
 
     /**

src/Xml.php

@@ -2,6 +2,7 @@
 namespace DemandwareXml;
 
 use \DOMDocument;
+use \DemandwareXml\XmlException;
 
 class Xml
 {
@@ -38,6 +39,10 @@ public static function validate($filePath)
 
         libxml_use_internal_errors(true);
 
+        set_error_handler(function ($errno, $errstr, $errfile, $errline, $errcontext) {
+            throw new XmlException($errstr, $errno);
+        });
+
         // possibly more efficient to pass a $dom object rather than save/reload, but cleaner to assume already saved
         $dom                     = new DOMDocument('1.0', 'UTF-8');
         $dom->preserveWhiteSpace = false;
@@ -46,6 +51,8 @@ public static function validate($filePath)
         $dom->normalizeDocument();
         $dom->save($filePath);
 
+        restore_error_handler();
+
         if (! $dom->schemaValidate(realpath(__DIR__ . '/../xsd/catalog.xsd'))) {
             throw new XmlException(static::errorSummary());
         }

tests/ProductsTest.php

@@ -8,7 +8,9 @@
 
 class ProductsTest extends AbstractTest
 {
-    public function testProductsXml()
+    protected $document;
+
+    public function setUp()
     {
         $document = new Document('TestCatalog');
 
@@ -50,9 +52,37 @@ public function testProductsXml()
             $document->addObject($element);
         }
 
+        $this->document = $document;
+    }
+
+    public function tearDown()
+    {
+        $this->document = null;
+    }
+
+    public function testProductsXml()
+    {
         $sampleXml = $this->loadFixture('products.xml');
-        $outputXml = $document->getDomDocument();
+        $outputXml = $this->document->getDomDocument();
 
         $this->assertEqualXMLStructure($sampleXml->firstChild, $outputXml->firstChild);
     }
+
+    /**
+     * @expectedException               \DemandwareXml\XmlException
+     * @expectedExceptionMessageRegExp  /Entity 'bull' not defined/
+     */
+    public function testProductsInvalidEntitiesException()
+    {
+        $element = new Product('product123');
+        $element->setName('product number 123 •');
+
+        $this->document->addObject($element);
+        $this->document->save(__DIR__ . '/output/products.xml');
+    }
+
+    public function testProductsSaveXml()
+    {
+        $this->assertTrue($this->document->save(__DIR__ . '/output/products.xml'));
+    }
 }