diff --git a/composer.json b/composer.json index 23959a64aa6e..94d9fe4aad7e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/inflector": "^2.0", "dragonmantank/cron-expression": "^3.1", "egulias/email-validator": "^3.1", - "league/commonmark": "^1.3|^2.0", + "league/commonmark": "^2.0", "league/flysystem": "^2.0", "monolog/monolog": "^2.0", "nesbot/carbon": "^2.31", diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php index 9bd083605c60..75c254f1168c 100644 --- a/src/Illuminate/Mail/Markdown.php +++ b/src/Illuminate/Mail/Markdown.php @@ -5,8 +5,10 @@ use Illuminate\Contracts\View\Factory as ViewFactory; use Illuminate\Support\HtmlString; use Illuminate\Support\Str; -use League\CommonMark\CommonMarkConverter; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension; use League\CommonMark\Extension\Table\TableExtension; +use League\CommonMark\MarkdownConverter; use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles; class Markdown @@ -103,11 +105,14 @@ public function renderText($view, array $data = []) */ public static function parse($text) { - $converter = new CommonMarkConverter([ + $environment = new Environment([ 'allow_unsafe_links' => false, ]); - $converter->getEnvironment()->addExtension(new TableExtension()); + $environment->addExtension(new CommonMarkCoreExtension); + $environment->addExtension(new TableExtension); + + $converter = new MarkdownConverter($environment); return new HtmlString((string) $converter->convertToHtml($text)); } diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index acd447060506..684bcd214470 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -21,7 +21,7 @@ "illuminate/contracts": "^9.0", "illuminate/macroable": "^9.0", "illuminate/support": "^9.0", - "league/commonmark": "^1.3|^2.0", + "league/commonmark": "^2.0", "psr/log": "^1.0", "swiftmailer/swiftmailer": "^6.2.7", "tijsverkoyen/css-to-inline-styles": "^2.2.2" diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 59298162595b..ebeb607d7083 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -42,7 +42,7 @@ }, "suggest": { "illuminate/filesystem": "Required to use the composer class (^9.0).", - "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^1.3|^2.0).", + "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0).", "ramsey/uuid": "Required to use Str::uuid() (^4.0).", "symfony/process": "Required to use the composer class (^5.3).", "symfony/var-dumper": "Required to use the dd function (^5.3).",