Merge commit '6f665c2'

wallabag · Oct 21, 2018 · 9a7c8de · 9a7c8de
2 parents 3c723ca + 6f665c2
commit 9a7c8de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
         "php": ">=5.3.0",
         "phpzip/phpzip": "~2.0.7",
         "grandt/phpresizegif": "~1.0.3",
-        "grandt/relativepath": "~1.0.1"
+        "grandt/relativepath": "~1.0.1",
+        "masterminds/html5": "^2.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/PHPePub/Core/EPub.php b/src/PHPePub/Core/EPub.php
@@ -2,6 +2,7 @@
 namespace PHPePub\Core;
 
 use com\grandt\BinStringStatic;
+use Masterminds\HTML5;
 use DOMDocument;
 use DOMXPath;
 use PHPePub\Core\Structure\Ncx;
@@ -354,8 +355,8 @@ function addChapter($chapterName, $fileName, $chapterData = null, $autoSplit = f
      * @return array
      */
     function findIdAttributes($chapterData) {
-        $xmlDoc = new DOMDocument();
-        @$xmlDoc->loadHTML($chapterData);
+        $html5 = new HTML5();
+        $xmlDoc = $html5->loadHTML($chapterData);
 
         $xpath = new DomXpath($xmlDoc);
 
@@ -416,8 +417,8 @@ protected function processChapterExternalReferences(&$doc, $externalReferences =
         if ($isDocAString) {
             $doc = StringHelper::removeComments($doc);
 
-            $xmlDoc = new DOMDocument();
-            @$xmlDoc->loadHTML($doc);
+            $html5 = new HTML5();
+            $xmlDoc = $html5->loadHTML($doc);
         } else {
             $xmlDoc = $doc;
         }

diff --git a/src/PHPePub/Core/EPubChapterSplitter.php b/src/PHPePub/Core/EPubChapterSplitter.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPePub\Core;
 
+use Masterminds\HTML5;
 use DOMDocument;
 
 /**
@@ -77,8 +78,8 @@ function splitChapter($chapter, $splitOnSearchString = false, $searchString = '/
             );
         }
 
-        $xmlDoc = new DOMDocument();
-        @$xmlDoc->loadHTML($chapter);
+        $html5 = new HTML5();
+        $xmlDoc = $html5->loadHTML($chapter);
 
         $head = $xmlDoc->getElementsByTagName("head");
         $body = $xmlDoc->getElementsByTagName("body");

diff --git a/tests/composer.json b/tests/composer.json
@@ -1,7 +1,8 @@
 {
   "require": {
         "php": ">=5.3.0",
-        "phpzip/phpzip": ">=2.0.7"
+        "phpzip/phpzip": ">=2.0.7",
+        "masterminds/html5": "^2.1"
     },
     "autoload": {
         "psr-4": {