Merge branch '2.x' into 3.x

* 2.x: Fix call to deprecated "convertToHtml" method
twigphp · Jan 29, 2022 · 25d410b · 25d410b
2 parents 8717478 + e056e63
commit 25d410b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/extra/markdown-extra/LeagueMarkdown.php b/extra/markdown-extra/LeagueMarkdown.php
@@ -16,14 +16,20 @@
 class LeagueMarkdown implements MarkdownInterface
 {
     private $converter;
+    private $legacySupport;
 
     public function __construct(CommonMarkConverter $converter = null)
     {
         $this->converter = $converter ?: new CommonMarkConverter();
+        $this->legacySupport = !method_exists($this->converter, 'convert');
     }
 
     public function convert(string $body): string
     {
-        return $this->converter->convertToHtml($body);
+        if ($this->legacySupport) {
+            return $this->converter->convertToHtml($body);
+        }
+
+        return $this->converter->convert($body);
     }
 }