From 457df811e2b942b94af47aed970460e0c94d82ab Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Wed, 19 Feb 2014 12:55:16 +0100 Subject: [PATCH] Replace deprecated fork of dflydev's mardown library with the original one provided by Michel Fortin --- Twig/Extension/MarkdownExtension.php | 6 +++--- composer.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Twig/Extension/MarkdownExtension.php b/Twig/Extension/MarkdownExtension.php index cbbb70f..75121ac 100644 --- a/Twig/Extension/MarkdownExtension.php +++ b/Twig/Extension/MarkdownExtension.php @@ -2,7 +2,7 @@ namespace Nelmio\ApiDocBundle\Twig\Extension; -use dflydev\markdown\MarkdownExtraParser; +use Michelf\MarkdownExtra; class MarkdownExtension extends \Twig_Extension { @@ -10,7 +10,7 @@ class MarkdownExtension extends \Twig_Extension public function __construct() { - $this->markdownParser = new MarkdownExtraParser(); + $this->markdownParser = new MarkdownExtra(); } /** @@ -33,6 +33,6 @@ class MarkdownExtension extends \Twig_Extension public function markdown($text) { - return $this->markdownParser->transformMarkdown($text); + return $this->markdownParser->transform($text); } } diff --git a/composer.json b/composer.json index 30657fa..4dab806 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "symfony/twig-bundle": "~2.1", "symfony/framework-bundle": "~2.1", "symfony/console": "~2.1", - "dflydev/markdown": "~1.0" + "michelf/php-markdown": "~1.4" }, "conflict": { "jms/serializer": "<0.12",