X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/63cb6015a8c6db453f5551e50c04bf6ebbc0f3f1..refs/pull/5405/head:/app/Entities/Tools/Markdown/MarkdownToHtml.php diff --git a/app/Entities/Tools/Markdown/MarkdownToHtml.php b/app/Entities/Tools/Markdown/MarkdownToHtml.php index 25413fb33..0cee9d9a3 100644 --- a/app/Entities/Tools/Markdown/MarkdownToHtml.php +++ b/app/Entities/Tools/Markdown/MarkdownToHtml.php @@ -4,15 +4,15 @@ namespace BookStack\Entities\Tools\Markdown; use BookStack\Facades\Theme; use BookStack\Theming\ThemeEvents; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\CommonMarkConverter; -use League\CommonMark\Environment; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; use League\CommonMark\Extension\Table\TableExtension; use League\CommonMark\Extension\TaskList\TaskListExtension; +use League\CommonMark\MarkdownConverter; class MarkdownToHtml { - protected string $markdown; public function __construct(string $markdown) @@ -22,16 +22,16 @@ class MarkdownToHtml public function convert(): string { - $environment = Environment::createCommonMarkEnvironment(); + $environment = new Environment(); + $environment->addExtension(new CommonMarkCoreExtension()); $environment->addExtension(new TableExtension()); $environment->addExtension(new TaskListExtension()); $environment->addExtension(new CustomStrikeThroughExtension()); $environment = Theme::dispatch(ThemeEvents::COMMONMARK_ENVIRONMENT_CONFIGURE, $environment) ?? $environment; - $converter = new CommonMarkConverter([], $environment); + $converter = new MarkdownConverter($environment); - $environment->addBlockRenderer(ListItem::class, new CustomListItemRenderer(), 10); + $environment->addRenderer(ListItem::class, new CustomListItemRenderer(), 10); - return $converter->convertToHtml($this->markdown); + return $converter->convert($this->markdown)->getContent(); } - -} \ No newline at end of file +}