Return HtmlStrings with html content

spatie · May 31, 2018 · 7ac3498 · 7ac3498
1 parent fc87635
commit 7ac3498
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/ContentParsers/MarkdownParser.php b/src/ContentParsers/MarkdownParser.php
@@ -2,6 +2,7 @@
 
 namespace Spatie\Sheets\ContentParsers;
 
+use Illuminate\Support\HtmlString;
 use League\CommonMark\CommonMarkConverter;
 use Spatie\Sheets\ContentParser;
 
@@ -17,8 +18,10 @@ public function __construct(CommonMarkConverter $commonMarkConverter)
 
     public function parse(string $contents): array
     {
+        $htmlContents = $this->commonMarkConverter->convertToHtml($contents);
+
         return [
-            'contents' => $this->commonMarkConverter->convertToHtml($contents),
+            'contents' => new HtmlString($htmlContents),
         ];
     }
 }
diff --git a/src/ContentParsers/MarkdownWithFrontMatterParser.php b/src/ContentParsers/MarkdownWithFrontMatterParser.php
@@ -2,6 +2,7 @@
 
 namespace Spatie\Sheets\ContentParsers;
 
+use Illuminate\Support\HtmlString;
 use League\CommonMark\CommonMarkConverter;
 use Spatie\Sheets\ContentParser;
 use Spatie\YamlFrontMatter\YamlFrontMatter;
@@ -20,9 +21,11 @@ public function parse(string $contents): array
     {
         $document = YamlFrontMatter::parse($contents);
 
+        $htmlContents = $this->commonMarkConverter->convertToHtml($document->body());
+
         return array_merge(
             $document->matter(),
-            ['contents' => $this->commonMarkConverter->convertToHtml($document->body())]
+            ['contents' => new HtmlString($htmlContents)]
         );
     }
 }