Update to CommonMark v2

driesvints · driesvints · commit ae2778c8cfa1 · 2021-07-09T18:16:41.000+02:00
diff --git 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
@@ -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/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -403,7 +403,7 @@ public static function markdown($string, array $options = [])
     {
         $converter = new GithubFlavoredMarkdownConverter($options);
 
-        return (string) $converter->convertToHtml($string);
+        return $converter->convertToHtml($string);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ public static function markdown($string, array $options = [])`
`403`	`403`	`{`
`404`	`404`	`$converter = new GithubFlavoredMarkdownConverter($options);`
`405`	`405`
`406`		`- return (string) $converter->convertToHtml($string);`
	`406`	`+ return $converter->convertToHtml($string);`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`/**`