Replace deprecated fork of dflydev's mardown library with the original one provided by Michel Fortin

This commit is contained in:
Miha Vrhovnik 2014-02-19 12:55:16 +01:00
parent ee68eabe0c
commit 457df811e2
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
namespace Nelmio\ApiDocBundle\Twig\Extension; namespace Nelmio\ApiDocBundle\Twig\Extension;
use dflydev\markdown\MarkdownExtraParser; use Michelf\MarkdownExtra;
class MarkdownExtension extends \Twig_Extension class MarkdownExtension extends \Twig_Extension
{ {
@ -10,7 +10,7 @@ class MarkdownExtension extends \Twig_Extension
public function __construct() public function __construct()
{ {
$this->markdownParser = new MarkdownExtraParser(); $this->markdownParser = new MarkdownExtra();
} }
/** /**
@ -33,6 +33,6 @@ class MarkdownExtension extends \Twig_Extension
public function markdown($text) public function markdown($text)
{ {
return $this->markdownParser->transformMarkdown($text); return $this->markdownParser->transform($text);
} }
} }

View File

@ -18,7 +18,7 @@
"symfony/twig-bundle": "~2.1", "symfony/twig-bundle": "~2.1",
"symfony/framework-bundle": "~2.1", "symfony/framework-bundle": "~2.1",
"symfony/console": "~2.1", "symfony/console": "~2.1",
"dflydev/markdown": "~1.0" "michelf/php-markdown": "~1.4"
}, },
"conflict": { "conflict": {
"jms/serializer": "<0.12", "jms/serializer": "<0.12",