Fix create Document or modify Element from string

Author: dimabdc

.travis.yml

@@ -14,10 +14,5 @@ matrix:
 install:
   - composer install --no-interaction
 
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libxml2 libxml2-dev
-  
-script: 
-  - php -i
+script:
   - vendor/bin/phpunit --coverage-text

lib/Document.php

@@ -68,7 +68,12 @@ public function loadHtml($html)
         libxml_use_internal_errors(true);
         libxml_disable_entity_loader(true);
 
-        $this->document->loadHTML('<?xml encoding="UTF-8">' . $html, LIBXML_HTML_NOIMPLIED);
+        $sxe = simplexml_load_string($html);
+        if (libxml_get_errors()) {
+            $this->document->loadHTML('<?xml encoding="UTF-8">' . $html);
+        } else {
+            $this->document = dom_import_simplexml($sxe)->ownerDocument;
+        }
 
         libxml_clear_errors();
         libxml_disable_entity_loader(false);

lib/Element.php

@@ -5,6 +5,7 @@
 
 use DOMElement;
 use DOMNode;
+use RuntimeException;
 
 /**
  * Class Element
@@ -47,6 +48,11 @@ protected function replaceNode($string)
         }
 
         $newDocument = new Document($string);
+
+        if ($newDocument->outertext != $string) {
+            throw new RuntimeException("Not valid HTML fragment");
+        }
+
         $newNode = $this->node->ownerDocument->importNode($newDocument->getDocument()->documentElement, true);
 
         $this->node->parentNode->replaceChild($newNode, $this->node);
@@ -63,14 +69,20 @@ protected function replaceNode($string)
      */
     protected function replaceChild($string)
     {
+        if (!empty($string)) {
+            $newDocument = new Document($string);
+
+            if ($newDocument->outertext != $string) {
+                throw new RuntimeException("Not valid HTML fragment");
+            }
+        }
+
         foreach ($this->node->childNodes as $node) {
             $this->node->removeChild($node);
         }
 
         if (!empty($string)) {
-            $newDocument = new Document($string);
             $newNode = $this->node->ownerDocument->importNode($newDocument->getDocument()->documentElement, true);
-
             $this->node->appendChild($newNode);
         }
 

tests/FastSimpleHTMLDom/DocumentTest.php

@@ -132,7 +132,7 @@ public function findTests()
             array($html, 'input[id=in]', 1),
             array($html, '#in', 1),
             array($html, '*[id]', 52),
-            array($html, 'text', 640),
+            array($html, 'text', 462),
             array($html, 'comment', 3),
         );
     }

tests/FastSimpleHTMLDom/ElementTest.php

@@ -11,14 +11,15 @@ class ElementTest extends TestCase
 {
     public function testConstructor()
     {
-        $html = '<input name="username" value="John">';
+        $html = '<input name="username" value="John">User name</input>';
 
         $document = new Document($html);
         $node = $document->getDocument()->documentElement;
+
         $element = new Element($node);
 
         $this->assertEquals('input', $element->tag);
-        $this->assertEquals('', $element->plaintext);
+        $this->assertEquals('User name', $element->plaintext);
         $this->assertEquals('username', $element->name);
         $this->assertEquals('John', $element->value);
     }
@@ -113,7 +114,7 @@ public function findTests()
             array($html, 'input[id=in]', 1),
             array($html, '#in', 1),
             array($html, '*[id]', 52),
-            array($html, 'text', 640),
+            array($html, 'text', 462),
             array($html, 'comment', 3),
         );
     }

tests/FastSimpleHTMLDom/NodeListTest.php

@@ -41,7 +41,7 @@ public function findTests()
             array($html, 'input[id=in]', 1),
             array($html, '#in', 1),
             array($html, '*[id]', 51),
-            array($html, 'text', 539),
+            array($html, 'text', 390),
         );
     }