Merge pull request #79 from bjuppa/update-commonmark

Add support for both CommonMark 1.x and 2.x
bjuppa · Sep 8, 2021 · 74d97ae · 74d97ae
2 parents f6a102d + 2020bea
commit 74d97ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "illuminate/http": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8",
     "spatie/laravel-sluggable": "^2.1",
     "bjuppa/metatagbag": "^1.0",
-    "league/commonmark": "^1.3"
+    "league/commonmark": "^1.3 || ^2.0"
   },
   "require-dev": {
     "orchestra/testbench": "~3.6.7 || ~3.7.8 || ~3.8.6 || ^4.8 || ^5.2 || ^6.0",

diff --git a/src/Support/CommonMarkString.php b/src/Support/CommonMarkString.php
@@ -38,13 +38,11 @@ public static function create(string $markdown): MarkdownString
      */
     protected static function parse($markdown): string
     {
-        $environment = Environment::createCommonMarkEnvironment();
-
         $converter = new CommonMarkConverter([
             'allow_unsafe_links' => false,
-        ], $environment);
+        ]);
 
-        return $converter->convertToHtml($markdown);
+        return (string) $converter->convertToHtml($markdown);
     }
 
     /**