[9.x] Use new CommonMark 2.2 API (laravel#40587)

* Use new CommonMark 2.2 API * Update composer.json * Update composer.json
mandotpro · Jan 24, 2022 · 6c023fa · 6c023fa
1 parent 7880ba7
commit 6c023fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "dragonmantank/cron-expression": "^3.1",
         "egulias/email-validator": "^3.1",
         "laravel/serializable-closure": "^1.0",
-        "league/commonmark": "^2.0.2",
+        "league/commonmark": "^2.2",
         "league/flysystem": "^3.0",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.53.1",

diff --git a/src/Illuminate/Mail/Markdown.php b/src/Illuminate/Mail/Markdown.php
@@ -114,7 +114,7 @@ public static function parse($text)
 
         $converter = new MarkdownConverter($environment);
 
-        return new HtmlString((string) $converter->convertToHtml($text));
+        return new HtmlString($converter->convert($text)->getContent());
     }
 
     /**

diff --git 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": "^2.0.2",
+        "league/commonmark": "^2.2",
         "psr/log": "^1.0|^2.0|^3.0",
         "symfony/mailer": "^6.0",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,7 @@ public static function parse($text) @@
             $converter = new MarkdownConverter($environment);
-            return new HtmlString((string) $converter->convertToHtml($text));
+            return new HtmlString($converter->convert($text)->getContent());
         }
         /**
@@ Expand Down @@