Added masterminds/html5, which should solve the user-input and HTML5 …

…issues
eduardokum · Mar 6, 2020 · df8ab3f · df8ab3f
1 parent 0ca8a5d
commit df8ab3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
         "illuminate/contracts": "^5.3 | ^6.0 | ^7.0",
         "illuminate/support": "^5.3 | ^6.0 | ^7.0",
         "illuminate/mail": "^5.3 | ^6.0 | ^7.0 | ^8.0",
-        "squizlabs/php_codesniffer": "^3.5"
+        "squizlabs/php_codesniffer": "^3.5",
+        "masterminds/html5": "^2.0"
     },
     "require-dev": {
         "php": ">=7.0",

diff --git a/src/Listeners/SwiftEmbedImages.php b/src/Listeners/SwiftEmbedImages.php
@@ -8,6 +8,7 @@
 use Eduardokum\LaravelMailAutoEmbed\Embedder\Base64Embedder;
 use Eduardokum\LaravelMailAutoEmbed\Embedder\Embedder;
 use Eduardokum\LaravelMailAutoEmbed\Models\EmbeddableEntity;
+use Masterminds\HTML5;
 use ReflectionClass;
 use Swift_Events_SendEvent;
 use Swift_Events_SendListener;
@@ -61,8 +62,9 @@ private function attachImages()
         $body = $this->message->getBody();
 
         // Parse document
-        $document = new DOMDocument();
-        if (!$document->loadHTML($body)) {
+        $parser = new HTML5();
+        $document = $parser->loadHTML($body);
+        if (!$document) {
             // Cannot read
             return;
         }
@@ -71,7 +73,7 @@ private function attachImages()
         $this->attachImagesToDom($document);
 
         // Replace body
-        $this->message->setBody($document->saveHTML());
+        $this->message->setBody($parser->saveHTML($document));
     }
 
     /**

diff --git a/tests/Traits/InteractsWithSwift.php b/tests/Traits/InteractsWithSwift.php
@@ -58,9 +58,6 @@ protected function handleBeforeSendPerformedEvent($libraryFile, $options)
     protected function assertEmailImageTags($expectations, $body)
     {
         foreach ($expectations as $comment => $src) {
-            // Gimmick of using a DOMDocument parser
-            $src = str_replace('\\', '%5C', \htmlspecialchars($src));
-
             // Fix for PHPUnit <8.0
             // phpcs:ignore Generic.Files.LineLength.TooLong
             $method = \method_exists($this, 'assertStringContainsString') ? 'assertStringContainsString' : 'assertContains';