Merge branch 'master' of github.com:fruux/sabre-xml

Author: evert

CHANGELOG.md

@@ -1,6 +1,14 @@
 ChangeLog
 =========
 
+1.1.0 (2015-06-29)
+------------------
+
+* #44, #45: Catching broken and invalid XML better and throwing
+  `Sabre\Xml\LibXMLException` whenever we encounter errors. (@stefanmajoor,
+   @DaanBiesterbos)
+
+
 1.0.0 (2015-05-25)
 ------------------
 

lib/Reader.php

@@ -112,7 +112,6 @@ function parseInnerTree(array $elementMap = null) {
             $this->elementMap = $elementMap;
         }
 
-
         // Really sorry about the silence operator, seems like I have no
         // choice. See:
         //
@@ -121,6 +120,16 @@ function parseInnerTree(array $elementMap = null) {
 
         while (true) {
 
+            if (!$this->isValid()) {
+
+                $errors = libxml_get_errors();
+
+                if ($errors) {
+                    libxml_clear_errors();
+                    throw new LibXMLException($errors);
+                }
+            }
+
             switch ($this->nodeType) {
                 case self::ELEMENT :
                     $elements[] = $this->parseCurrentElement();

tests/Sabre/Xml/ReaderTest.php

@@ -325,7 +325,7 @@ function testBrokenParserClass() {
      *
      * @expectedException Sabre\Xml\LibXMLException
      */
-    function testBrokenXML() {
+    function testBrokenXml() {
 
         $input = <<<BLA
 <test>
@@ -340,6 +340,33 @@ function testBrokenXML() {
 
     }
 
+    /**
+     * Test was added for Issue #45.
+     *
+     * @expectedException Sabre\Xml\LibXMLException
+     */
+    function testBrokenXml2() {
+
+        $input = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions>
+    <collaboration>
+        <participant id="sid-A33D08EB-A2DE-448F-86FE-A2B62E98818" name="Company" processRef="sid-A0A6A196-3C9A-4C69-88F6-7ED7DDFDD264">
+            <extensionElements>
+                <signavio:signavioMetaData metaKey="bgcolor" />
+                ""Administrative w">
+                <extensionElements>
+                    <signavio:signavioMetaData metaKey="bgcolor" metaValue=""/>
+                </extensionElements>
+                </lan
+XML;
+        $reader = new Reader();
+        $reader->xml($input);
+        $reader->parse();
+
+    }
+
+
     /**
      * @depends testMappedElement
      */